Changeset 2164:ea097afa23e4 for inc/admin

Timestamp:

09/30/13 11:04:17 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Parents:

2163:d41b59b0ae2e (diff), 2162:ff2e89cb94bb (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 from default

Files:

• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/admin/lib.dc.page.php (modified) (3 diffs)

inc/admin/lib.dc.page.php

@@ -605 +605 @@
           self::jsVar('dotclear.msg.load_enhanced_uploader',
                __('Loading enhanced uploader, please wait.')).
+
+          self::jsVar('dotclear.msg.module_author',
+               __('Author:')).
+          self::jsVar('dotclear.msg.module_details',
+               __('Details')).
+          self::jsVar('dotclear.msg.module_support',
+               __('Support')).
+          self::jsVar('dotclear.msg.module_help',
+               __('Help:')).
+          self::jsVar('dotclear.msg.module_section',
+               __('Section:')).
+          self::jsVar('dotclear.msg.module_tags',
+               __('Tags:')).
                "\n//]]>\n".
           "</script>\n";

inc/admin/lib.dc.page.php

@@ -54 +54 @@
 
           # List of user's blogs
-          if ($core->auth->blog_count == 1 || $core->auth->blog_count > 20)
+          if ($core->auth->getBlogCount() == 1 || $core->auth->getBlogCount() > 20)
           {
                $blog_box =
@@ -60 +60 @@
                html::escapeHTML($core->blog->name).'</strong>';
 
-               if ($core->auth->blog_count > 20) {
+               if ($core->auth->getBlogCount() > 20) {
                     $blog_box .= ' - <a href="blogs.php">'.__('Change blog').'</a>';
                }
@@ -108 +108 @@
           $user_ui_hide_std_favicon = $core->auth->user_prefs->interface->hide_std_favicon;
           if (!$user_ui_hide_std_favicon) {
-               echo '<link rel="icon" type="image/png" href="images/favicon.png" />';
-          }
-
+               echo 
+               '<link rel="icon" type="image/png" href="images/favicon96-login.png" />'.
+               '<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />';
+          }
           echo
           self::jsCommon().