Changeset 1718:5bbbd8bb73fb for admin/index.php

Timestamp:

09/04/13 14:28:18 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1719:b8c48f380463, 1720:f23f530dfb4a

Parents:

1717:9df047961e9c (diff), 1710:f6287a0366e3 (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 branch into default

Files:

• admin/index.php (modified) (8 diffs)
• admin/index.php (modified) (1 diff)

admin/index.php

@@ -63 +63 @@
      $core->auth->user_prefs->dashboard->put('quickentry',false,'boolean');
 }
+
+// Handle folded/unfolded sections in admin from user preferences
+$ws = $core->auth->user_prefs->addWorkspace('toggles');
+if (!$core->auth->user_prefs->toggles->prefExists('unfolded_sections')) {
+     $core->auth->user_prefs->toggles->put('unfolded_sections','','string','Folded sections in admin',null,true);
+}
+
 
 # Dashboard icons
@@ -121 +128 @@
 $__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 +172 @@
 }
 
+# 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 +201 @@
      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) {
+          echo
+          '<div class="dc-update"><h3>'.sprintf(__('Dotclear %s is available!'),$new_v).'</h3> '.
+          '<p><a class="button submit" href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a> '.
+          '<a href="update.php?hide_msg=1">'.__('Remind me later').'</a>'.
+          ($version_info ? ' </p>'.
+          '<p><a href="'.$version_info.'" class="info">'.__('information about this version').'</a>' : '').'</p>'.
+          '</div>';
+     }
+}
 
 if ($core->auth->getInfo('user_default_blog') != $core->blog->id && $core->auth->blog_count > 1) {
@@ -204 +233 @@
 
 if ($core->blog->status == 0) {
-     echo '<p class="static-msg">'.__('This blog is offline').'</p>';
+     echo '<p class="static-msg">'.__('This blog is offline').'.</p>';
 } elseif ($core->blog->status == -1) {
-     echo '<p class="static-msg">'.__('This blog is removed').'</p>';
+     echo '<p class="static-msg">'.__('This blog is removed').'.</p>';
 }
 
@@ -313 +342 @@
      if ($i->count() > 0)
      {
-          $dashboardItems .= '<div>';
+          $dashboardItems .= '<div class="db-item">';
           foreach ($i as $v) {
                $dashboardItems .= $v;
@@ -347 +376 @@
                }
           } catch (Exception $e) { }
-          
+     
           echo
           '<div id="quick">'.
           '<h3>'.__('Quick entry').'</h3>'.
-          '<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:').
+          '<form id="quick-entry" action="post.php" method="post" class="fieldset">'.
+          '<h4>'.__('New entry').'</h4>'.
+          '<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> '.
           form::textarea('post_content',50,7).
           '</p>'.
-          '<p><label for="cat_id" class="classic">'.__('Category:').' '.
-          form::combo('cat_id',$categories_combo).'</label></p>'.
+          '<p><label for="cat_id" class="classic">'.__('Category:').'</label> '.
+          form::combo('cat_id',$categories_combo).'</p>'.
           ($core->auth->check('categories', $core->blog->id)
                ? '<div>'.
-               '<p id="new_cat">'.__('Add a new category').'</p>'.
+               '<p id="new_cat" class="q-cat">'.__('Add a new category').'</p>'.
+               '<p class="q-cat"><label for="new_cat_title">'.__('Title:').'</label> '.
+               form::field('new_cat_title',30,255,'','').'</p>'.
+               '<p class="q-cat"><label for="new_cat_parent">'.__('Parent:').'</label> '.
+               form::combo('new_cat_parent',$categories_combo,'','').
+               '</p>'.
                '<p class="form-note info clear">'.__('This category will be created when you will save your post.').'</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>'
                : '').
@@ -384 +413 @@
           form::hidden('post_notes','').
           '</p>'.
-          '</fieldset>'.
           '</form>'.
           '</div>';

admin/index.php

@@ -257 +257 @@
 
 # Check cache directory
-if (!is_dir(DC_TPL_CACHE)) {
-     $err[] = '<p>'.sprintf(__('Cache directory %s does not exist.'),DC_TPL_CACHE).'</p>';
-} else if (!is_writable(DC_TPL_CACHE)) {
-     $err[] = '<p>'.sprintf(__('Cache directory %s is not writable.'),DC_TPL_CACHE).'</p>';
+if ( $core->auth->isSuperAdmin() ) {
+     if (!is_dir(DC_TPL_CACHE) || !is_writable(DC_TPL_CACHE)) {
+          $err[] = '<p>'.__("The cache directory does not exist or is not writable. You must create this directory with sufficient rights and affect this location to \"DC_TPL_CACHE\" in inc/config.php file.").'</p>';
+     }
+} else {
+     if (!is_dir(DC_TPL_CACHE) || !is_writable(DC_TPL_CACHE)) {
+          $err[] = '<p>'.__("The cache directory does not exist or is not writable. You should contact your administrator.").'</p>';
+     }
 }
 
 # Check public directory
-if (!is_dir($core->blog->public_path)) {
-     $err[] = '<p>'.sprintf(__('Directory %s does not exist.'),$core->blog->public_path).'</p>';
-} else if (!is_writable($core->blog->public_path)) {
-     $err[] = '<p>'.sprintf(__('Directory %s is not writable.'),$core->blog->public_path).'</p>';
+if ( $core->auth->isSuperAdmin() ) {
+     if (!is_dir($core->blog->public_path) || !is_writable($core->blog->public_path)) {
+          $err[] = '<p>'.__("There is no writable directory /public/ at the location set in about:config \"public_path\". You must create this directory with sufficient rights (or change this setting).").'</p>';
+     }
+} else {
+     if (!is_dir($core->blog->public_path) || !is_writable($core->blog->public_path)) {
+          $err[] = '<p>'.__("There is no writable root directory for the media manager. You should contact your administrator.").'</p>';
+     }
 }