Changeset 821:3ebb6345afa0

Timestamp:

05/16/12 06:46:00 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Option to hide My Favs menu, closes #1320

Files:

• admin/preferences.php (modified) (3 diffs)
• inc/admin/prepend.php (modified) (4 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/preferences.php

@@ -42 +42 @@
 }
 $user_ui_iconset = @$core->auth->user_prefs->interface->iconset;
+$user_ui_nofavmenu = $core->auth->user_prefs->interface->nofavmenu;
 
 $default_tab = !empty($_GET['tab']) ? html::escapeHTML($_GET['tab']) : 'user-profile';
@@ -175 +176 @@
           }
           $core->auth->user_prefs->interface->put('iconset',(!empty($_POST['user_ui_iconset']) ? $_POST['user_ui_iconset'] : ''));
+          $core->auth->user_prefs->interface->put('nofavmenu',!empty($_POST['user_ui_nofavmenu']),'boolean');
           
           # Udate user
@@ -456 +458 @@
 '<p><label for="user_ui_enhanceduploader" class="classic">'.
 form::checkbox('user_ui_enhanceduploader',1,$user_ui_enhanceduploader).' '.
-__('Activate enhanced uploader in media manager').'</label></p>';
+__('Activate enhanced uploader in media manager').'</label></p>'.
+
+'<p><label for="user_ui_nofavmenu" class="classic">'.
+form::checkbox('user_ui_nofavmenu',1,$user_ui_nofavmenu).' '.
+__('Hide My favorites menu').'</label></p>';
 
 if (count($iconsets_combo) > 1) {

inc/admin/prepend.php

@@ -215 +215 @@
      }
      unset($hfiles,$locales_root);
+
+     $core->auth->user_prefs->addWorkspace('interface');
+     $user_ui_nofavmenu = $core->auth->user_prefs->interface->nofavmenu;
 
      # Standard favorites
@@ -266 +269 @@
      # Menus creation
      $_menu['Dashboard'] = new dcMenu('dashboard-menu',null);
-     $_menu['Favorites'] = new dcMenu('favorites-menu','My favorites');
+     if (!$user_ui_nofavmenu)
+          $_menu['Favorites'] = new dcMenu('favorites-menu','My favorites');
      $_menu['Blog'] = new dcMenu('blog-menu','Blog');
      $_menu['System'] = new dcMenu('system-menu','System');
@@ -282 +286 @@
      $_menu['Blog']->title = __('Blog');
      $_menu['Plugins']->title = __('Plugins');
-     $_menu['Favorites']->title = __('My favorites');
+     if (!$user_ui_nofavmenu)
+          $_menu['Favorites']->title = __('My favorites');
 
 /*   
@@ -333 +338 @@
           $core->auth->check('usage,contentadmin',$core->blog->id) && $core->auth->blog_count > 1);
 
-     // Set favorites menu
-     $ws = $core->auth->user_prefs->addWorkspace('favorites');
-     $count = 0;
-     foreach ($ws->dumpPrefs() as $k => $v) {
-          // User favorites only
-          if (!$v['global']) {
-               $fav = unserialize($v['value']);
-               if (dc_valid_fav($fav['url'])) {
-                    $count++;
-                    $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
-                         preg_match(dc_prepare_url($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
+     if (!$user_ui_nofavmenu) {
+          // Set favorites menu
+          $ws = $core->auth->user_prefs->addWorkspace('favorites');
+          $count = 0;
           foreach ($ws->dumpPrefs() as $k => $v) {
-               $fav = unserialize($v['value']);
-               if (dc_valid_fav($fav['url'])) {
-                    $count++;
-                    $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
-                         preg_match(dc_prepare_url($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);
+               // User favorites only
+               if (!$v['global']) {
+                    $fav = unserialize($v['value']);
+                    if (dc_valid_fav($fav['url'])) {
+                         $count++;
+                         $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
+                              preg_match(dc_prepare_url($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) {
+                    $fav = unserialize($v['value']);
+                    if (dc_valid_fav($fav['url'])) {
+                         $count++;
+                         $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
+                              preg_match(dc_prepare_url($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);
+          }
      }
 }

locales/fr/main.po

@@ -1782 +1782 @@
 msgstr "Activer l'interface avancée du gestionnaire de médias"
 
+msgid "Hide My favorites menu"
+msgstr "Cacher le menu Mes Favoris"
+
 msgid "Iconset:"
 msgstr "Jeu d'icônes :"