Changeset 782:01efbf050a8a for plugins/pages

Timestamp:

12/06/11 11:43:14 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Parents:

781:b509ac00bf4a (diff), 779:58c45f1b96e5 (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:

Merged last default changes with formfilter branch

Files:

• plugins/pages/list.php (modified) (1 diff)
• plugins/pages/list.php (modified) (3 diffs)

plugins/pages/list.php

@@ -15 +15 @@
 /* Pager class
 -------------------------------------------------------- */
-class adminPageList extends adminGenericList
+class adminPageList extends adminPostList
 {
-     public function display($page,$nb_per_page,$enclose_block='')
+     public function setColumns()
      {
-          if ($this->rs->isEmpty())
-          {
-               echo '<p><strong>'.__('No page').'</strong></p>';
-          }
-          else
-          {
-               $pager = new pager($page,$this->rs_count,$nb_per_page,10);
-               $pager->html_prev = $this->html_prev;
-               $pager->html_next = $this->html_next;
-               $pager->var_page = 'page';
-               
-               $html_block =
-               '<table class="clear"><tr>'.
-               '<th colspan="2">'.__('Title').'</th>'.
-               '<th>'.__('Date').'</th>'.
-               '<th>'.__('Author').'</th>'.
-               '<th>'.__('Comments').'</th>'.
-               '<th>'.__('Trackbacks').'</th>'.
-               '<th>'.__('Status').'</th>'.
-               '</tr>%s</table>';
-               
-               if ($enclose_block) {
-                    $html_block = sprintf($enclose_block,$html_block);
-               }
-               
-               echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-               
-               $blocks = explode('%s',$html_block);
-               
-               echo $blocks[0];
-               
-               while ($this->rs->fetch())
-               {
-                    echo $this->postLine();
-               }
-               
-               echo $blocks[1];
-               
-               echo '<p>'.__('Page(s)').' : '.$pager->getLinks().'</p>';
-          }
+          $this->addColumn('title',__('Title'),array('adminPostList','getTitle'),' class="maximal"',false);
+          $this->addColumn('date',__('Date'),array('adminPostList','getDate'));
+          $this->addColumn('author',__('Author'),array('adminPostList','getAuthor'));
+          $this->addColumn('comment',__('Comments'),array('adminPostList','getComments'));
+          $this->addColumn('trackback',__('Trackbacks'),array('adminPostList','getTrackbacks'));
+          $this->addColumn('status',__('Status'),array('adminPostList','getStatus'));
      }
      
-     private function postLine()
+     protected function getDefaultCaption()
      {
-          $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
-          switch ($this->rs->post_status) {
-               case 1:
-                    $img_status = sprintf($img,__('published'),'check-on.png');
-                    break;
-               case 0:
-                    $img_status = sprintf($img,__('unpublished'),'check-off.png');
-                    break;
-               case -1:
-                    $img_status = sprintf($img,__('scheduled'),'scheduled.png');
-                    break;
-               case -2:
-                    $img_status = sprintf($img,__('pending'),'check-wrn.png');
-                    break;
-          }
-          
-          $protected = '';
-          if ($this->rs->post_password) {
-               $protected = sprintf($img,__('protected'),'locker.png');
-          }
-          
-          $selected = '';
-          if ($this->rs->post_selected) {
-               $selected = sprintf($img,__('selected'),'selected.png');
-          }
-          
-          $attach = '';
-          $nb_media = $this->rs->countMedia();
-          if ($nb_media > 0) {
-               $attach_str = $nb_media == 1 ? __('%d attachment') : __('%d attachments');
-               $attach = sprintf($img,sprintf($attach_str,$nb_media),'attach.png');
-          }
-          
-          $res = '<tr class="line'.($this->rs->post_status != 1 ? ' offline' : '').'"'.
-          ' id="p'.$this->rs->post_id.'">';
-          
-          $res .=
-          '<td class="nowrap">'.
-          form::checkbox(array('entries[]'),$this->rs->post_id,'','','',!$this->rs->isEditable(),'title="'.__('select this page').'"').'</td>'.
-          '<td class="maximal"><a href="'.$this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id).'">'.
-          html::escapeHTML($this->rs->post_title).'</a></td>'.
-          '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.
-          
-          '<td class="nowrap">'.$this->rs->user_id.'</td>'.
-          '<td class="nowrap">'.$this->rs->nb_comment.'</td>'.
-          '<td class="nowrap">'.$this->rs->nb_trackback.'</td>'.
-          '<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>'.
-          '</tr>';
-          
-          return $res;
+          return __('Pages list');
      }
 }

plugins/pages/list.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2010 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -64 +64 @@
      $combo_action[__('publish')] = 'publish';
      $combo_action[__('unpublish')] = 'unpublish';
+     $combo_action[__('schedule')] = 'schedule';
      $combo_action[__('mark as pending')] = 'pending';
 }
@@ -93 +94 @@
 <body>
 <?php
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.__('Pages').'</h2>'.
+echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Pages').'</span></h2>'.
 '<p class="top-add"><a class="button add" href="'.$p_url.'&amp;act=page">'.__('New page').'</a></p>';