Indefero Commit Details

Date:

2009-06-22 14:08:33 (15 years 5 months ago)

Author:

Loic d'Anterroches

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

3848bd8d228e8155341fb3a3cec021890205e927

Parents:

0873d4416232e2170b29f8897a2cc23b5b55ac28

Message:

Added longer description for the downloads.

Changes:

File differences

-46
47 47
48 48
49
50
51
52
53
54
55
56
57
58
49 59
50 60
51 61
... ...
132 142
133 143
134 144
145
135 146
136 147
137 148
+                                                       'size' => 67,␊
                                                                    ),␊
                                            ));␊
        $this->fields['changelog'] = new Pluf_Form_Field_Varchar(␊
                                      array('required' => false,␊
                                            'label' => __('Description'),␊
                                            'initial' => $this->upload->changelog,␊
                                            'widget' => 'Pluf_Form_Widget_TextareaInput',␊
                                            'widget_attrs' => array(␊
                                                       'cols' => 58,␊
                                                       'rows' => 13,␊
                                                                    ),␊
                                            ));␊
        $tags = $this->upload->get_tags_list();␊
        for ($i=1;$i<7;$i++) {␊
            $initial = '';␊

        }␊
        // Create the upload␊
        $this->upload->summary = trim($this->cleaned_data['summary']);␊
        $this->upload->changelog = trim($this->cleaned_data['changelog']);␊
        $this->upload->modif_dtime = gmdate('Y-m-d H:i:s');␊
        $this->upload->update();␊
        $this->upload->batchAssoc('IDF_Tag', $tags);␊
 ...
                                                        'size' => 67,␊
                                                                     ),␊
                                             ));␊
+        $this->fields['changelog'] = new Pluf_Form_Field_Varchar(␊
+                                      array('required' => false,␊
+                                            'label' => __('Description'),␊
+                                            'initial' => $this->upload->changelog,␊
+                                            'widget' => 'Pluf_Form_Widget_TextareaInput',␊
+                                            'widget_attrs' => array(␊
+                                                       'cols' => 58,␊
+                                                       'rows' => 13,␊
+                                                                    ),␊
+                                            ));␊
         $tags = $this->upload->get_tags_list();␊
         for ($i=1;$i<7;$i++) {␊
             $initial = '';␊
         }␊
         // Create the upload␊
         $this->upload->summary = trim($this->cleaned_data['summary']);␊
+        $this->upload->changelog = trim($this->cleaned_data['changelog']);␊
         $this->upload->modif_dtime = gmdate('Y-m-d H:i:s');␊
         $this->upload->update();␊
         $this->upload->batchAssoc('IDF_Tag', $tags);␊

-44
45 45
46 46
47
48
49
50
51
52
53
54
55
56
47 57
48 58
49 59
... ...
155 165
156 166
157 167
168
158 169
159 170
160 171
+                                                       'size' => 67,␊
                                                                    ),␊
                                            ));␊
        $this->fields['changelog'] = new Pluf_Form_Field_Varchar(␊
                                      array('required' => false,␊
                                            'label' => __('Description'),␊
                                            'initial' => '',␊
                                            'widget' => 'Pluf_Form_Widget_TextareaInput',␊
                                            'widget_attrs' => array(␊
                                                       'cols' => 58,␊
                                                       'rows' => 13,␊
                                                                    ),␊
                                            ));␊
        $this->fields['file'] = new Pluf_Form_Field_File(␊
                                      array('required' => true,␊
                                            'label' => __('File'),␊

        $upload->project = $this->project;␊
        $upload->submitter = $this->user;␊
        $upload->summary = trim($this->cleaned_data['summary']);␊
        $upload->changelog = trim($this->cleaned_data['changelog']);␊
        $upload->file = $this->cleaned_data['file'];␊
        $upload->filesize = filesize(Pluf::f('upload_path').'/'.$this->project->shortname.'/files/'.$this->cleaned_data['file']);␊
        $upload->downloads = 0;␊
 ...
                                                        'size' => 67,␊
                                                                     ),␊
                                             ));␊
+        $this->fields['changelog'] = new Pluf_Form_Field_Varchar(␊
+                                      array('required' => false,␊
+                                            'label' => __('Description'),␊
+                                            'initial' => '',␊
+                                            'widget' => 'Pluf_Form_Widget_TextareaInput',␊
+                                            'widget_attrs' => array(␊
+                                                       'cols' => 58,␊
+                                                       'rows' => 13,␊
+                                                                    ),␊
+                                            ));␊
         $this->fields['file'] = new Pluf_Form_Field_File(␊
                                       array('required' => true,␊
                                             'label' => __('File'),␊
         $upload->project = $this->project;␊
         $upload->submitter = $this->user;␊
         $upload->summary = trim($this->cleaned_data['summary']);␊
+        $upload->changelog = trim($this->cleaned_data['changelog']);␊
         $upload->file = $this->cleaned_data['file'];␊
         $upload->filesize = filesize(Pluf::f('upload_path').'/'.$this->project->shortname.'/files/'.$this->cleaned_data['file']);␊
         $upload->downloads = 0;␊

-56
57 57
58 58
59
60
61
62
63
64
59 65
60 66
61 67
+                                  'size' => 250,␊
                                  'verbose' => __('summary'),␊
                                  ),␊
                            'changelog' =>␊
                            array(␊
                                  'type' => 'Pluf_DB_Field_Text',␊
                                  'blank' => true,␊
                                  'verbose' => __('changes'),␊
                                  ),␊
                            'file' =>␊
                            array(␊
                                  'type' => 'Pluf_DB_Field_File',␊
                                   'size' => 250,␊
                                   'verbose' => __('summary'),␊
                                   ),␊
+                            'changelog' =>␊
+                            array(␊
+                                  'type' => 'Pluf_DB_Field_Text',␊
+                                  'blank' => true,␊
+                                  'verbose' => __('changes'),␊
+                                  ),␊
                             'file' =>␊
                             array(␊
                                   'type' => 'Pluf_DB_Field_File',␊

-10
11 11
12 12
13
14
15
16
17
+{foreach $tags as $tag} {$tag.class|safe}:{$tag.name|safe}␊
{/foreach}{/if}␊
{trans 'Download:'} {$urlfile}␊
{if $file.changelog}␊
{trans 'Description:'}␊
␊
{$file.changelog}␊
{/if}␊
 {foreach $tags as $tag} {$tag.class|safe}:{$tag.name|safe}␊
 {/foreach}{/if}␊
 {trans 'Download:'} {$urlfile}␊
+{if $file.changelog}␊
+{trans 'Description:'}␊
+␊
+{$file.changelog}␊
+{/if}␊

-19
20 20
21 21
22
23
24
25
26
27
22 28
23 29
24 30
... ...
50 56
51 57
52 58
59
60
53 61
54 62
55 63
+</td>␊
</tr>␊
<tr>␊
<th>{$form.f.changelog.labelTag}:</th>␊
<td>{if $form.f.changelog.errors}{$form.f.changelog.fieldErrors}{/if}␊
{$form.f.changelog|unsafe}␊
</td>␊
</tr>␊
<tr>␊
<th><strong>{$form.f.file.labelTag}:</strong></th>␊
<td>{if $form.f.file.errors}{$form.f.file.fieldErrors}{/if}␊
{$form.f.file|unsafe}␊

<p>{blocktrans}Each file must have a distinct name and file contents␊
cannot be changed, so be sure to include release numbers in each file␊
name.{/blocktrans}</p>␊
{assign $url = 'http://daringfireball.net/projects/markdown/syntax'}␊
<p>{blocktrans}You can use the <a href="{$url}">Markdown syntax</a> for the description.{/blocktrans}</p>␊
</div>␊
{/block}␊
{block javascript}␊
 ...
 </td>␊
 </tr>␊
 <tr>␊
+<th>{$form.f.changelog.labelTag}:</th>␊
+<td>{if $form.f.changelog.errors}{$form.f.changelog.fieldErrors}{/if}␊
+{$form.f.changelog|unsafe}␊
+</td>␊
+</tr>␊
+<tr>␊
 <th><strong>{$form.f.file.labelTag}:</strong></th>␊
 <td>{if $form.f.file.errors}{$form.f.file.fieldErrors}{/if}␊
 {$form.f.file|unsafe}␊
 <p>{blocktrans}Each file must have a distinct name and file contents␊
 cannot be changed, so be sure to include release numbers in each file␊
 name.{/blocktrans}</p>␊
+{assign $url = 'http://daringfireball.net/projects/markdown/syntax'}␊
+<p>{blocktrans}You can use the <a href="{$url}">Markdown syntax</a> for the description.{/blocktrans}</p>␊
 </div>␊
 {/block}␊
 {block javascript}␊

-626
627 627
628 628
629 
629
630 630
631 631
632 632
633 633
634 634
635 635
636
637
638
639
636 640
637 641
638 642
+  background-repeat: no-repeat;␊
  background-position: 1em 1em;␊
  font-size: 140%;␊
  margin-bottom: 3em;␊
  margin-bottom: 1.5em;␊
  background-color: #bbe394;␊
  width: 40%;␊
  -moz-border-radius: 5px;␊
  -webkit-border-radius: 5px;␊
}␊
␊
table.download { ␊
  margin-top: 1.5em;␊
}␊
␊
/**␊
 * Wiki␊
 */␊
   background-repeat: no-repeat;␊
   background-position: 1em 1em;␊
   font-size: 140%;␊
-  margin-bottom: 3em;␊
+  margin-bottom: 1.5em;␊
   background-color: #bbe394;␊
   width: 40%;␊
   -moz-border-radius: 5px;␊
   -webkit-border-radius: 5px;␊
 }␊
 ␊
+table.download { ␊
+  margin-top: 1.5em;␊
+}␊
+␊
 /**␊
  * Wiki␊
  */␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags