Changeset 1468:3132a0aca046 for admin/index.php

Timestamp:

08/19/13 09:55:29 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1466:e67efe636ce1 (diff), 1467:917fc08f3a59 (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 commits into default branch (should be verified)

Files:

• admin/index.php (modified) (3 diffs)
• admin/index.php (modified) (7 diffs)

admin/index.php

@@ -59 +59 @@
 if (!$core->auth->user_prefs->dashboard->prefExists('quickentry')) {
      if (!$core->auth->user_prefs->dashboard->prefExists('quickentry',true)) {
-          $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean','',null,true);
-     }
-     $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean');
+          $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean','',null,true);
+     }
+     $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean');
 }
 
@@ -309 +309 @@
      if ($core->auth->check('usage,contentadmin',$core->blog->id))
      {
-          $categories_combo = array(' ' => '');
+          # Getting categories
+          $categories_combo = array(__('(No cat)') => '');
           try {
                $categories = $core->blog->getCategories(array('post_type'=>'post'));
-               while ($categories->fetch()) {
-                    $categories_combo[] = new formSelectOption(
-                         str_repeat('  ',$categories->level-1).
-                         ($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
-                         $categories->cat_id
-                    );
+               if (!$categories->isEmpty()) {
+                    while ($categories->fetch()) {
+                         $catparents_combo[] = $categories_combo[] = new formSelectOption(
+                              str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
+                              $categories->cat_id
+                         );
+                    }
                }
           } catch (Exception $e) { }
@@ -333 +335 @@
           form::textarea('post_content',50,7).
           '</p>'.
-          '<p><label for="cat_id" class="classic">'.__('Category:').'</label> '.
-          form::combo('cat_id',$categories_combo).'</p>'.
+          '<p><label for="cat_id" class="classic">'.__('Category:').' '.
+          form::combo('cat_id',$categories_combo).'</label></p>'.
+          ($core->auth->check('categories', $core->blog->id)
+               ? '<div>'.
+               '<p id="new_cat">'.__('Add a new category').'</p>'.
+               '<p><label for="new_cat_title">'.__('Title:').' '.
+               form::field('new_cat_title',30,255,'','maximal').'</label></p>'.
+               '<p><label for="new_cat_parent">'.__('Parent:').' '.
+               form::combo('new_cat_parent',$categories_combo,'','maximal').
+               '</label></p>'.
+               '</div>'
+               : '').
           '<p><input type="submit" value="'.__('Save').'" name="save" /> '.
           ($core->auth->check('publish',$core->blog->id)

admin/index.php

@@ -121 +121 @@
 $__dashboard_items = new ArrayObject(array(new ArrayObject,new ArrayObject));
 
-# Documentation links
 $dashboardItem = 0;
-if ($core->auth->user_prefs->dashboard->doclinks) {
-     if (!empty($__resources['doc']))
-     {
-          $doc_links = '<h3>'.__('Documentation and support').'</h3><ul>';
-     
-          foreach ($__resources['doc'] as $k => $v) {
-               $doc_links .= '<li><a href="'.$v.'" title="'.$k.' '.__('(external link)').'">'.$k.'</a></li>';
-          }
-     
-          $doc_links .= '</ul>';
-          $__dashboard_items[$dashboardItem][] = $doc_links;
-          $dashboardItem++;
-     }
-}
 
 if ($core->auth->user_prefs->dashboard->dcnews) {
@@ -180 +165 @@
 }
 
+# Documentation links
+if ($core->auth->user_prefs->dashboard->doclinks) {
+     if (!empty($__resources['doc']))
+     {
+          $doc_links = '<h3>'.__('Documentation and support').'</h3><ul>';
+     
+          foreach ($__resources['doc'] as $k => $v) {
+               $doc_links .= '<li><a href="'.$v.'" title="'.$k.' '.__('(external link)').'">'.$k.'</a></li>';
+          }
+     
+          $doc_links .= '</ul>';
+          $__dashboard_items[$dashboardItem][] = $doc_links;
+          $dashboardItem++;
+     }
+}
+
 $core->callBehavior('adminDashboardItems', $core, $__dashboard_items);
 
@@ -193 +194 @@
      dcPage::jsLoad('js/_index.js').
      # --BEHAVIOR-- adminDashboardHeaders
-     $core->callBehavior('adminDashboardHeaders')
+     $core->callBehavior('adminDashboardHeaders'),
+     dcPage::breadcrumb(
+          array(
+          '<span class="page-title">'.__('Dashboard').' : '.html::escapeHTML($core->blog->name).'</span>' => ''
+          ),
+          false)
 );
 
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Dashboard').'</span></h2>';
+# Dotclear updates notifications
+if ($core->auth->isSuperAdmin() && is_readable(DC_DIGESTS))
+{
+     $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions');
+     $new_v = $updater->check(DC_VERSION);
+     $version_info = $new_v ? $updater->getInfoURL() : '';
+
+     if ($updater->getNotify() && $new_v) {
+          $message =
+          '<div><p>'.sprintf(__('Dotclear %s is available!'),$new_v).'</p> '.
+          '<ul><li><strong><a href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a></strong>'.
+          '</li><li><a href="update.php?hide_msg=1">'.__('Remind me later').'</a>'.
+          ($version_info ? ' </li><li><a href="'.$version_info.'">'.__('information about this version').'</a>' : '').
+          '</li></ul></div>';
+          dcPage::message($message,false,true);
+     }
+}
 
 if ($core->auth->getInfo('user_default_blog') != $core->blog->id && $core->auth->blog_count > 1) {
@@ -246 +268 @@
 $dashboardItems = '';
 
-# Dotclear updates notifications
-if ($core->auth->isSuperAdmin() && is_readable(DC_DIGESTS))
-{
-     $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions');
-     $new_v = $updater->check(DC_VERSION);
-     $version_info = $new_v ? $updater->getInfoURL() : '';
-     
-     if ($updater->getNotify() && $new_v) {
-          $dashboardItems .=
-          '<div id="upg-notify" class="static-msg"><p>'.sprintf(__('Dotclear %s is available!'),$new_v).'</p> '.
-          '<ul><li><strong><a href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a></strong>'.
-          '</li><li><a href="update.php?hide_msg=1">'.__('Remind me later').'</a>'.
-          ($version_info ? ' </li><li><a href="'.$version_info.'">'.__('information about this version').'</a>' : '').
-          '</li></ul></div>';
-     }
-}
-
 # Errors modules notifications
 if ($core->auth->isSuperAdmin())
@@ -283 +288 @@
      if ($i->count() > 0)
      {
-          $dashboardItems .= '<div>';
+          $dashboardItems .= '<div class="db-item">';
           foreach ($i as $v) {
                $dashboardItems .= $v;
@@ -317 +322 @@
                }
           } catch (Exception $e) { }
-          
+     
           echo
           '<div id="quick">'.
@@ -323 +328 @@
           '<form id="quick-entry" action="post.php" method="post">'.
           '<fieldset><legend>'.__('New entry').'</legend>'.
-          '<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').
+          '<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'.
           form::field('post_title',20,255,'','maximal').
-          '</label></p>'.
+          '</p>'.
           '<p class="area"><label class="required" '.
           'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.