Changeset 152:cab8de13f64e for admin

Timestamp:

05/04/11 23:55:34 (14 years ago)

Author:

xave <xave@…>

Branch:

userprefs

Parents:

151:f677be1de397 (diff), 150:9302f6bed60c (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

Files:

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

admin/index.php

@@ -44 +44 @@
 
 # Check dashboard module prefs
-$core->auth->user_prefs->loadPrefs();
-     
-     // Set favorites menu
-     $ws = $core->auth->user_prefs->addWorkspace('favorites');
-     $count = 0;
-     foreach ($ws->dumpPrefs() as $k => $v) {
-          // User favorites only
-          if (!$v['global']) {
-               $count++;
-               $fav = unserialize($v['value']);
-               $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
-                    preg_match('/'.$fav['url'].'(\?.*)?$/',$_SERVER['REQUEST_URI']),
-                    (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
-          }
-     }    
-     if (!$count) {
-          // Global favorites if any
-          foreach ($ws->dumpPrefs() as $k => $v) {
-               $count++;
-               $fav = unserialize($v['value']);
-               $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
-                    preg_match('/'.$fav['url'].'(\?.*)?$/',$_SERVER['REQUEST_URI']),
-                    (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
-          }
-     }
-     if (!$count) {
-          // No user or global favorites, add "new entry" fav
-          $_menu['Favorites']->addItem(__('New entry'),'post.php','images/menu/edit.png',
-               preg_match('/post.php$/',$_SERVER['REQUEST_URI']),
-               $core->auth->check('usage,contentadmin',$core->blog->id),'menu-new-post',null);
-     }
-$core->auth->user_prefs->addWorkspace('dashboard');
 if (!$core->auth->user_prefs->dashboard->prefExists('doclinks')) {
      if (!$core->auth->user_prefs->dashboard->prefExists('doclinks',true)) {
@@ -116 +84 @@
                     ($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
                $__dashboard_icons[$fav['name']] = new ArrayObject(array($title,$fav['url'],$fav['large-icon']));
+
+               # Let plugins set their own title for favorite on dashboard
+               $core->callBehavior('adminDashboardFavsIcon',$core,$fav['name'],$__dashboard_icons[$fav['name']]);
           }
      }
@@ -128 +99 @@
                     ($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
                $__dashboard_icons[$fav['name']] = new ArrayObject(array($title,$fav['url'],$fav['large-icon']));
+
+               # Let plugins set their own title for favorite on dashboard
+               $core->callBehavior('adminDashboardFavsIcon',$core,$fav['name'],$__dashboard_icons[$fav['name']]);
           }
      }
@@ -298 +272 @@
 
 # Dashboard icons
+<<<<<<< local
+echo '<div id="dashboard-main"'.($dashboardItems ? '' : ' class="fullwidth"').'><div id="icons">';
+=======
 echo '<div id="dashboard-main"><div id="icons"'.($dashboardItems ? '' : 'class="fullwidth"').'>';
+>>>>>>> other
 foreach ($__dashboard_icons as $i)
 {

admin/index.php

@@ -272 +272 @@
 
 # Dashboard icons
+<<<<<<< local
 echo '<div id="dashboard-main"'.($dashboardItems ? '' : ' class="fullwidth"').'><div id="icons">';
+=======
+echo '<div id="dashboard-main"><div id="icons"'.($dashboardItems ? '' : 'class="fullwidth"').'>';
+>>>>>>> other
 foreach ($__dashboard_icons as $i)
 {