Changeset 1713:e29741a2433d for plugins/pages/page.php

Timestamp:

09/01/13 13:23:16 (10 years ago)

Author:

Lepeltier kévin

Branch:

Ticket #1624

Parents:

1712:236b6ebf66a5 (diff), 1680:3b9bcc9f9d1c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fusion avec default

Files:

• plugins/pages/page.php (modified) (3 diffs)
• plugins/pages/page.php (modified) (3 diffs)

plugins/pages/page.php

@@ -432 +432 @@
                'title' => __('Options'),
                'items' => array(
-                    'post_open_comment' =>
+                    'post_open_comment_tb' =>
+                         '<div>'.
+                         '<h5 id="label_comment_tb">'.__('Commentaires et rétroliens').'</h5>'.
                          '<p><label for="post_open_comment" class="classic">'.
                          form::checkbox('post_open_comment',1,$post_open_comment).' '.
@@ -442 +444 @@
                                    __('Warning: Comments are not more accepted for this entry.').'</p>') : 
                               '<p class="form-note warn">'.
-                              __('Comments are not accepted on this blog so far.').'</p>'),
-                    'post_open_tb' =>
+                              __('Comments are not accepted on this blog so far.').'</p>').
                          '<p><label for="post_open_tb" class="classic">'.
                          form::checkbox('post_open_tb',1,$post_open_tb).' '.
@@ -452 +453 @@
                                    '<p class="form-note warn">'.
                                    __('Warning: Trackbacks are not more accepted for this entry.').'</p>') : 
-                              '<p class="form-note warn">'.__('Trackbacks are not accepted on this blog so far.').'</p>'),
+                              '<p class="form-note warn">'.__('Trackbacks are not accepted on this blog so far.').'</p>').
+                         '</div>',
                     'post_hide' => 
                          '<p><label for="post_selected" class="classic">'.form::checkbox('post_selected',1,$post_selected).' '.

plugins/pages/page.php

@@ -403 +403 @@
                'items' => array(
                     'post_status' => 
-                         '<p><label for="post_status" class="ib">'.__('Page status:').'</label> '.
+                         '<p><label for="post_status" class="ib">'.__('Page status').'</label> '.
                          form::combo('post_status',$status_combo,$post_status,'','',!$can_publish).
                          '</p>',
@@ -411 +411 @@
                          '</p>',
                     'post_lang' =>
-                         '<p><label for="post_lang" class="ib">'.__('Page lang:').'</label>'.
+                         '<p><label for="post_lang" class="ib">'.__('Page lang').'</label>'.
                          form::combo('post_lang',$lang_combo,$post_lang).
                          '</p>',
@@ -426 +426 @@
                'items' => array(
                     'post_position' => 
-                         '<p><label for="post_position" class="classic">'.__('Page position:').'</label> '.
+                         '<p><label for="post_position" class="classic">'.__('Page position').'</label> '.
                          form::field('post_position',3,3,(string) $post_position).
                          '</p>')),