Changeset 1714:28737e5f6607 for admin/post.php

Timestamp:

09/03/13 20:30:04 (10 years ago)

Author:

kevin@…

Branch:

Ticket #1624

Children:

1715:d55945cae2cd, 1716:6c2f79db9c59

Parents:

1713:e29741a2433d (diff), 1699:5b68157bf85e (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:

• admin/post.php (modified) (3 diffs)
• admin/post.php (modified) (2 diffs)

admin/post.php

@@ -472 +472 @@
                '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).' '.
@@ -482 +484 @@
                                    __('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).' '.
@@ -492 +493 @@
                                    '<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_password' =>
                          '<p><label for="post_password" class="ib">'.__('Password').'</label>'.

admin/post.php

@@ -518 +518 @@
           "post_excerpt" =>
                '<p class="area" id="excerpt-area"><label for="post_excerpt">'.__('Excerpt:').'<span class="form-note">'.
-               __('Add an introduction to the post.').'</span></label> '.
+               __('Introduction to the post.').'</span></label> '.
                form::textarea('post_excerpt',50,5,html::escapeHTML($post_excerpt)).
                '</p>',
@@ -530 +530 @@
           "post_notes" =>
                '<p class="area" id="notes-area"><label for="post_notes">'.__('Personal notes:').'<span class="form-note">'.
-               __('Add unpublished notes.').'</span></label>'.
+               __('Unpublished notes.').'</span></label>'.
                form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
                '</p>'