Changeset 1508:60c4414bcd87

Timestamp:

08/21/13 10:12:58 (11 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Comments list table, clarification and harmonization.

Files:

• admin/post.php (modified) (2 diffs)
• admin/style/default.css (modified) (5 diffs)
• inc/admin/lib.pager.php (modified) (4 diffs)
• locales/fr/main.po (modified) (1 diff)
• plugins/pages/page.php (modified) (4 diffs)

admin/post.php

@@ -733 +733 @@
      echo
      '<table class="comments-list"><tr>'.
-     '<th colspan="2">'.__('Author').'</th>'.
+     '<th colspan="2" class="first">'.__('Author').'</th>'.
      '<th>'.__('Date').'</th>'.
      '<th class="nowrap">'.__('IP address').'</th>'.
      '<th>'.__('Status').'</th>'.
-     '<th>&nbsp;</th>'.
+     '<th>'.__('Edit').'</th>'.
      '</tr>';
      
@@ -771 +771 @@
           '<td class="nowrap status">'.$img_status.'</td>'.
           '<td class="nowrap status"><a href="'.$comment_url.'">'.
-          '<img src="images/edit-mini.png" alt="" title="'.__('Edit this comment').'" /></a></td>'.
+          '<img src="images/edit-mini.png" alt="" title="'.__('Edit this comment').'" /> '.__('Edit').'</a></td>'.
           
           '</tr>';

admin/style/default.css

@@ -1180 +1180 @@
      border-style: solid;
      border-color: #e3e3e3;
-     padding: .4rem .5rem;
+     padding: .3em .5em;
      vertical-align: top;
 }
@@ -1188 +1188 @@
      border-color: #ccc;
      background: #f3f3ff;
-     padding: .4rem .5rem;
+     padding: .3em .5em;
      vertical-align: top;
      text-align: left;
+}
+th.first img {
+     padding-right: 24px;
 }
 .noborder td, td.noborder, .noborder th, th.noborder {
@@ -1240 +1243 @@
      border: none;
 }
-
-tr.line img.expand {
-     margin-right: 10px;
+tr.line img.expand, th img.expand {
+     margin-right: 6px;
      margin-bottom: -2px;
 }
@@ -1720 +1722 @@
      #info-box2 {float:none;}
      #dashboard-items div {display: block;margin-bottom: 1em; padding: 0 1em;}
+     #help-button {height:26px; width:26px; background-color: #A2CBE9; padding: 0; margin:0;font-size: 1rem;line-height: 68px}
 }
 @media screen and (max-width: 492px) {
@@ -1728 +1731 @@
      #info-box1 select {width: 12rem; margin-right: .6rem;}
      #info-box1 p.nomobile, label.nomobile {display: none;}
-     #help-button {height:26px; width:26px; background-color: #A2CBE9; padding: 0; margin:0;font-size: 1rem;line-height: 68px}
-}
+}

inc/admin/lib.pager.php

@@ -50 +50 @@
                $html_block =
                '<table class="clear"><tr>'.
-               '<th colspan="2">'.__('Title').'</th>'.
+               '<th colspan="2" class="first">'.__('Title').'</th>'.
                '<th>'.__('Date').'</th>'.
                '<th>'.__('Category').'</th>'.
@@ -260 +260 @@
                $html_block =
                '<table><tr>'.
-               '<th colspan="2">'.__('Title').'</th>'.
+               '<th colspan="2" class="first">'.__('Author').'</th>'.
                '<th>'.__('Date').'</th>'.
-               '<th>'.__('Author').'</th>'.
+               '<th>'.__('Entry title').'</th>'.
                '<th>'.__('Type').'</th>'.
                '<th>'.__('Status').'</th>'.
-               '<th>&nbsp;</th>'.
+               '<th>'.__('Edit').'</th>'.
                '</tr>%s</table>';
                
@@ -324 +324 @@
           }
           
-          $comment_author = html::escapeHTML($this->rs->comment_author);
-          if (mb_strlen($comment_author) > 20) {
-               $comment_author = mb_strcut($comment_author,0,17).'...';
+          $post_title = html::escapeHTML($this->rs->post_title);
+          if (mb_strlen($post_title) > 50) {
+               $post_title = mb_strcut($post_title,0,47).'...';
           }
           
@@ -335 +335 @@
           '<td class="nowrap">'.
           form::checkbox(array('comments[]'),$this->rs->comment_id,'','','',0).'</td>'.
-          '<td class="maximal"><a href="'.$post_url.'">'.
-          html::escapeHTML($this->rs->post_title).'</a>'.
+          '<td class="maximal"><a href="'.$author_url.'">'.html::escapeHTML($this->rs->comment_author).'</a></td>'.
+          '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->comment_dt).'</td>'.
+          '<td class="nowrap"><a href="'.$post_url.'">'.
+          html::escapeHTML($post_title).'</a>'.
           ($this->rs->post_type != 'post' ? ' ('.html::escapeHTML($this->rs->post_type).')' : '').'</td>'.
-          '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->comment_dt).'</td>'.
-          '<td class="nowrap"><a href="'.$author_url.'">'.html::escapeHTML($comment_author).'</a></td>'.
           '<td class="nowrap">'.($this->rs->comment_trackback ? __('trackback') : __('comment')).'</td>'.
           '<td class="nowrap status">'.$img_status.'</td>'.
           '<td class="nowrap status"><a href="'.$comment_url.'">'.
-          '<img src="images/edit-mini.png" alt="" title="'.__('Edit this comment').'" /></a></td>';
+          '<img src="images/edit-mini.png" alt="" title="'.__('Edit this comment').'" /> '.__('Edit').'</a></td>';
           
           $res .= '</tr>';

locales/fr/main.po

@@ -3138 +3138 @@
 msgid "Back to Blog themes"
 msgstr "Retour à Apparence du blog"
+
+msgid "Edit"
+msgstr "Modifier"

plugins/pages/page.php

@@ -587 +587 @@
      if ($can_edit_page && $core->auth->check('delete,contentadmin',$core->blog->id))
      {
-          $combo_action[__('delete')] = 'delete';
+          $combo_action[__('Delete')] = 'delete';
      }
      
@@ -619 +619 @@
           '<p class="col checkboxes-helpers"></p>'.
           
-          '<p class="col right"><label for="action">'.__('Selected comments action:').'</label> '.
+          '<p class="col right"><label for="action" class="classic">'.__('Selected comments action:').'</label> '.
           form::combo('action',$combo_action).
           form::hidden('redir',html::escapeURL($redir_url).'&amp;id='.$post_id.'&amp;co=1').
@@ -692 +692 @@
      echo
      '<table class="comments-list"><tr>'.
-     '<th colspan="2">'.__('Author').'</th>'.
+     '<th colspan="2" class="nowrap first">'.__('Author').'</th>'.
      '<th>'.__('Date').'</th>'.
      '<th class="nowrap">'.__('IP address').'</th>'.
      '<th>'.__('Status').'</th>'.
-     '<th>&nbsp;</th>'.
+     '<th>'.__('Edit').'</th>'.
      '</tr>';
      
@@ -730 +730 @@
           '<td class="nowrap status">'.$img_status.'</td>'.
           '<td class="nowrap status"><a href="'.$comment_url.'">'.
-          '<img src="images/edit-mini.png" alt="" title="'.__('Edit this comment').'" /></a></td>'.
+          '<img src="images/edit-mini.png" alt="" title="'.__('Edit this comment').'" /> '.__('Edit').'</a></td>'.
           
           '</tr>';