Changeset 1312:9b954dbdf09a for admin

Timestamp:

08/08/13 21:29:17 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1311:b57043a88153 (diff), 1290:de23a6996243 (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:

Merge step 2

Location:

admin

Files:

• blog.php (modified) (1 diff)
• plugins.php (modified) (1 diff)
• post.php (modified) (3 diffs)
• post.php (modified) (2 diffs)
• users.php (modified) (1 diff)

admin/blog.php

@@ -70 +70 @@
      
      echo
-     '<h2><a href="blogs.php">'.__('Blogs').'</a> &rsaquo; <span class="page-title">'.__('New blog').'</span></h2>'.
+     '<h2>'.__('System').' &rsaquo; <a href="blogs.php">'.__('Blogs').'</a> &rsaquo; <span class="page-title">'.__('New blog').'</span></h2>'.
      
      '<form action="blog.php" method="post" id="blog-form" class="fieldset">'.

admin/plugins.php

@@ -195 +195 @@
 
 echo
-'<h2 class="page-title">'.__('Plugins management').'</h2>';
+'<h2>'.__('System').' &rsaquo; <span class="page-title">'.__('Plugins management').'</span></h2>';
 
 if (!empty($_GET['removed'])) {

admin/post.php

@@ -386 +386 @@
 if ($can_edit_post)
 {
-     echo '<div class="multi-part" title="'.__('Edit entry').'" id="edit-entry">';
+     echo '<div class="multi-part" title="'.($post_id ? __('Edit entry') : __('New entry')).'" id="edit-entry">';
      echo '<form action="post.php" method="post" id="entry-form">';
      echo '<div id="entry-wrapper">';
@@ -392 +392 @@
      
      echo
-     '<p class="col"><label class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').
+     '<p class="col"><label class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'.
      form::field('post_title',20,255,html::escapeHTML($post_title),'maximal').
-     '</label></p>'.
+     '</p>'.
      
      '<p class="area" id="excerpt-area"><label for="post_excerpt">'.__('Excerpt:').'</label> '.
@@ -405 +405 @@
      '</p>'.
      
-     '<p class="area" id="notes-area"><label for="post_notes">'.__('Notes:').'</label>'.
+     '<p class="area" id="notes-area"><label for="post_notes">'.__('Personal notes:').'</label>'.
      form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
      '</p>';

admin/post.php

@@ -334 +334 @@
 }
 
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.'<a href="posts.php">'.__('Entries').'</a> &rsaquo; <span class="page-title">'.$page_title;
+echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.'<a href="posts.php">'.__('Entries').'</a> &rsaquo; <span class="page-title">';
 if ($post_id) {
      switch ($post_status) {
@@ -352 +352 @@
                $img_status = '';
      }
-     echo ' &ldquo;'.$post_title.'&rdquo;'.' '.$img_status;
+     $edit_entry_str = __('Edit entry &ldquo;%s&rdquo;');
+     echo sprintf($edit_entry_str, html::escapeHTML($post_title)).' '.$img_status;
+} else {
+     echo $page_title;
 }
 echo '</span></h2>';

admin/users.php

@@ -106 +106 @@
      
      echo 
-     '<h2 class="post-title">'.__('Users').'</h2>'.
+     '<h2>'.__('System').' &rsaquo; <span class="page-title">'.__('Users').'</span></h2>'.
      '<p class="top-add"><strong><a class="button add" href="user.php">'.__('Create a new user').'</a></strong></p>';