Changeset 1620:542c321dc040 for plugins

Timestamp:

08/30/13 10:37:08 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1619:5d925866b5b3 (diff), 1593:0c884219a872 (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 2.5 into default

Location:

plugins

Files:

• attachments/_admin.php (modified) (1 diff)
• pages/page.php (modified) (17 diffs)
• pages/page.php (modified) (1 diff)

plugins/attachments/_admin.php

@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-$core->addBehavior ('adminPostFormSidebar',array('attachmentAdmin','adminPostFormSidebar'));
+$core->addBehavior ('adminPostFormItems',array('attachmentAdmin','adminPostFormItems'));
 $core->addBehavior ('adminPostAfterForm',array('attachmentAdmin','adminPostAfterForm'));
+$core->addBehavior('adminPostHeaders',array('attachmentAdmin','postHeaders'));
+$core->addBehavior ('adminPageFormItems',array('attachmentAdmin','adminPostFormItems'));
+$core->addBehavior ('adminPageAfterForm',array('attachmentAdmin','adminPostAfterForm'));
+$core->addBehavior('adminPageHeaders',array('attachmentAdmin','postHeaders'));
 
 class attachmentAdmin
 {
-     public static function adminPostFormSidebar($post) 
+     public static function postHeaders()
+     {
+          return 
+          '<script type="text/javascript" src="index.php?pf=attachments/js/post.js"></script>';
+     }
+     public static function adminPostFormItems($main,$sidebar,$post) 
      {
           if ($post !== null)
           {
                $core =& $GLOBALS['core'];
-               if ( isset($core->media) ) {
-                    $post_media = $core->media->getPostMedia($post->post_id);
-                    echo
-                    '<h3 class="clear">'.__('Attachments').'</h3>';
-                    foreach ($post_media as $f)
-                    {
-                         $ftitle = $f->media_title;
-                         if (strlen($ftitle) > 18) {
-                              $ftitle = substr($ftitle,0,16).'...';
-                         }
-                         echo
-                         '<div class="media-item">'.
-                         '<a class="media-icon" href="media_item.php?id='.$f->media_id.'">'.
-                         '<img src="'.$f->media_icon.'" alt="" title="'.$f->basename.'" /></a>'.
-                         '<ul>'.
-                         '<li><a class="media-link" href="media_item.php?id='.$f->media_id.'" '.
-                         'title="'.$f->basename.'">'.$ftitle.'</a></li>'.
-                         '<li>'.$f->media_dtstr.'</li>'.
-                         '<li>'.files::size($f->size).' - '.
-                         '<a href="'.$f->file_url.'">'.__('open').'</a>'.'</li>'.
-                         
-                         '<li class="media-action"><a class="attachment-remove" id="attachment-'.$f->media_id.'" '.
-                         'href="post_media.php?post_id='.$post->post_id.'&amp;media_id='.$f->media_id.'&amp;remove=1">'.
-                         '<img src="images/check-off.png" alt="'.__('remove').'" /></a>'.
-                         '</li>'.
-                         
-                         '</ul>'.
-                         '</div>';
+               $post_media = $core->media->getPostMedia($post->post_id);
+               $nb_media = count($post_media);
+               $title = !$nb_media ? __('Attachments') : sprintf(__('Attachments (%d)'),$nb_media);
+               $item = '<h5 class="clear s-attachments">'.$title.'</h5>';
+               foreach ($post_media as $f)
+               {
+                    $ftitle = $f->media_title;
+                    if (strlen($ftitle) > 18) {
+                         $ftitle = substr($ftitle,0,16).'...';
                     }
-                    unset($f);
+                    $item .=
+                    '<div class="media-item s-attachments">'.
+                    '<a class="media-icon" href="media_item.php?id='.$f->media_id.'">'.
+                    '<img src="'.$f->media_icon.'" alt="" title="'.$f->basename.'" /></a>'.
+                    '<ul>'.
+                    '<li><a class="media-link" href="media_item.php?id='.$f->media_id.'" '.
+                    'title="'.$f->basename.'">'.$ftitle.'</a></li>'.
+                    '<li>'.$f->media_dtstr.'</li>'.
+                    '<li>'.files::size($f->size).' - '.
+                    '<a href="'.$f->file_url.'">'.__('open').'</a>'.'</li>'.
+                    
+                    '<li class="media-action"><a class="attachment-remove" id="attachment-'.$f->media_id.'" '.
+                    'href="post_media.php?post_id='.$post->post_id.'&amp;media_id='.$f->media_id.'&amp;remove=1">'.
+                    '<img src="images/check-off.png" alt="'.__('remove').'" /></a>'.
+                    '</li>'.
+                    
+                    '</ul>'.
+                    '</div>';
                }
+               unset($f);
                
                if (empty($post_media)) {
-                    echo '<p>'.__('No attachment.').'</p>';
-               } else {
-               }
-               echo '<p><a class="button" href="media.php?post_id='.$post->post_id.'">'.__('Add files to this entry').'</a></p>';
+                    $item .= '<p class="form-note s-attachments">'.__('No attachment.').'</p>';
+               } 
+               $item .= '<p class="s-attachments"><a class="button" href="media.php?post_id='.$post->post_id.'">'.__('Add files to this entry').'</a></p>';
+               $sidebar['metas-box']['items']['attachments']= $item;
           }
      }

plugins/pages/page.php

@@ -124 +124 @@
           if ($next_rs !== null) {
                $next_link = sprintf($post_link,$next_rs->post_id,
-                    html::escapeHTML($next_rs->post_title),__('next page').' »');
+                    html::escapeHTML($next_rs->post_title),__('Next page').' »');
                $next_headlink = sprintf($post_headlink,'next',
                     html::escapeHTML($next_rs->post_title),$next_rs->post_id);
@@ -131 +131 @@
           if ($prev_rs !== null) {
                $prev_link = sprintf($post_link,$prev_rs->post_id,
-                    html::escapeHTML($prev_rs->post_title),'« '.__('previous page'));
+                    html::escapeHTML($prev_rs->post_title),'« '.__('Previous page'));
                $prev_headlink = sprintf($post_headlink,'previous',
                     html::escapeHTML($prev_rs->post_title),$prev_rs->post_id);
@@ -304 +304 @@
   dcPage::jsToolBar().
   dcPage::jsModal().
-  dcPage::jsMetaEditor().
   dcPage::jsLoad('js/_post.js').
   dcPage::jsConfirmClose('entry-form','comment-form').
@@ -318 +317 @@
 <?php
 
+if ($post_id) {
+     switch ($post_status) {
+          case 1:
+               $img_status = sprintf($img_status_pattern,__('Published'),'check-on.png');
+               break;
+          case 0:
+               $img_status = sprintf($img_status_pattern,__('Unpublished'),'check-off.png');
+               break;
+          case -1:
+               $img_status = sprintf($img_status_pattern,__('Scheduled'),'scheduled.png');
+               break;
+          case -2:
+               $img_status = sprintf($img_status_pattern,__('Pending'),'check-wrn.png');
+               break;
+          default:
+               $img_status = '';
+     }
+     $edit_entry_title = '&ldquo;'.$post_title.'&rdquo;'.' '.$img_status;
+} else {
+     $edit_entry_title = $page_title;
+}
+echo dcPage::breadcrumb(
+     array(
+          html::escapeHTML($core->blog->name) => '',
+          __('Pages') => $p_url,
+          '<span class="page-title">'.$edit_entry_title.'</span>' => ''
+     ));
+
 if (!empty($_GET['upd'])) {
-     dcPage::message(__('Page has been successfully updated.'));
+     dcPage::success(__('Page has been successfully updated.'));
 }
 elseif (!empty($_GET['crea'])) {
-     dcPage::message(__('Page has been successfully created.'));
+     dcPage::success(__('Page has been successfully created.'));
 }
 elseif (!empty($_GET['attached'])) {
-     dcPage::message(__('File has been successfully attached.'));
+     dcPage::success(__('File has been successfully attached.'));
 }
 elseif (!empty($_GET['rmattach'])) {
-     dcPage::message(__('Attachment has been successfully removed.'));
+     dcPage::success(__('Attachment has been successfully removed.'));
 }
 
@@ -341 +368 @@
 }
 
-echo '<h2>'.html::escapeHTML($core->blog->name).
-' &rsaquo; <a href="'.$p_url.'">'.__('Pages').'</a> &rsaquo; <span class="page-title">'.$page_title; 
-     if ($post_id) {
-          switch ($post_status) {
-               case 1:
-                    $img_status = sprintf($img_status_pattern,__('published'),'check-on.png');
-                    break;
-               case 0:
-                    $img_status = sprintf($img_status_pattern,__('unpublished'),'check-off.png');
-                    break;
-               case -1:
-                    $img_status = sprintf($img_status_pattern,__('scheduled'),'scheduled.png');
-                    break;
-               case -2:
-                    $img_status = sprintf($img_status_pattern,__('pending'),'check-wrn.png');
-                    break;
-               default:
-                    $img_status = '';
-          }
-          echo ' &ldquo;'.$post_title.'&rdquo;'.' '.$img_status;
-     }
-echo '</span></h2>';
-
 if ($post_id && $post->post_status == 1) {
-     echo '<p><a href="'.$post->getURL().'" onclick="window.open(this.href);return false;" title="'.$post_title.' ('.__('new window').')'.'">'.__('Go to this page on the site').' <img src="images/outgoing-blue.png" alt="" /></a></p>';
+     echo '<p><a class="onblog_link" href="'.$post->getURL().'" onclick="window.open(this.href);return false;" title="'.$post_title.' ('.__('new window').')'.'">'.__('Go to this page on the site').' <img src="images/outgoing-blue.png" alt="" /></a></p>';
 }
 
@@ -372 +376 @@
 if ($post_id)
 {
-     echo '<p>';
+     echo '<p class="nav_prevnext">';
      if ($prev_link) { echo $prev_link; }
-     if ($next_link && $prev_link) { echo ' - '; }
+     if ($next_link && $prev_link) { echo ' | '; }
      if ($next_link) { echo $next_link; }
      
@@ -390 +394 @@
 
 
-/* Post form if we can edit post
+/* Post form if we can edit page
 -------------------------------------------------------- */
 if ($can_edit_page)
 {
+     $sidebar_items = new ArrayObject(array(
+          'status-box' => array(
+               'title' => __('Status'),
+               'items' => array(
+                    'post_status' => 
+                         '<p><label for="post_status" class="ib">'.__('Page status:').'</label> '.
+                         form::combo('post_status',$status_combo,$post_status,'','',!$can_publish).
+                         '</p>',
+                    'post_dt' => 
+                         '<p><label for="post_dt" class="ib">'.__('Publication date and hour').'</label>'.
+                         form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).
+                         '</p>',
+                    'post_lang' =>
+                         '<p><label for="post_lang" class="ib">'.__('Page lang:').'</label>'.
+                         form::combo('post_lang',$lang_combo,$post_lang).
+                         '</p>',
+                    'post_format' =>
+                         '<div>'.
+                         '<h5 id="label_format"><label for="post_format" class="ib">'.__('Text formating').'</label></h5>'.
+                         '<p>'.form::combo('post_format',$formaters_combo,$post_format,'maximal').
+                         '</p>'.
+                         '<p>'.($post_id && $post_format != 'xhtml' ? 
+                         '<a id="convert-xhtml" class="button maximal" href="post.php?id='.$post_id.'&amp;xconv=1">'.
+                         __('Convert to XHTML').'</a>' : '').'</p></div>')),
+          'metas-box' => array(
+               'title' => __('Ordering'),
+               'items' => array(
+                    'post_position' => 
+                         '<p><label for="post_position" class="classic">'.__('Page position:').'</label> '.
+                         form::field('post_position',3,3,(string) $post_position).
+                         '</p>')),
+          'options-box' => array(
+               'title' => __('Options'),
+               'items' => array(
+                    'post_open_comment' =>
+                         '<p><label for="post_open_comment" class="classic">'.
+                         form::checkbox('post_open_comment',1,$post_open_comment).' '.
+                         __('Accept comments').'</label></p>'.
+                         ($core->blog->settings->system->allow_comments ? 
+                              (isContributionAllowed($post_id,strtotime($post_dt),true) ? 
+                                   '' :
+                                   '<p class="form-note warn">'.
+                                   __('Warning: Comments are not more accepted for this entry.').'</p>') : 
+                              '<p class="form-note warn">'.
+                              __('Warning: Comments are not accepted on this blog.').'</p>'),
+                    'post_open_tb' =>
+                         '<p><label for="post_open_tb" class="classic">'.
+                         form::checkbox('post_open_tb',1,$post_open_tb).' '.
+                         __('Accept trackbacks').'</label></p>'.
+                         ($core->blog->settings->system->allow_trackbacks ? 
+                              (isContributionAllowed($post_id,strtotime($post_dt),false) ? 
+                                   '' :
+                                   '<p class="form-note warn">'.
+                                   __('Warning: Trackbacks are not more accepted for this entry.').'</p>') : 
+                              '<p class="form-note warn">'.__('Warning: Trackbacks are not accepted on this blog.').'</p>'),
+                    'post_hide' => 
+                         '<p><label for="post_selected" class="classic">'.form::checkbox('post_selected',1,$post_selected).' '.
+                         __('Hide in widget Pages').'</label></p>'.
+                         '</p>',
+                    'post_password' =>
+                         '<p><label for="post_password" class="ib">'.__('Password').'</label>'.
+                         form::field('post_password',10,32,html::escapeHTML($post_password),'maximal').
+                         '</p>',
+                    'post_url' =>
+                         '<div class="lockable">'.
+                         '<p><label for="post_url" class="ib">'.__('Edit basename').'</label>'.
+                         form::field('post_url',10,255,html::escapeHTML($post_url),'maximal').
+                         '</p>'.
+                         '<p class="form-note warn">'.
+                         __('Warning: If you set the URL manually, it may conflict with another entry.').
+                         '</p></div>'
+     ))));
+     $main_items = new ArrayObject(array(
+          "post_title" =>
+               '<p class="col">'.
+               '<label class="required no-margin"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'.
+               form::field('post_title',20,255,html::escapeHTML($post_title),'maximal').
+               '</p>',
+          
+          "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> '.
+               form::textarea('post_excerpt',50,5,html::escapeHTML($post_excerpt)).
+               '</p>',
+          
+          "post_content" =>
+               '<p class="area"><label class="required" '.
+               'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.
+               form::textarea('post_content',50,$core->auth->getOption('edit_size'),html::escapeHTML($post_content)).
+               '</p>',
+          
+          "post_notes" =>
+               '<p class="area" id="notes-area"><label for="post_notes">'.__('Personal notes:').'<span class="form-note">'.
+               __('Add unpublished notes.').'</span></label>'.
+               form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
+               '</p>'
+          )
+     );
+
+     # --BEHAVIOR-- adminPostFormItems
+     $core->callBehavior('adminPageFormItems',$main_items,$sidebar_items, isset($post) ? $post : null);
+
      echo '<div class="multi-part" title="'.__('Edit page').'" id="edit-entry">';
      echo '<form action="'.html::escapeURL($redir_url).'" method="post" id="entry-form">';
@@ -400 +506 @@
      echo '<div id="entry-content"><div class="constrained">';
      
-     echo
-     '<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').
-     form::field('post_title',20,255,html::escapeHTML($post_title),'maximal').
-     '</label></p>'.
-     
-     '<p class="area" id="excerpt-area"><label for="post_excerpt">'.__('Excerpt:').'</label> '.
-     form::textarea('post_excerpt',50,5,html::escapeHTML($post_excerpt)).
-     '</p>'.
-     
-     '<p class="area"><label class="required" '.
-     'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.
-     form::textarea('post_content',50,$core->auth->getOption('edit_size'),html::escapeHTML($post_content)).
-     '</p>';
-     
-     echo
-     '<p class="area" id="notes-area"><label for="post_notes">'.__('Notes:').'</label>'.
-     form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
-     '</p>';
+     
+     foreach ($main_items as $id => $item) {
+          echo $item;
+     }
 
      # --BEHAVIOR-- adminPageForm
@@ -423 +515 @@
      
      echo
-     '<p>'.
+     '<p class="border-top">'.
      ($post_id ? form::hidden('id',$post_id) : '').
      '<input type="submit" value="'.__('Save').' (s)" '.
@@ -450 +542 @@
      echo '<div id="entry-sidebar">';
      
-     echo
-     '<p><label for="post_status">'.__('Page status:').
-     form::combo('post_status',$status_combo,$post_status,'','',!$can_publish).
-     '</label></p>'.
-     
-     '<p><label for="post_dt">'.__('Published on:').
-     form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).'</label></p>'.
-     
-     '<p><label for="post_format">'.__('Text formating:').
-     form::combo('post_format',$formaters_combo,$post_format).
-     ($post_id && $post_format != 'xhtml' ? '<a href="'.html::escapeURL($redir_url).'&amp;id='.$post_id.'&amp;xconv=1">'.__('Convert to XHTML').'</a>' : '').
-     '</label></p>'.
-     
-     '<p><label for="post_open_comment" class="classic">'.form::checkbox('post_open_comment',1,$post_open_comment).' '.
-     __('Accept comments').'</label></p>'.
-     ($core->blog->settings->system->allow_comments ? 
-          (isContributionAllowed($post_id,strtotime($post_dt),true) ? 
-               '' :
-               '<p class="form-note warn">'.__('Warning: Comments are not more accepted for this page.').'</p>') : 
-          '<p class="form-note warn">'.__('Warning: Comments are not accepted on this blog.').'</p>').
-
-     '<p><label for="post_open_tb" class="classic">'.form::checkbox('post_open_tb',1,$post_open_tb).' '.
-     __('Accept trackbacks').'</label></p>'.
-     ($core->blog->settings->system->allow_trackbacks ? 
-          (isContributionAllowed($post_id,strtotime($post_dt),false) ? 
-               '' :
-               '<p class="form-note warn">'.__('Warning: Trackbacks are not more accepted for this page.').'</p>') : 
-          '<p class="form-note warn">'.__('Warning: Trackbacks are not accepted on this blog.').'</p>').
-     
-     '<p><label for="post_selected" class="classic">'.form::checkbox('post_selected',1,$post_selected).' '.
-     __('Hide').'</label></p>'.
-     '<p class="form-note">'.
-     __('If checked this page will be active but not listed in widget Pages.').
-     '</p>'.
-
-     '<p><label for="post_position" class="classic">'.__('Page position:').' '.
-     form::field('post_position',3,3,(string) $post_position).
-     '</label></p>'.
-     
-     '<p><label for="post_lang">'.__('Page lang:').
-     form::combo('post_lang',$lang_combo,$post_lang).'</label></p>'.
-     
-     '<p><label for="post_password">'.__('Page password:').
-     form::field('post_password',10,32,html::escapeHTML($post_password),'maximal').
-     '</label></p>'.
-     
-     '<div class="lockable">'.
-     '<p><label for="post_url">'.__('Basename:').
-     form::field('post_url',10,255,html::escapeHTML($post_url),'maximal').
-     '</label></p>'.
-     '<p class="form-note warn">'.
-     __('Warning: If you set the URL manually, it may conflict with another page.').
-     '</p>'.
-     '</div>';
-     
-     if ($post_id)
-     {
-          echo
-          '<h3 class="clear">'.__('Attachments').'</h3>';
-          foreach ($post_media as $f)
-          {
-               $ftitle = $f->media_title;
-               if (strlen($ftitle) > 18) {
-                    $ftitle = substr($ftitle,0,16).'...';
-               }
-               echo
-               '<div class="media-item">'.
-               '<a class="media-icon" href="media_item.php?id='.$f->media_id.'">'.
-               '<img src="'.$f->media_icon.'" alt="" title="'.$f->basename.'" /></a>'.
-               '<ul>'.
-               '<li><a class="media-link" href="media_item.php?id='.$f->media_id.'"'.
-               'title="'.$f->basename.'">'.$ftitle.'</a></li>'.
-               '<li>'.$f->media_dtstr.'</li>'.
-               '<li>'.files::size($f->size).' - '.
-               '<a href="'.$f->file_url.'">'.__('open').'</a>'.'</li>'.
-               
-               '<li class="media-action"><a class="attachment-remove" id="attachment-'.$f->media_id.'" '.
-               'href="post_media.php?post_id='.$post_id.'&amp;media_id='.$f->media_id.'&amp;remove=1">'.
-               '<img src="images/check-off.png" alt="'.__('remove').'" /></a>'.
-               '</li>'.
-               
-               '</ul>'.
-               '</div>';
-          }
-          unset($f);
-          
-          if (empty($post_media)) {
-               echo '<p>'.__('No attachment.').'</p>';
-          }
-          echo '<p><a href="media.php?post_id='.$post_id.'">'.__('Add files to this page').'</a></p>';
+     foreach ($sidebar_items as $id => $c) {
+          echo '<div id="'.$id.'" class="box">'.
+               '<h4>'.$c['title'].'</h4>';
+          foreach ($c['items'] as $e_name=>$e_content) {
+               echo $e_content;
+          }
+          echo '</div>';
      }
      
@@ -575 +584 @@
      if ($can_edit_page && $core->auth->check('publish,contentadmin',$core->blog->id))
      {
-          $combo_action[__('publish')] = 'publish';
-          $combo_action[__('unpublish')] = 'unpublish';
-          $combo_action[__('mark as pending')] = 'pending';
-          $combo_action[__('mark as junk')] = 'junk';
+          $combo_action[__('Publish')] = 'publish';
+          $combo_action[__('Unpublish')] = 'unpublish';
+          $combo_action[__('Mark as pending')] = 'pending';
+          $combo_action[__('Mark as junk')] = 'junk';
      }
      
      if ($can_edit_page && $core->auth->check('delete,contentadmin',$core->blog->id))
      {
-          $combo_action[__('delete')] = 'delete';
+          $combo_action[__('Delete')] = 'delete';
      }
      
@@ -615 +624 @@
           '<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').
@@ -637 +646 @@
      '<form action="comment.php" method="post" id="comment-form">'.
      '<div class="constrained">'.
-     '<p><label for="comment_author" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Name:').
+     '<p><label for="comment_author" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Name:').'</label>'.
      form::field('comment_author',30,255,html::escapeHTML($core->auth->getInfo('user_cn'))).
-     '</label></p>'.
-     
-     '<p><label for="comment_email">'.__('Email:').
+     '</p>'.
+     
+     '<p><label for="comment_email">'.__('Email:').'</label>'.
      form::field('comment_email',30,255,html::escapeHTML($core->auth->getInfo('user_email'))).
-     '</label></p>'.
-     
-     '<p><label for="comment_site">'.__('Web site:').
+     '</p>'.
+     
+     '<p><label for="comment_site">'.__('Web site:').'</label>'.
      form::field('comment_site',30,255,html::escapeHTML($core->auth->getInfo('user_url'))).
-     '</label></p>'.
+     '</p>'.
      
      '<p class="area"><label for="comment_content" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Comment:').'</label> '.
@@ -688 +697 @@
      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>';
      
@@ -702 +711 @@
           switch ($rs->comment_status) {
                case 1:
-                    $img_status = sprintf($img,__('published'),'check-on.png');
+                    $img_status = sprintf($img,__('Published'),'check-on.png');
                     break;
                case 0:
-                    $img_status = sprintf($img,__('unpublished'),'check-off.png');
+                    $img_status = sprintf($img,__('Unpublished'),'check-off.png');
                     break;
                case -1:
-                    $img_status = sprintf($img,__('pending'),'check-wrn.png');
+                    $img_status = sprintf($img,__('Pending'),'check-wrn.png');
                     break;
                case -2:
-                    $img_status = sprintf($img,__('junk'),'junk.png');
+                    $img_status = sprintf($img,__('Junk'),'junk.png');
                     break;
           }
@@ -720 +729 @@
           
           '<td class="nowrap">'.
-          ($has_action ? form::checkbox(array('comments[]'),$rs->comment_id,'','','',0,'title="'.__('select this comment').'"') : '').'</td>'.
+          ($has_action ? form::checkbox(array('comments[]'),$rs->comment_id,'','','',0,'title="'.__('Select this comment').'"') : '').'</td>'.
           '<td class="maximal">'.$rs->comment_author.'</td>'.
           '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$rs->comment_dt).'</td>'.
@@ -726 +735 @@
           '<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>';

plugins/pages/page.php

@@ -139 +139 @@
                $core->media = new dcMedia($core);
                $post_media = $core->media->getPostMedia($post_id);
-          } catch (Exception $e) {}
+          } catch (Exception $e) {
+               $core->error->add($e->getMessage());
+          }
      }
 }