Changeset 2302:db4df1d4252c

Timestamp:

10/07/13 07:57:06 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Return back of the true default favorites

Files:

• admin/install/index.php (modified) (1 diff)
• inc/admin/class.dc.favorites.php (modified) (5 diffs)

admin/install/index.php

@@ -216 +216 @@
 
           # Add default favorites
-          $core->auth->user_prefs->addWorkspace('favorites');
-
-          $init_fav = array();
-          
-          $init_fav['new_post'] = array('new_post','New entry','post.php',
-               'images/menu/edit.png','images/menu/edit-b.png',
-               'usage,contentadmin',null,null);
-          $init_fav['newpage'] = array('newpage','New page','plugin.php?p=pages&act=page',
-               'index.php?pf=pages/icon-np.png','index.php?pf=pages/icon-np-big.png',
-               'contentadmin,pages',null,null);
-          $init_fav['media'] = array('media','Media manager','media.php',
-               'images/menu/media.png','images/menu/media-b.png',
-               'media,media_admin',null,null);
-          $init_fav['widgets'] = array('widgets','Presentation widgets','plugin.php?p=widgets',
-               'index.php?pf=widgets/icon.png','index.php?pf=widgets/icon-big.png',
-               'admin',null,null);
-          $init_fav['blog_theme'] = array('blog_theme','Blog appearance','blog_theme.php',
-               'images/menu/themes.png','images/menu/blog-theme-b.png',
-               'admin',null,null);
-
-          $count = 0;
-          foreach ($init_fav as $k => $f) {
-               $t = array('name' => $f[0],'title' => $f[1],'url' => $f[2], 'small-icon' => $f[3],
-                    'large-icon' => $f[4],'permissions' => $f[5],'id' => $f[6],'class' => $f[7]);
-               $core->auth->user_prefs->favorites->put(sprintf("g%03s",$count),serialize($t),'string',null,true,true);
-               $count++;
-          }
-          
+          $init_favs = array('posts','new_post','newpage','comments','categories','media','blog_theme','widgets','simpleMenu','prefs','help');
+          $core->favs->setFavoriteIDs($init_favs,true);
+
           $step = 1;
      }

inc/admin/class.dc.favorites.php

@@ -397 +397 @@
      public static function initDefaultFavorites($favs) {
           $favs->registerMultiple(array(
+               'prefs' => array(
+                    'title' => __('My preferences'),
+                    'url' => 'preferences.php',
+                    'small-icon' => 'images/menu/user-pref.png',
+                    'large-icon' => 'images/menu/user-pref-b.png'),
+               'new_post' => array(
+                    'title' => __('New entry'),
+                    'url' => 'post.php',
+                    'small-icon' => 'images/menu/edit.png',
+                    'large-icon' => 'images/menu/edit-b.png',
+                    'permissions' =>'usage,contentadmin'),
                'posts' => array(
                     'title' => __('Entries'),
@@ -404 +415 @@
                     'permissions' => 'usage,contentadmin',
                     'dashboard_cb' => array('defaultFavorites','postsDashboard')),
-               'new_post' => array(
-                    'title' => __('New entry'),
-                    'url' => 'post.php',
-                    'small-icon' => 'images/menu/edit.png',
-                    'large-icon' => 'images/menu/edit-b.png',
-                    'permissions' =>'usage,contentadmin'),
-               'newpage' => array(
-                    'title' => __('New page'),
-                    'url' => 'plugin.php?p=pages&act=page',
-                    'small-icon' => 'index.php?pf=pages/icon-np.png',
-                    'large-icon' => 'index.php?pf=pages/icon-np-big.png',
-                    'permissions' => 'contentadmin,pages',
-                    'active_cb' => array('pagesDashboard','newPageActiveCB')),
                'comments' => array(
                     'title' => __('Comments'),
@@ -424 +422 @@
                     'permissions' => 'usage,contentadmin',
                     'dashboard_cb' => array('defaultFavorites','commentsDashboard')),
+               'search' => array(
+                    'title' => __('Search'),
+                    'url' => 'search.php',
+                    'small-icon' => 'images/menu/search.png',
+                    'large-icon' => 'images/menu/search-b.png',
+                    'permissions' => 'usage,contentadmin'),
                'categories' => array(
                     'title' => __('Categories'),
@@ -436 +440 @@
                     'large-icon' => 'images/menu/media-b.png',
                     'permissions' => 'media, media_admin'),
+               'blog_pref' => array(
+                    'title' => __('Blog settings'),
+                    'url' => 'blog_pref.php',
+                    'small-icon' => 'images/menu/blog-pref.png',
+                    'large-icon' => 'images/menu/blog-pref-b.png',
+                    'permissions' => 'admin'),
                'blog_theme' => array(
                     'title' => __('Blog appearance'),
@@ -442 +452 @@
                     'large-icon' => 'images/menu/blog-theme-b.png',
                     'permissions' => 'admin'),
-               'widgets' => array(
-                    'title' => __('Presentation widgets'),
-                    'url' => 'plugin.php?p=widgets',
-                    'small-icon' => 'index.php?pf=widgets/icon.png',
-                    'large-icon' => 'index.php?pf=widgets/icon-big.png'),
-               'simpleMenu' => array(
-                    'title' => __('Simple menu'),
-                    'url' => 'plugin.php?p=simpleMenu',
-                    'small-icon' => 'index.php?pf=simpleMenu/icon-small.png',
-                    'large-icon' => 'index.php?pf=simpleMenu/icon.png',
-                    'permissions' => 'usage,contentadmin'),
-               'prefs' => array(
-                    'title' => __('My preferences'),
-                    'url' => 'preferences.php',
-                    'small-icon' => 'images/menu/user-pref.png',
-                    'large-icon' => 'images/menu/user-pref-b.png'),
+               'blogs' => array(
+                    'title' => __('Blogs'),
+                    'url' => 'blogs.php',
+                    'small-icon' => 'images/menu/blogs.png',
+                    'large-icon' => 'images/menu/blogs-b.png',
+                    'permissions' =>'usage,contentadmin'),
+               'users' => array(
+                    'title' => __('Users'),
+                    'url' => 'users.php',
+                    'small-icon' => 'images/menu/users.png',
+                    'large-icon' => 'images/menu/users-b.png'),
+               'plugins' => array(
+                    'title' => __('Plugins management'),
+                    'url' => 'plugins.php',
+                    'small-icon' => 'images/menu/plugins.png',
+                    'large-icon' => 'images/menu/plugins-b.png'),
+               'langs' => array(
+                    'title' => __('Languages'),
+                    'url' => 'langs.php',
+                    'small-icon' => 'images/menu/langs.png',
+                    'large-icon' => 'images/menu/langs-b.png'),
                'help' => array(
                     'title' => __('Global help'),