Changeset 3265:fb9870e49400

Timestamp:

07/10/16 17:43:26 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

3266:7af12b0d86d2, 3286:756eedc2fc15

Message:

Optional display of columns in posts and pages lists, closes #1074

Files:

• admin/preferences.php (modified) (3 diffs)
• inc/admin/lib.pager.php (modified) (5 diffs)
• locales/fr/main.po (modified) (1 diff)
• plugins/pages/_admin.php (modified) (1 diff)
• plugins/pages/class.listpage.php (modified) (2 diffs)

admin/preferences.php

@@ -99 +99 @@
 $lang_combo = dcAdminCombos::getAdminLangsCombo();
 
+# Get default colums (admin lists)
+$cols = array(
+     'posts' => array(__('Posts'), array(
+          'date' => array(true,__('Date')),
+          'category' => array(true,__('Category')),
+          'author' => array(true,__('Author')),
+          'comments' => array(true,__('Comments')),
+          'trackbacks' => array(true,__('Trackbacks'))
+     ))
+);
+$cols = new arrayObject($cols);
+$core->callBehavior('adminColumnsLists',$core,$cols);
+# Load user settings
+$cols_user = @$core->auth->user_prefs->interface->cols;
+if (is_array($cols_user)) {
+     foreach ($cols_user as $ct => $cv) {
+          foreach ($cv as $cn => $cd) {
+               if (isset($cols[$ct][1][$cn])) {
+                    $cols[$ct][1][$cn][0] = $cd;
+               }
+          }
+     }
+}
+
 # Add or update user
 if (isset($_POST['user_name']))
@@ -196 +220 @@
           $core->auth->user_prefs->interface->put('media_last_dirs',array(),'array',null,false);
           $core->auth->user_prefs->interface->put('media_fav_dirs',array(),'array',null,false);
+
+          # Update user columns (lists)
+          $cu = array();
+          foreach ($cols as $col_type => $cols_list) {
+               $ct = array();
+               foreach ($cols_list[1] as $col_name => $col_data) {
+                    $ct[$col_name] = isset($_POST['cols_'.$col_type]) && in_array($col_name,$_POST['cols_'.$col_type],true) ? true : false;
+               }
+               if (count($ct)) {
+                    $cu[$col_type] = $ct;
+               }
+          }
+          $core->auth->user_prefs->interface->put('cols',$cu,'array');
 
           # Update user
@@ -463 +500 @@
 echo
 '<div class="fieldset">'.
+'<h4>'.__('Optional columns displayed in lists').'</h4>';
+foreach ($cols as $col_type => $col_list) {
+     echo '<h5>'.$col_list[0].'</h5>';
+     foreach ($col_list[1] as $col_name => $col_data) {
+          echo
+          '<p><label for="cols_'.$col_type.'-"'.$col_name.'" class="classic">'.
+          form::checkbox(array('cols_'.$col_type.'[]','cols_'.$col_type.'-'.$col_name),$col_name,$col_data[0]).$col_data[1].'</label>';
+     }
+}
+echo '</div>';
+
+echo
+'<div class="fieldset">'.
 '<h4>'.__('Edition').'</h4>';
 

inc/admin/lib.pager.php

@@ -147 +147 @@
           $this->html_next = __('next »');
      }
+
+     public function userColumns($type,$cols)
+     {
+          $cols_user = @$this->core->auth->user_prefs->interface->cols;
+          if (is_array($cols_user)) {
+               if (isset($cols_user[$type])) {
+                    foreach ($cols_user[$type] as $cn => $cd) {
+                         if (!$cd && isset($cols[$cn])) {
+                              unset($cols[$cn]);
+                         }
+                    }
+               }
+          }
+     }
 }
 
@@ -218 +232 @@
                $this->core->callBehavior('adminPostListHeader',$this->core,$this->rs,$cols);
 
+               // Cope with optional columns
+               $this->userColumns('posts',$cols);
+
                $html_block .= '<tr>'.implode(iterator_to_array($cols)).'</tr>%s</table></div>';
                if ($enclose_block) {
@@ -313 +330 @@
           $this->core->callBehavior('adminPostListValue',$this->core,$this->rs,$cols);
 
+          // Cope with optional columns
+          $this->userColumns('posts',$cols);
+
           $res .= implode(iterator_to_array($cols));
           $res .= '</tr>';
@@ -345 +365 @@
                $cols = new ArrayObject($cols);
                $this->core->callBehavior('adminPostMiniListHeader',$this->core,$this->rs,$cols);
+
+               // Cope with optional columns
+               $this->userColumns('posts',$cols);
 
                $html_block .= '<tr>'.implode(iterator_to_array($cols)).'</tr>%s</table></div>';
@@ -423 +446 @@
           $cols = new ArrayObject($cols);
           $this->core->callBehavior('adminPostMiniListValue',$this->core,$this->rs,$cols);
+
+          // Cope with optional columns
+          $this->userColumns('posts',$cols);
 
           $res .= implode(iterator_to_array($cols));

locales/fr/main.po

@@ -2127 +2127 @@
 msgstr "Ce choix sera appliqué pour tous les utilisateurs"
 
+msgid "Optional columns displayed in lists"
+msgstr "Colonnes optionnelles affichées dans les listes"
+
 msgid "Edition"
 msgstr "Édition"

plugins/pages/_admin.php

@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
+$core->addBehavior('adminColumnsLists',array('pagesColumnsLists','adminColumnsLists'));
 $core->addBehavior('adminDashboardFavorites',array('pagesDashboard','pagesDashboardFavs'));
 $core->addBehavior('adminUsersActionsHeaders','pages_users_actions_headers');
+
+class pagesColumnsLists
+{
+     public static function adminColumnsLists($core,$cols)
+     {
+          // Set optional columns in pages lists
+          $cols['pages'] = array(__('Pages'), array(
+               'date' => array(true,__('Date')),
+               'author' => array(true,__('Author')),
+               'comments' => array(true,__('Comments')),
+               'trackbacks' => array(true,__('Trackbacks'))
+          ));
+     }
+}
 
 class pagesDashboard

plugins/pages/class.listpage.php

@@ -47 +47 @@
                $cols = new ArrayObject($cols);
                $this->core->callBehavior('adminPagesListHeader',$this->core,$this->rs,$cols);
+
+               // Cope with optional columns
+               $this->userColumns('pages',$cols);
 
                $html_block .= '<tr>'.implode(iterator_to_array($cols)).
@@ -135 +138 @@
           $this->core->callBehavior('adminPagesListValue',$this->core,$this->rs,$cols);
 
+          // Cope with optional columns
+          $this->userColumns('pages',$cols);
+
           $res .= implode(iterator_to_array($cols));
           $res .= '</tr>';