Changeset 1792:3ad2e47ed52d

Timestamp:

09/11/13 10:08:47 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1793:a25f8d0fd400, 1829:db77f6bb5df9, 1899:840b0d73f60c

Parents:

1790:13dd14dd5254 (diff), 1791:39acc93c9d30 (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:

admin

Files:

• js/jquery/jquery.pageTabs.js (modified) (1 diff)
• js/jquery/jquery.pageTabs.js (modified) (2 diffs)
• posts.php (modified) (2 diffs)
• update.php (modified) (2 diffs)

admin/js/jquery/jquery.pageTabs.js

@@ -9 +9 @@
           breakerClassName: 'clear'
      };
-     
+
      var index = start_tab ? start_tab : 0;
      var hash = document.location.hash.split('#').join('');

admin/js/jquery/jquery.pageTabs.js

@@ -15 +15 @@
           var index = hash;
      }
-
+     
      this.params = jQuery.extend(defaults,settings);
      this.divs = jQuery('div.'+this.params.className);
@@ -78 +78 @@
           var i = 0;
           var to_trigger = null;
+          var exists = false;
 
           this.divs.each(function() {
                if ((this.id != '' && this.id == index) || i == index) {
-                    jQuery(this).show(0);
-                    This.items[i].className = This.params.listClassName+'-active';
-                    to_trigger = i;
-               } else {
-                    jQuery(this).hide(0);
-                    This.items[i].className = '';
+                    exists = true;
                }
-
                i++;
           });
+          
+          i = 0;
+          
+          if( exists ) {
+               this.divs.each(function() {
+                    if ((this.id != '' && this.id == index) || i == index) {
+                         jQuery(this).show(0);
+                         This.items[i].className = This.params.listClassName+'-active';
+                         to_trigger = i;
+                    } else {
+                         jQuery(this).hide(0);
+                         This.items[i].className = '';
+                    }
+     
+                    i++;
+               });
+          }
 
           if (to_trigger != null) {

admin/posts.php

@@ -47 +47 @@
 {
      # Filter form we'll put in html_block
-     $users_combo = $categories_combo = array();
-     $users_combo['-'] = $categories_combo['-'] = '';
-     while ($users->fetch())
-     {
-          $user_cn = dcUtils::getUserCN($users->user_id,$users->user_name,
-          $users->user_firstname,$users->user_displayname);
-          
-          if ($user_cn != $users->user_id) {
-               $user_cn .= ' ('.$users->user_id.')';
+     $users_combo = array_merge(
+          array('-' => ''),
+          dcAdminCombos::getUsersCombo($users)
+     );
+
+     $categories_combo = array_merge(
+          array(
+               new formSelectOption('-',''),
+               new formSelectOption(__('(No cat)'),'NULL')),          
+          dcAdminCombos::getCategoriesCombo($categories,false)
+     );
+     $categories_values = array();
+     foreach ($categories_combo as $cat) {
+          if (isset($cat->value)) {
+               $categories_values[$cat->value]=true;
           }
-          
-          $users_combo[$user_cn] = $users->user_id; 
-     }
-     
-     $categories_values = array('NULL' => true);
-     $categories_combo[__('None')] = 'NULL';
-     while ($categories->fetch()) {
-          $categories_combo[] = new formSelectOption(
-               str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').
-               html::escapeHTML($categories->cat_title).' ('.$categories->nb_post.')',
-               $categories->cat_id
-          );
-          $categories_values[$categories->cat_id] = true;
-     }
-
-     $status_combo = array(
-     '-' => ''
-     );
-     foreach ($core->blog->getAllPostStatus() as $k => $v) {
-          $status_combo[$v] = (string) $k;
-     }
+     }
+     
+     $status_combo = array_merge(
+          array('-' => ''),
+          dcAdminCombos::getPostStatusesCombo()   
+     );
      
      $selected_combo = array(
      '-' => '',
-     __('selected') => '1',
-     __('not selected') => '0'
+     __('Selected') => '1',
+     __('Not selected') => '0'
      );
      
      # Months array
-     $dt_m_combo['-'] = '';
-     while ($dates->fetch()) {
-          $dt_m_combo[dt::str('%B %Y',$dates->ts())] = $dates->year().$dates->month();
-     }
-     
-     $lang_combo['-'] = '';
-     while ($langs->fetch()) {
-          $lang_combo[$langs->post_lang] = $langs->post_lang;
-     }
+     $dt_m_combo = array_merge(
+          array('-' => ''),
+          dcAdminCombos::getDatesCombo($dates)
+     );
+     
+     $lang_combo = array_merge(
+          array('-' => ''),
+          dcAdminCombos::getLangsCombo($langs,false)   
+     );
      
      $sortby_combo = array(
@@ -249 +240 @@
 }
 
-dcPage::open(__('Entries'),$starting_script);
-
+dcPage::open(__('Entries'),$starting_script,
+     dcPage::breadcrumb(
+          array(
+               html::escapeHTML($core->blog->name) => '',
+               '<span class="page-title">'.__('Entries').'</span>' => ''
+          ))
+);
+if (!empty($_GET['upd'])) {
+     dcPage::success(__('Selected entries have been successfully updated.'));
+} elseif (!empty($_GET['del'])) {
+     dcPage::success(__('Selected entries have been successfully deleted.'));
+}
 if (!$core->error->flag())
 {
-     echo 
-     '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Entries').'</span></h2>'.
+     echo
      '<p class="top-add"><a class="button add" href="post.php">'.__('New entry').'</a></p>';
      
      if (!$show_filters) {
           echo '<p><a id="filter-control" class="form-control" href="#">'.
-          __('Filters').'</a></p>';
+          __('Filter posts list').'</a></p>';
      }
      
      echo
      '<form action="posts.php" method="get" id="filters-form">'.
-     '<fieldset><legend>'.__('Filters').'</legend>'.
-     '<div class="three-cols">'.
-     '<div class="col">'.
-     '<label for="user_id">'.__('Author:').
-     form::combo('user_id',$users_combo,$user_id).'</label> '.
-     '<label for="cat_id">'.__('Category:').
-     form::combo('cat_id',$categories_combo,$cat_id).'</label> '.
-     '<label for="status">'.__('Status:').
-     form::combo('status',$status_combo,$status).'</label> '.
-     '</div>'.
-     
-     '<div class="col">'.
-     '<label for="selected">'.__('Selected:').
-     form::combo('selected',$selected_combo,$selected).'</label> '.
-     '<label for="month">'.__('Month:').
-     form::combo('month',$dt_m_combo,$month).'</label> '.
-     '<label for="lang">'.__('Lang:').
-     form::combo('lang',$lang_combo,$lang).'</label> '.
-     '</div>'.
-     
-     '<div class="col">'.
-     '<p><label for="sortby">'.__('Order by:').
-     form::combo('sortby',$sortby_combo,$sortby).'</label> '.
-     '<label for="order">'.__('Sort:').
-     form::combo('order',$order_combo,$order).'</label></p>'.
-     '<p><label for="nb" class="classic">'.  form::field('nb',3,3,$nb_per_page).' '.
-     __('Entries per page').'</label></p> '.
-     '<p><input type="submit" value="'.__('Apply filters').'" /></p>'.
-     '</div>'.
-     '</div>'.
-     '<br class="clear" />'. //Opera sucks
-     '</fieldset>'.
+     '<h3 class="hidden">'.__('Filter posts list').'</h3>'.
+
+     '<div class="table">'.
+     '<div class="cell">'.
+     '<h4>'.__('Filters').'</h4>'.
+     '<p><label for="user_id" class="ib">'.__('Author:').'</label> '.
+     form::combo('user_id',$users_combo,$user_id).'</p>'.
+     '<p><label for="cat_id" class="ib">'.__('Category:').'</label> '.
+     form::combo('cat_id',$categories_combo,$cat_id).'</p>'.
+     '<p><label for="status" class="ib">'.__('Status:').'</label> ' .
+     form::combo('status',$status_combo,$status).'</p> '.
+     '</div>'.
+     
+     '<div class="cell filters-sibling-cell">'.
+     '<p><label for="selected" class="ib">'.__('Selected:').'</label> '.
+     form::combo('selected',$selected_combo,$selected).'</p>'.
+     '<p><label for="month" class="ib">'.__('Month:').'</label> '.
+     form::combo('month',$dt_m_combo,$month).'</p>'.
+     '<p><label for="lang" class="ib">'.__('Lang:').'</label> '.
+     form::combo('lang',$lang_combo,$lang).'</p> '.
+     '</div>'.
+     
+     '<div class="cell filters-options">'.
+     '<h4>'.__('Display options').'</h4>'.
+     '<p><label for="sortby" class="ib">'.__('Order by:').'</label> '.
+     form::combo('sortby',$sortby_combo,$sortby).'</p>'.
+     '<p><label for="order" class="ib">'.__('Sort:').'</label> '.
+     form::combo('order',$order_combo,$order).'</p>'.
+     '<p><span class="label ib">'.__('Show').'</span> <label for="nb" class="classic">'.
+     form::field('nb',3,3,$nb_per_page).' '.
+     __('entries per page').'</label></p>'.
+     '</div>'.
+     '</div>'.
+
+     '<p><input type="submit" value="'.__('Apply filters and display options').'" />'.
+     '<br class="clear" /></p>'. //Opera sucks
      '</form>';
      

admin/update.php

@@ -174 +174 @@
           dcPage::jsPageTabs($default_tab).
           dcPage::jsLoad('js/_update.js')
-     : '')
+          : ''),
+     dcPage::breadcrumb(
+          array(
+               __('System') => '',
+               '<span class="page-title">'.__('Dotclear update').'</span>' => ''
+          ))
 );
 
 if (!$core->error->flag()) {
-     echo '<h2>'.__('Dotclear update').'</h2>';
-     
      if (!empty($_GET['nocache'])) {
-          dcPage::message(__('Manual checking of update done successfully.'));
+          dcPage::success(__('Manual checking of update done successfully.'));
      }
 }
@@ -200 +203 @@
           echo
                '<p class="static-msg">'.sprintf(__('Dotclear %s is available.'),$new_v).
-                    ($version_info ? ' ('.sprintf(__('<a href="%s">Information about this version</a>.'),$version_info).')' : '').
+                    ($version_info ? ' <a href="'.$version_info.'">('.__('Information about this version').')</a>' : '').
                     '</p>'.