Changeset 1620:542c321dc040 for admin/index.php

Timestamp:

08/30/13 10:37:08 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1619:5d925866b5b3 (diff), 1593:0c884219a872 (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

Files:

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

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) {
@@ -204 +226 @@
 
 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>';
 }
 
@@ -305 +327 @@
      if ($i->count() > 0)
      {
-          $dashboardItems .= '<div>';
+          $dashboardItems .= '<div class="db-item">';
           foreach ($i as $v) {
                $dashboardItems .= $v;
@@ -339 +361 @@
                }
           } 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>'
                : '').
@@ -376 +398 @@
           form::hidden('post_notes','').
           '</p>'.
-          '</fieldset>'.
           '</form>'.
           '</div>';

admin/index.php

@@ -247 +247 @@
 }
 
+$err = array();
+
+# 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>';
+}
+
+# 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>';
+}
+
+# Error list
+if (count($err) > 0) {
+     echo '<div class="error"><p><strong>Erreur&nbsp;:</strong></p>'.
+     '<ul><li>'.implode("</li><li>",$err).'</li></ul></div>';
+}
+
 # Plugins install messages
 if (!empty($plugins_install['success']))
@@ -267 +289 @@
 # Dashboard columns (processed first, as we need to know the result before displaying the icons.)
 $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>'.sprintf(__('<a href=\"%s\">Information about this version</a>.'),$version_info) : '').
+          '</li></ul></div>';
+     }
+}
 
 # Errors modules notifications