Changeset 862478

Timestamp:

02/21/2014 05:29:32 PM (12 years ago)

Author:

AlphaGolf_fr

Message:

Update the trunk with a pre-0.27 / build 2642

Location:

wp-symposium-toolbar/trunk

Files:

• css/wp-symposium-toolbar_admin.css (modified) (3 diffs)
• js/wp-symposium-toolbar.js (modified) (2 diffs)
• js/wp-symposium-toolbar_preview.js (modified) (19 diffs)
• readme.txt (modified) (3 diffs)
• wp-symposium-toolbar.php (modified) (6 diffs)
• wp-symposium-toolbar_admin.php (modified) (4 diffs)
• wp-symposium-toolbar_admin_functions.php (modified) (23 diffs)
• wp-symposium-toolbar_functions.php (modified) (3 diffs)

wp-symposium-toolbar/trunk/css/wp-symposium-toolbar_admin.css

@@ -16 +16 @@
 
 /**
- * Default WP Icons
+ * Default Toolbar Height
  */
 
 @media screen and (min-width: 783px) {
-    #wpadminbar .ab-top-menu > li > a:before {
-        top: 1px;
-    }
-/*  #wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon:before,
-    #wpadminbar #wp-admin-bar-updates .ab-icon:before,
-    #wpadminbar #wp-admin-bar-my-sites > .ab-item:before,
-    #wpadminbar #wp-admin-bar-site-name > .ab-item:before {
-        top: 0px;
-    }
-    #wpadminbar #wp-admin-bar-comments .ab-icon:before {
-        top: 2px;
-    } /* */
+    #wpadminbar .ab-top-secondary {
+        height: 32px;
+    }
 }
 
@@ -87 +78 @@
     font-family: dashicons !important;
     content: '\f319';
-}
-/*
-#wpadminbar .symposium-toolbar-social-icon > .ab-item:before {
-    top: 0px;
-} /* */
+    top: 2px;
+}
 
 #wpadminbar #wp-admin-bar-symposium-toolbar-share-linkedin > .ab-item:before {
@@ -392 +380 @@
 }
 
+/* Fix arrows height for User Menu submenus */
+@media screen and (max-width: 782px) {
+    #wpadminbar .ab-top-secondary .menupop .menupop > .ab-item:before {
+        top: 10px;
+    }
+}
+@media screen and (min-width: 783px) {
+    #wpadminbar .ab-top-secondary .menupop .menupop > .ab-item:before {
+        top: 1px !Important;
+    }
+}
+
 /**
  * Site Name Menu

wp-symposium-toolbar/trunk/js/wp-symposium-toolbar.js

@@ -57 +57 @@
         // Get the current screen width
         navWidth = $( '#wpst-nav-management' ).width();
-        arrowWidth = $( '#wpst-nav-tabs-arrow-left' ).outerWidth(); // Recompute it in case of switch between responsive and normal
+        
+        // Recompute it in case of switch between responsive and normal
+        arrowWidth = $( '#wpst-nav-tabs-arrow-left' ).outerWidth();
         
         // Compute the total width of all tabs and set the container width
@@ -187 +189 @@
         }
         
-        // Such fields are part of the definition of a font shadow
-        // if ( $(this).hasClass( "wpst_font_shadow" ) ) {
-            
-            // If this contains a default value, add default class to all three
-            // if ( $(this).val() == "0" ) {
-                // if ( ( $("#wpst_font_h_shadow").val() == "0" ) && ( $("#wpst_font_v_shadow").val() == "0" ) && ( $("#wpst_font_shadow_blur").val() == "0" ) )
-                    // $(".wpst_font_shadow").addClass( "wpst-has-default" );
-            
-            // If this contains a non-default value, remove default class from all three
-            // } else {
-                // $(".wpst_font_shadow").removeClass( "wpst-has-default" );
-            // }
-        
         // If this contains a default value, add default class
-        // } else {
-            if ( $(this).val() == document.getElementById( this.id+"_default" ).value ) {
-                $(this).addClass( "wpst-has-default" );
-            }
-        // }
-
+        if ( $(this).val() == document.getElementById( this.id+"_default" ).value ) {
+            $(this).addClass( "wpst-has-default" );
+        }
     });
 });

wp-symposium-toolbar/trunk/js/wp-symposium-toolbar_preview.js

@@ -15 +15 @@
  */
 
-// References:
-// http://make.wordpress.org/core/2012/11/30/new-color-picker-in-wp-3-5/
-// http://melchoyce.github.io/dashicons/
-// http://hofmannsven.com/2013/laboratory/wordpress-admin-ui/
-    
 jQuery(document).ready(function($){
 
@@ -52 +47 @@
     
     // KEEPERS
-    
-    var wpstRgbColors = ( $("#wpadminbar").css("background-color").search("rgb") >= 0 );
     
     var wpstDefaultHeight = "32";
@@ -93 +86 @@
     
     var wpstFontSizeEmpty = "13px";
-    var wpstIconSizeEmpty = "20";
+    var wpstIconSizeEmpty = 20;
     var wpstFontSizeSmallEmpty = "11px";
     var wpstFontNormal = "normal";
     var wpstFontNone = "none";
+    
+    var wpstRgbColors = ( $("#wpadminbar").css("background-color").search("rgb") >= 0 );
     
     // Determine gradient string from browser type
@@ -108 +103 @@
     // Determine window width
     document.body.style.overflow = "hidden";
+    var wpadminbarHeight = $( "#wpadminbar" ).height();
     var wpadminbarWidth = $( "#wpadminbar" ).width();
     document.body.style.overflow = "";
@@ -119 +115 @@
             update_tb_height();
             update_tb_background();
+            update_tb_icon_margin();
         }
     });
@@ -205 +202 @@
         if ( wpadminbarWidth < 783 ) return;
         
-        // Toolbar Height
+        // vars
         var tbHeight = ( $('#wpst_height').val() != "" ) ? $('#wpst_height').val() : wpstDefaultHeight;
-        var tbPaddingTop = Math.round( ( tbHeight - wpstDefaultHeight )/2 );
-        if ( tbPaddingTop < 0 ) tbPaddingTop = 0;
-        var tbMarginTop = tbHeight - wpstDefaultHeight;
-        
+        var tbTop = Math.round( ( tbHeight - wpadminbarHeight )/2 );
+        var tbBodyMarginTop = tbHeight - wpstDefaultHeight;
+        
+        // Put it where it should go
         $("#wpadminbar").css( "height", tbHeight + "px" );
         $("#wpadminbar").find(".quicklinks").css( "height", tbHeight + "px" );
         $("#wpadminbar").find(".ab-top-secondary").css( "height", tbHeight + "px" );
-        // $("#wpadminbar").find(".quicklinks a").css( "height", tbHeight + "px" );
-        // $("#wpadminbar").find(".quicklinks .ab-empty-item").css( "height", tbHeight + "px" );
         $("#wpadminbar").find(".quicklinks > ul > li").css( "height", tbHeight + "px" );
         $("#wpadminbar").find(".shortlink-input").css( "height", tbHeight + "px" );
@@ -221 +216 @@
         $("#wpadminbar").find(".ab-top-menu > .menupop > .ab-sub-wrapper").css( "top", tbHeight + "px" );
         $("#wpadminbar").find(".ab-top-menu > .menupop > .ab-sub-wrapper .ab-sub-wrapper").css( "top", wpstSubwrapperTop + "px" );
-        $('body').css( "margin-top", tbMarginTop + "px" );
-        $("#wpbody").css( "margin-top", tbMarginTop + "px" );
-        
-        $("#wpadminbar").find(".ab-top-menu > li > .ab-item").css( "line-height", tbHeight + "px" );
-        $("#wpadminbar").find(".ab-top-menu > li > .ab-item").css( "padding-top", "0px" );
-        $("#wpadminbar").find(".ab-top-menu > li > .ab-item span").css( "line-height", tbHeight + "px" );
-        $("#wpadminbar").find(".ab-top-menu > li > .ab-item span").css( "padding-top", "0px" );
-        // $("#wpadminbar").find(".ab-icon").css( "line-height", tbHeight + "px" );
-        // $("#wpadminbar").find(".ab-icon").css( "padding-top", "0px" );
-
+        $('body').css( "margin-top", tbBodyMarginTop + "px" );
+        $("#wpbody").css( "margin-top", tbBodyMarginTop + "px" );
+        
         $("#wpadminbar").find(".quicklinks > ul > li > a").css( "height", tbHeight + "px" );
         $("#wpadminbar").find(".quicklinks > ul > li > .ab-item").css( "height", tbHeight + "px" );
         $("#wpadminbar").find(".quicklinks > ul > li > a span").css( "height", tbHeight + "px" );
         $("#wpadminbar").find(".quicklinks > ul > li > .ab-item span").css( "height", tbHeight + "px" );
-        $("#wpadminbar").find("#wp-admin-bar-wp-logo > .ab-item span").css( "height", tbHeight + "px" );
+        $("#wpadminbar").find(".ab-top-menu > li > .ab-item").css( "line-height", tbHeight + "px" );
+        $("#wpadminbar").find(".ab-top-menu > li > .ab-item span.ab-label").css( "line-height", tbHeight + "px" );
         
         // JetPack Notes
@@ -241 +230 @@
         if ( notes ) {
             var divs = document.getElementById("wp-admin-bar-notes").getElementsByTagName("div");
-            for (var i in divs) { if ( typeof divs[i].style !== "undefined" ) divs[i].style.cssText = divs[i].style.cssText + "padding-top: " + tbPaddingTop  + "px !important;"; }
-        }
-
-        // Fonticons
-        if ( document.getElementById("wpstLineHeight") )
-            var style = document.getElementById("wpstLineHeight");
+            for (var i in divs) { if ( typeof divs[i].style !== "undefined" ) divs[i].style.cssText = divs[i].style.cssText + "padding-top: " + tbTop  + "px !important;"; }
+        }
+        
+        if ( document.getElementById("wpstMarginTop") )
+            var style = document.getElementById("wpstMarginTop");
         else {
             var style = document.createElement('style');
-            style.id = 'wpstLineHeight';
-        }
-        
-        style.innerHTML = '#wpadminbar #wp-toolbar > ul > li > .ab-item:before, #wpadminbar #wp-toolbar > ul > li > .ab-item span:before, #wpadminbar .ab-item:before { line-height: '+tbHeight+'px; padding-top: 0px; } ';
-        style.innerHTML += '#wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon:before, #wpadminbar #wp-admin-bar-my-sites > .ab-item:before, #wpadminbar #wp-admin-bar-site-name > .ab-item:before, #wpadminbar #wp-admin-bar-updates .ab-icon:before { top: 0px; } ';
+            style.id = 'wpstMarginTop';
+        }
+        
+        style.innerHTML += '#wpadminbar #wp-toolbar > ul > li > .ab-item, #wpadminbar #wp-toolbar > ul > li > .ab-item span, #wpadminbar #wp-toolbar > ul > li > .ab-item:before, #wpadminbar #wp-toolbar > ul > li > .ab-item span:before, #wpadminbar > #wp-toolbar > #wp-admin-bar-root-default .ab-icon, #wpadminbar .ab-icon { line-height: '+tbHeight+'px; } ';
+        style.innerHTML += '#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { line-height: '+tbHeight+'px; } ';
         
         document.head.appendChild(style);
@@ -302 +290 @@
             $(this).find("> .ab-item").css( "background-color", tbMainColor );
             $(this).find("> .ab-item").css( "background-image", tbNormalImage );
-        } );  //  if ( !$(this).is("focus") ) {
+        } );
     }
     
@@ -362 +350 @@
     }
     
+    function update_tb_icon_margin() {
+        
+        // Non-responsive only
+        if ( wpadminbarWidth < 783 ) return;
+        
+        // vars
+        var tbHeight = ( $('#wpst_height').val() != "" ) ? $('#wpst_height').val() : wpstDefaultHeight;
+        var tbIconSize = ( $('#wpst_icon_size').val() !== "" ) ? ( parseInt( $('#wpst_icon_size').val() ) ) : wpstIconSizeEmpty;
+        
+        var sitesMarginTop = -4;
+        
+        // WP Logo and Updates icons
+        if ( tbIconSize < wpstIconSizeEmpty ) {
+            var wMarginTop = Math.round( ( ( tbIconSize - wpstIconSizeEmpty ) /2 ) - 4 );
+        } else {
+            var wMarginTop = -4;
+        }
+        
+        // WP Symposium icons
+        if ( tbIconSize < wpstIconSizeEmpty - 2 ) {
+            var sMarginTop = Math.round( ( ( tbIconSize - wpstIconSizeEmpty ) /2 ) - 5 );
+        } else {
+            var sMarginTop = -5;
+        }
+        
+        // New Content icon
+        var newMarginTop = wMarginTop + 2;
+        
+        // Put it where it should go
+        if ( document.getElementById("wpstIconMarginTop") )
+            var style = document.getElementById("wpstIconMarginTop");
+        else {
+            var style = document.createElement('style');
+            style.id = 'wpstIconMarginTop';
+        }
+        
+        style.innerHTML += '#wpadminbar #wp-admin-bar-my-sites > .ab-item:before, #wpadminbar #wp-admin-bar-site-name > .ab-item:before, #wpadminbar #wp-admin-bar-my-wpms-admin > .ab-item:before { top: '+sitesMarginTop+'px; } ';
+        style.innerHTML += '#wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon:before, #wpadminbar #wp-admin-bar-updates .ab-icon:before { top: '+wMarginTop+'px; } ';
+        style.innerHTML += '#wpadminbar #wp-admin-bar-new-content .ab-icon:before, #wpadminbar #wp-admin-bar-comments .ab-icon:before { top: '+newMarginTop+'px; } ';
+        style.innerHTML += '#wpadminbar #wp-admin-bar-my-symposium-admin > .ab-item > span.ab-icon:before, #wpadminbar li.symposium-toolbar-notifications-mail > .ab-item > .ab-icon:before, #wpadminbar li.symposium-toolbar-notifications-friendship > .ab-item > .ab-icon:before { top: '+sMarginTop+'px; } ';
+        style.innerHTML += '#wpadminbar > #wp-toolbar > #wp-admin-bar-root-default > #wp-admin-bar-search #adminbarsearch input.adminbar-input { top: '+Math.round( ( tbHeight - wpstDefaultHeight ) /2 )+'px; } ';
+        
+        document.head.appendChild(style);
+    }
+    
     function update_tb_icon_size() {
         
+        // Non-responsive only
+        if ( wpadminbarWidth < 783 ) return;
+        
+        var tbHeight = ( $('#wpst_height').val() != "" ) ? $('#wpst_height').val() : wpstDefaultHeight;
         var tbIconSize = ( $('#wpst_icon_size').val() !== "" ) ? ( parseInt( $('#wpst_icon_size').val() ) ) : wpstIconSizeEmpty;
-        if ( tbIconSize < wpstIconSizeEmpty - 1 ) {
-            var wMarginTop = Math.round( ( tbIconSize / wpstIconSizeEmpty ) / 2 );
-            var sMarginTop = Math.round( ( ( tbIconSize / wpstIconSizeEmpty ) / 2 ) - 1.5 );
-        } else {
-            var wMarginTop = 0;
-            var sMarginTop = -1;
-        }
-        var newMarginTop = wMarginTop + 2;
-        
         var tbHoverIconSize = ( $('#wpst_hover_icon_size').val() !== "" ) ? ( parseInt( $('#wpst_hover_icon_size').val() ) ) : tbIconSize;
         if ( ( tbIconSize > 0 ) && ( tbHoverIconSize > 0 ) ) {
-            var tbScale = Math.round( ( tbHoverIconSize * 100 ) / tbIconSize ) / 100;
+            var tbScale = Math.round( ( ( tbHoverIconSize * 100 ) / tbIconSize ) / 100 );
             var tbTransform = 'transform:scale('+tbScale+'); -ms-transform:scale('+tbScale+'); -webkit-transform:scale('+tbScale+'); transition: all 0.25s; ';
         } else
             var tbTransform = 'transform:scale(1); -ms-transform:scale(1); -webkit-transform:scale(1); transition: all 0.25s; ';
         
+        // Put it where it should go
         if ( document.getElementById("wpstIconSize") )
             var style = document.getElementById("wpstIconSize");
@@ -388 +417 @@
         }
         
-        style.innerHTML = '#wpadminbar .ab-item span:before, #wpadminbar .ab-top-menu > li.menupop > .ab-item:before, #wpadminbar li #adminbarsearch:before, #wpadminbar #wp-admin-bar-my-symposium-admin > .ab-item > span.ab-icon:before, #wpadminbar li.symposium-toolbar-notifications-mail > .ab-item > .ab-icon:before, #wpadminbar li.symposium-toolbar-notifications-friendship > .ab-item > .ab-icon:before, #wpadminbar #wp-toolbar > ul > li > .ab-item span.ab-icon, #wpadminbar #wp-toolbar > ul > li > .ab-item:before { font-size: '+tbIconSize+'px !Important; } ';
+        style.innerHTML = '#wpadminbar .ab-item span:before, #wpadminbar .ab-top-menu > li.menupop > .ab-item:before, #wpadminbar li #adminbarsearch:before, #wpadminbar #wp-admin-bar-my-symposium-admin > .ab-item > span.ab-icon:before, #wpadminbar li.symposium-toolbar-notifications-mail > .ab-item > .ab-icon:before, #wpadminbar li.symposium-toolbar-notifications-friendship > .ab-item > .ab-icon:before, #wpadminbar #wp-toolbar > ul > li > .ab-item span.ab-icon, #wpadminbar #wp-toolbar > ul > li > .ab-item:before, #wpadminbar #wp-toolbar > ul > li > .ab-item span:before { font-size: '+tbIconSize+'px !Important; } ';
         
         style.innerHTML += '#wp-admin-bar-wp-logo > a { width: '+tbIconSize+'px; } ';
-        style.innerHTML += '#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { width: '+ (tbIconSize - 4) +'px; height: '+ (tbIconSize - 4) +'px; } ';
-        style.innerHTML += '#wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon:before, #wpadminbar #wp-admin-bar-updates .ab-icon:before { top: '+wMarginTop+'px; } ';
-        style.innerHTML += '#wpadminbar #wp-admin-bar-new-content .ab-icon:before, #wpadminbar #wp-admin-bar-comments .ab-icon:before { top: '+newMarginTop+'px; } ';
-        style.innerHTML += '#wpadminbar #wp-admin-bar-my-symposium-admin > .ab-item > span.ab-icon:before, #wpadminbar li.symposium-toolbar-notifications-mail > .ab-item > .ab-icon:before, #wpadminbar li.symposium-toolbar-notifications-friendship > .ab-item > .ab-icon:before { top: '+sMarginTop+'px; } ';
+        style.innerHTML += '#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { width: '+ (tbIconSize - 4) +'px; height: '+ (tbIconSize - 4) +'px; margin-top: -3px; } ';
+        style.innerHTML += '#wpadminbar > #wp-toolbar > #wp-admin-bar-root-default > #wp-admin-bar-search #adminbarsearch input.adminbar-input { height: '+tbIconSize+'px; padding-left: '+tbIconSize+'px; } ';
         
         style.innerHTML += '#wpadminbar li:hover .ab-item span:before, #wpadminbar li.hover .ab-item span:before, #wpadminbar li.menupop:hover .ab-item span:before, #wpadminbar li.menupop.hover .ab-item span:before, #wpadminbar .ab-top-menu > li:hover > .ab-item:before, #wpadminbar .ab-top-menu > li.hover > .ab-item:before, #wpadminbar .ab-top-menu > li.menupop:hover > .ab-item:before, #wpadminbar .ab-top-menu > li.menupop.hover > .ab-item:before, #wpadminbar li:hover #adminbarsearch:before, #wpadminbar #wp-admin-bar-wp-logo:hover > .ab-item .ab-icon, #wpadminbar #wp-admin-bar-wp-logo.hover > .ab-item .ab-icon, #wpadminbar #wp-admin-bar-wp-logo.menupop:hover > .ab-item .ab-icon, #wpadminbar #wp-admin-bar-wp-logo.menupop.hover > .ab-item .ab-icon, #wpadminbar li:hover > .ab-item > .ab-icon, #wpadminbar li.hover > .ab-item > .ab-icon, #wpadminbar li.menupop:hover > .ab-item > .ab-icon, #wpadminbar li.menupop.hover > .ab-item > .ab-icon, #wpadminbar li:hover > .ab-item > .ab-icon:before, #wpadminbar li.hover > .ab-item > .ab-icon:before, #wpadminbar li.menupop:hover > .ab-item > .ab-icon:before, #wpadminbar li.menupop.hover > .ab-item > .ab-icon:before, #wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar:hover > a img { '+tbTransform+' } ';
@@ -402 +429 @@
     
     function update_tb_font_size() {
+        
+        // Non-responsive only
+        if ( wpadminbarWidth < 783 ) return;
         
         var tbFontSize = ( $('#wpst_font_size').val() !== "" ) ? $('#wpst_font_size').val() : wpstFontSizeEmpty;
@@ -544 +574 @@
         
         document.getElementsByTagName('head')[0].appendChild(style);
-        // document.write(x.getElementsByTagName("wpstFontShadowColour")[0].nodeName);
     }
     
@@ -661 +690 @@
             $(this).find(".blavatar").css( "color", menuMainColorExt );
         }});
-        //  if ( !$(this).is("focus") ) {
         
         // Arrows
@@ -673 +701 @@
         style.innerHTML = '#wpadminbar .menupop .menupop > .ab-item:before { color: '+menuMainColor+'; } #wpadminbar .menupop .menupop > .ab-item { color: '+menuMainColor+'; } ';
         style.innerHTML += '#wpadminbar .menupop .ab-sub-secondary .menupop > .ab-item:before { color: '+menuMainColorExt+'; } #wpadminbar .menupop .ab-sub-secondary .menupop > .ab-item { color: '+menuMainColorExt+'; } ';
-        // style.innerHTML += '#wpadminbar .menupop .menupop > .ab-item:before { color: '+menuMainColorExt+'; } ';
         style.innerHTML += '#wpadminbar .quicklinks .ab-sub-secondary > li > a > .blavatar { color: '+menuMainColorExt+'; } #wpadminbar .quicklinks .ab-sub-secondary > li > a > .blavatar:before { color: '+menuMainColorExt+'; } ';
         
@@ -679 +706 @@
         style.innerHTML += '#wpadminbar .quicklinks .ab-sub-secondary > li.hover > a > .blavatar { color: '+menuHoverColorExt+'; } #wpadminbar .quicklinks .ab-sub-secondary > li.hover > a > .blavatar:before { color: '+menuHoverColorExt+'; }  #wpadminbar .quicklinks li a:hover .blavatar:before { color: '+menuHoverColorExt+'; } ';
         style.innerHTML += '#wpadminbar .menupop .ab-sub-secondary > .menupop > .ab-item:hover:before, #wpadminbar .menupop .ab-sub-secondary > li.menupop:hover > .ab-item:before, #wpadminbar .menupop .ab-sub-secondary > li.menupop.hover > .ab-item:before { color: '+menuHoverColorExt+'; } ';
-        // style.innerHTML += '#wpadminbar .menupop .ab-sub-secondary .menupop > .ab-item:hover:before { color: '+menuHoverColorExt+'; } #wpadminbar .menupop .ab-sub-secondary > .menupop.hover > .ab-item:before { color: '+menuHoverColorExt+'; } ';
         
         document.head.appendChild(style);
@@ -757 +783 @@
         $("#wpadminbar").css(shadow, tbShadow);
         $("#wpadminbar").find(".ab-top-menu > .menupop > .ab-sub-wrapper").css(shadow, tbShadow);
-        // $("#wpadminbar .menupop .ab-sub-wrapper").css(shadow, tbShadow);
     }
     
@@ -765 +790 @@
     // Toolbar Height
     $('#wpst_height').change(function() {
+        
+        // Non-responsive only
+        if ( wpadminbarWidth < 783 ) return;
+        
         update_tb_height();
         update_tb_background();
+        update_tb_icon_margin();
     });
     
@@ -858 +888 @@
     $('.wpst_icon_size').change(function() {
         
-        update_tb_icon_size()
+        update_tb_height();
+        update_tb_font_size();
+        update_tb_icon_margin();
+        update_tb_icon_size();
     });
     

wp-symposium-toolbar/trunk/readme.txt

@@ -9 +9 @@
 Tested up to: 3.8.1
 Stable tag: 0.26.0
-Version: 0.26.32
+Version: 0.26.42
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -124 +124 @@
 
 * French translation by the author
-* Spanish translation by Maria Ramos, [WebHostingHub](http://www.webhostinghub.com/)
+* Spanish translation by Maria Ramos at WebHostingHub
 
 = Icons =
@@ -151 +151 @@
 * Bugfix: in RTL, correct display for the User Menu
 * Bugfix: Styles, preview doesn't like 3-digits colors that can actually be used by colorpickers
-* Change: Add the option to show social icons and share the site with: LinkedIn, Facebook, Twitter, Google Plus, Stumble Upon
+* Change: WP 3.8, add the option to show social icons and share the site with: LinkedIn, Facebook, Twitter, Google Plus, Stumble Upon
 * Bugfix: add the plugin build number to CSS and JS files, to ensure that the correct version of the files is always sent to the client regardless of caching
 * Change: Styles, implement default values shown & hidden via Javascript
 * Bugfix: Styles, preview mode, correct menu font colors in hover
 * Bugfix: Styles, correct menu font colors for display and user names
-* Bugfix: WP Symposium, admin menu wasn't always up to date
+* Bugfix: WP 3.8, Styles, improve vertical centering of icons on Toolbar, as well as Search field
+* Bugfix: security, strip tags from Import feature
 
 = 0.26.0. =

wp-symposium-toolbar/trunk/wp-symposium-toolbar.php

@@ -11 +11 @@
 Tested up to: 3.8
 Stable tag: 0.26.0
-Version: 0.26.32
+Version: 0.26.42
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 */
 
+// References:
+// http://make.wordpress.org/core/2012/11/30/new-color-picker-in-wp-3-5/
+// http://melchoyce.github.io/dashicons/
+// http://hofmannsven.com/2013/laboratory/wordpress-admin-ui/
+    
 // Increase Build nr at each version
 global $wpst_buildnr;
-$wpst_buildnr = 2632;
+$wpst_buildnr = 2642;
 
 
@@ -213 +218 @@
         
         // Nr of tabs that can be hidden incl. WPS
-        if ( count( get_option( 'wpst_wpms_hidden_tabs', array() ) ) == 8 )
+        $wpst_wpms_hidden_tabs = get_option( 'wpst_wpms_hidden_tabs', array() );
+        if ( !in_array( 'wps', $wpst_wpms_hidden_tabs ) ) $wpst_wpms_hidden_tabs[] = 'wps';
+        if ( !in_array( 'share', $wpst_wpms_hidden_tabs ) ) $wpst_wpms_hidden_tabs[] = 'share';
+        if ( count( $wpst_wpms_hidden_tabs ) == 9 )
             return;
         
@@ -238 +246 @@
         $wpst_wpms_hidden_tabs = get_option( 'wpst_wpms_hidden_tabs', array() );
         if ( !in_array( 'wps', $wpst_wpms_hidden_tabs ) ) $wpst_wpms_hidden_tabs[] = 'wps';
-        if ( count( $wpst_wpms_hidden_tabs ) == 8 )
+        if ( !in_array( 'share', $wpst_wpms_hidden_tabs ) ) $wpst_wpms_hidden_tabs[] = 'share';
+        if ( count( $wpst_wpms_hidden_tabs ) == 9 )
             return;
         
@@ -257 +266 @@
     function symposium_toolbar_new_site_default( $blog_id, $user_id, $domain, $path, $site_id, $meta ) {
         
+        // Hidden tabs
+        $wpst_wpms_hidden_tabs_all = get_option( 'wpst_wpms_hidden_tabs_all', array() );
         $hidden_tabs = get_option( 'wpst_wpms_hidden_tabs_default', array() );
+        $wpst_wpms_hidden_tabs_all[ $blog_id ] = $hidden_tabs;
+        update_option( 'wpst_wpms_hidden_tabs_all', $wpst_wpms_hidden_tabs_all );
+        
+        // Get other data from Main Site settings
         $wpst_style_tb_current = get_option( 'wpst_style_tb_current', array() );
+        $wpst_wpms_network_superadmin_menu = get_option( 'wpst_wpms_network_superadmin_menu', "" );
         
         switch_to_blog( $blog_id );
         
-        // Set globals
+        // Set globals locally
         symposium_toolbar_init_globals();
         
@@ -268 +284 @@
         symposium_toolbar_activate();
         
-        // Update new site options with Main Site options
+        // Update new site settings with Main Site settings
         symposium_toolbar_update();
         if ( $hidden_tabs ) foreach( $hidden_tabs as $tab ) {
@@ -274 +290 @@
         }
         update_option( 'wpst_wpms_hidden_tabs', $hidden_tabs );
+        update_option( 'wpst_wpms_network_superadmin_menu', $wpst_wpms_network_superadmin_menu );
         
         // Update CSS based on stored styles and installed plugins

wp-symposium-toolbar/trunk/wp-symposium-toolbar_admin.php

@@ -518 +518 @@
                 echo '<td>';
                     echo '<span>' . __( 'The list of all sites of the network, the admin is member of', 'wp-symposium-toolbar' ) . '</span>';
-                    // echo '<br /><span class="description"> ' . __( 'Note: This item will show only when the user is administrator of at least one site of the network, or is a super admin', 'wp-symposium-toolbar' ) . '</span>';
                     echo symposium_toolbar_add_roles_to_item( 'display_my_sites', get_option( 'wpst_toolbar_my_sites', $wpst_roles_administrator ), $wpst_roles_administrator );
                 echo '</td>';
@@ -1092 +1091 @@
                     
                     echo '<input type="checkbox" name="share_linkedin" id="share_linkedin" class="wpst-admin"';
-                    if ( isset( $share['linkedin'] ) ) if ( $share['linkedin'] == "on" )
-                    echo " CHECKED";
-                    elseif ( $share['linkedin'] != "" ) {
-                        $error = true;
-                        echo ' style="outline:1px solid #CC0000;" onclick="this.style.outline = \'none\';"';
+                    if ( isset( $share['linkedin'] ) ) {
+                        if ( $share['linkedin'] == "on" )
+                            echo " CHECKED";
+                        elseif ( $share['linkedin'] != "" ) {
+                            $error = true;
+                            echo ' style="outline:1px solid #CC0000;" onclick="this.style.outline = \'none\';"';
+                        }
                     }
                     echo '/><span class="description wpst-checkbox"> ' . __( 'LinkedIn', 'wp-symposium-toolbar' ) . '</span><br />';
                     
                     echo '<input type="checkbox" name="share_facebook" id="share_facebook" class="wpst-admin"';
-                    if ( isset( $share['facebook'] ) ) if ( $share['facebook'] == "on" )
-                    echo " CHECKED";
-                    elseif ( $share['facebook'] != "" ) {
-                        $error = true;
-                        echo ' style="outline:1px solid #CC0000;" onclick="this.style.outline = \'none\';"';
+                    if ( isset( $share['facebook'] ) ) {
+                        if ( $share['facebook'] == "on" )
+                            echo " CHECKED";
+                        elseif ( $share['facebook'] != "" ) {
+                            $error = true;
+                            echo ' style="outline:1px solid #CC0000;" onclick="this.style.outline = \'none\';"';
+                        }
                     }
                     echo '/><span class="description wpst-checkbox"> ' . __( 'Facebook', 'wp-symposium-toolbar' ) . '</span><br />';
                     
                     echo '<input type="checkbox" name="share_twitter" id="share_twitter" class="wpst-admin"';
-                    if ( isset( $share['twitter'] ) ) if ( $share['twitter'] == "on" )
-                    echo " CHECKED";
-                    elseif ( $share['twitter'] != "" ) {
-                        $error = true;
-                        echo ' style="outline:1px solid #CC0000;" onclick="this.style.outline = \'none\';"';
+                    if ( isset( $share['twitter'] ) ) {
+                        if ( $share['twitter'] == "on" )
+                            echo " CHECKED";
+                        elseif ( $share['twitter'] != "" ) {
+                            $error = true;
+                            echo ' style="outline:1px solid #CC0000;" onclick="this.style.outline = \'none\';"';
+                        }
                     }
                     echo '/><span class="description wpst-checkbox"> ' . __( 'Twitter', 'wp-symposium-toolbar' ) . '</span><br />';
                     
                     echo '<input type="checkbox" name="share_google_plus" id="share_google_plus" class="wpst-admin"';
-                    if ( isset( $share['google_plus'] ) ) if ( $share['google_plus'] == "on" )
-                    echo " CHECKED";
-                    elseif ( $share['google_plus'] != "" ) {
-                        $error = true;
-                        echo ' style="outline:1px solid #CC0000;" onclick="this.style.outline = \'none\';"';
+                    if ( isset( $share['google_plus'] ) ) {
+                        if ( $share['google_plus'] == "on" )
+                            echo " CHECKED";
+                        elseif ( $share['google_plus'] != "" ) {
+                            $error = true;
+                            echo ' style="outline:1px solid #CC0000;" onclick="this.style.outline = \'none\';"';
+                        }
                     }
                     echo '/><span class="description wpst-checkbox"> ' . __( 'Google Plus', 'wp-symposium-toolbar' ) . '</span><br />';
                     
                     echo '<input type="checkbox" name="share_stumbleupon" id="share_stumbleupon" class="wpst-admin"';
-                    if ( isset( $share['stumbleupon'] ) ) if ( $share['stumbleupon'] == "on" )
-                    echo " CHECKED";
-                    elseif ( $share['stumbleupon'] != "" ) {
-                        $error = true;
-                        echo ' style="outline:1px solid #CC0000;" onclick="this.style.outline = \'none\';"';
+                    if ( isset( $share['stumbleupon'] ) ) {
+                        if ( $share['stumbleupon'] == "on" )
+                            echo " CHECKED";
+                        elseif ( $share['stumbleupon'] != "" ) {
+                            $error = true;
+                            echo ' style="outline:1px solid #CC0000;" onclick="this.style.outline = \'none\';"';
+                        }
                     }
                     echo '/><span class="description wpst-checkbox"> ' . __( 'StumbleUpon', 'wp-symposium-toolbar' ) . '</span><br />';
@@ -1235 +1244 @@
 function symposium_toolbar_admintab_styles() {
 
-    global $wp_version, $wpst_default_toolbar;
+    global $wp_version;
     
     // Get data to show
@@ -1242 +1251 @@
     $wpst_all_borders = array( "none", "dotted", "dashed", "solid", "double" );
     
+    // Init default Toolbar style
+    $wpst_default_toolbar = symposium_toolbar_init_default_toolbar();
+    
     // Get current style
     $wpst_style_tb_current = maybe_unserialize( get_option( 'wpst_style_tb_current', array() ) );
-    
-    // Make sure globals are actually initialized
-    if ( !isset( $wpst_default_toolbar['height'] ) ) symposium_toolbar_init_default_toolbar();
     
     $wpst_top_colour = ( isset( $wpst_style_tb_current['top_colour'] ) ) ? $wpst_style_tb_current['top_colour'] : '';

wp-symposium-toolbar/trunk/wp-symposium-toolbar_admin_functions.php

@@ -78 +78 @@
  *
  * @param  none
- * @return none
+ * @return (array)$wpst_default_toolbar
  */
  function symposium_toolbar_init_default_toolbar() {
 
-    global $wp_version, $wpst_default_toolbar;
+    global $wp_version;
     
     // Build the array of default values for the Toolbar, based on WP Version
@@ -174 +174 @@
         $wpst_default_toolbar['shadow_spread'] = "0";
     }
+    
+    return $wpst_default_toolbar;
 }
 
@@ -307 +309 @@
     }
     
-    if ( get_option( 'wpst_tech_buildnr', 0 ) < 2628 ) {
+    if ( get_option( 'wpst_tech_buildnr', 0 ) < 2642 ) {
         
         // Update CSS based on stored styles and installed plugins
         $wpst_style_tb_current = get_option( 'wpst_style_tb_current', array() );
         update_option( 'wpst_tech_style_to_header', symposium_toolbar_update_styles( $wpst_style_tb_current ) );
-    }
-    
-    if ( get_option( 'wpst_tech_buildnr', 0 ) < 2632 ) {
-        
-        delete_option( 'wpst_tech_wps_admin_menu' );
     }
     
@@ -412 +409 @@
         $unserialized_custom_menus = maybe_unserialize( $wpst_main_site_select[0]["option_value"] );
         if ( is_array( $unserialized_custom_menus ) ) foreach ( $unserialized_custom_menus as $menu ) {
-            if ( !$menu[4] ) $non_network_custom_menus[] = $menu;
+            if ( isset( $custom_menu[4] ) && $custom_menu[4] ) $non_network_custom_menus[] = $menu;
         }
         $wpst_main_site_options[ "wpst_custom_menus" ] = serialize( $non_network_custom_menus );
@@ -459 +456 @@
     global $wpdb, $current_screen, $wp_version;
     global $is_wpst_network_admin, $is_wps_active, $wpst_locations, $wpst_failed, $wpst_notices, $wpst_shown_tabs, $wpst_subsites_tabs, $wpst_roles_all;
-    global $wpst_default_toolbar;
     
     // Make sure we're at the plugin options page, and only this one - this should simply confirm what this function is hooked to
@@ -466 +462 @@
     
     // Init default Toolbar style
-    if ( !isset( $wpst_default_toolbar['height'] ) ) symposium_toolbar_init_default_toolbar();
+    $wpst_default_toolbar = symposium_toolbar_init_default_toolbar();
     
     // Check for activated/deactivated WPS features, the $_POST['__wps__installation_update'] means WPS is activated
@@ -704 +700 @@
                                 $_POST['display_custom_menu_slug'][$key],
                                 $_POST['display_custom_menu_location'][$key],
-                                ( $_POST['display_custom_menu_'.$key.'_roles'] ) ? $_POST['display_custom_menu_'.$key.'_roles'] : array(),
+                                ( isset( $_POST['display_custom_menu_'.$key.'_roles'] ) ) ? $_POST['display_custom_menu_'.$key.'_roles'] : array(),
                                 filter_var( trim ( $_POST['display_custom_menu_icon'][$key] ), FILTER_SANITIZE_URL ),
                                 ( is_multisite() && is_main_site() ) ? ( isset( $_POST['display_custom_menu_network_'.$key] ) ) : false
@@ -748 +744 @@
                 $share['twitter'] = isset( $_POST["share_twitter"] ) ? 'on' : '';
                 $share['google_plus'] = isset( $_POST["share_google_plus"] ) ? 'on' : '';
-                $share['pinterest'] = isset( $_POST["share_pinterest"] ) ? 'on' : '';
+                // $share['pinterest'] = isset( $_POST["share_pinterest"] ) ? 'on' : '';
                 $share['stumbleupon'] = isset( $_POST["share_stumbleupon"] ) ? 'on' : '';
                 update_option( 'wpst_share_icons', $share );
@@ -1191 +1187 @@
             // See if the admin has imported settings using the textarea, to update them one by one
             if ( isset( $_POST["Submit"] ) && $_POST["Submit"] == __( 'Import', 'wp-symposium-toolbar' ) && isset( $_POST["toolbar_import_export"] ) && trim( $_POST["toolbar_import_export"] != '' ) ) {
-                $all_options = explode( "\n", trim( $_POST["toolbar_import_export"] ) );
+                $toolbar_import_export = strip_tags( $_POST["toolbar_import_export"] );
+                $all_options = explode( "\n", trim( $toolbar_import_export ) );
             }
             
@@ -1428 +1425 @@
                             if ( $option_name == 'wpst_style_tb_current' ) {
                                 if ( is_array( $option_value ) ) {
-                                    (bool)$update_me = true;
+                                    (bool)$stop_updating_me = false;
                                     foreach( $option_value as $key => $value ) {
-                                        if ( !isset( $value ) || !is_string( $value) || empty( $value ) ) {
-                                            $update_me = false;
+                                        if ( !isset( $value ) || ( is_string( $value) && ( $value == "" ) ) ) {
+                                            $stop_updating_me = $key;
                                             break;
                                         }
                                     }
-                                    if ( $update_me ) {
+                                    if ( !$stop_updating_me ) {
                                         $wpst_style_tb_current = array_diff_assoc( $option_value, $wpst_default_toolbar );
                                         update_option( 'wpst_style_tb_current', $wpst_style_tb_current );
-                                        // $wpst_style_tb_current = maybe_unserialize( $option_value );
-                                        // update_option( 'wpst_tech_style_to_header', symposium_toolbar_update_styles( $wpst_style_tb_current ) );
                                     } else
-                                    $wpst_failed .= $option_name.__( ': an array of non-empty values was expected, at least one value was not set correctly', 'wp-symposium-toolbar' ).'<br />';
+                                    $wpst_failed .= $option_name.__( ': an array of non-empty values was expected, at least one value was not set correctly', 'wp-symposium-toolbar' ).' ('.$key.')<br />';
                                 } else
                                     $wpst_failed .= $option_name.__( ': incorrect format, an array was expected', 'wp-symposium-toolbar' ).'<br />';
@@ -1479 +1474 @@
         // Post update cleaning tasks
         
-        // Update Styles according to above settings
-        if ( isset( $wpst_style_tb_current ) ) update_option( 'wpst_tech_style_to_header', symposium_toolbar_update_styles( $wpst_style_tb_current ) );
-        
         // Re-generate WPS Admin Menu upon saving from WPST Options page
         if ( $is_wps_active ) symposium_toolbar_update_wps_admin_menu();
+        
+        // If needed, regenerate styles
+        if ( isset( $wpst_style_tb_current ) ) update_option( 'wpst_tech_style_to_header', symposium_toolbar_update_styles( $wpst_style_tb_current ) );
         
         // Network Toolbar: Super Admin, Multisite, Main Site and network activated
@@ -1592 +1587 @@
 function symposium_toolbar_update_styles( $wpst_style_tb_current, $blog_id = "1" ) {
 
-    global $wp_version, $wpst_default_toolbar;
+    global $wp_version;
     
     $style_saved = "";
@@ -1601 +1596 @@
     
     // Init default Toolbar style
-    symposium_toolbar_init_default_toolbar();
+    $wpst_default_toolbar = symposium_toolbar_init_default_toolbar();
     
     // Toolbar Height
     $height = ( isset( $wpst_style_tb_current['height'] ) ) ? $wpst_style_tb_current['height'] : $wpst_default_toolbar['height'] ;
     if ( $height == 0 ) $height = $wpst_default_toolbar['height'];
-    $padding_top = 0;
+    $padding_top = 0;  // Needed by JetPack, below
     
     if ( $height != $wpst_default_toolbar['height'] ) {
@@ -1624 +1619 @@
         } else {
             $margin_top = $height - $wpst_default_toolbar['height'];
-            $padding_top = round( $margin_top /2 );  // Needed by JetPack, below
+            $padding_top = round( $margin_top /2 );
             
             $style_chunk = 'height: '.$height.'px; ';
@@ -1634 +1629 @@
             
             $style_saved .= '#wpadminbar #wp-toolbar > ul > li > .ab-item, #wpadminbar #wp-toolbar > ul > li > .ab-item span, ';
-            $style_saved .= '#wpadminbar #wp-toolbar > ul > li > .ab-item:before, #wpadminbar #wp-toolbar > ul > li > .ab-item span:before, #wpadminbar > #wp-toolbar > #wp-admin-bar-root-default .ab-icon, #wpadminbar .ab-icon, #wpadminbar .ab-item:before { line-height: '.$height.'px; padding-bottom: 0px; padding-top: 0px; } ';
+            $style_saved .= '#wpadminbar #wp-toolbar > ul > li > .ab-item:before, #wpadminbar #wp-toolbar > ul > li > .ab-item span:before, #wpadminbar > #wp-toolbar > #wp-admin-bar-root-default .ab-icon, #wpadminbar .ab-icon, #wpadminbar .ab-item:before { line-height: '.$height.'px; } ';
             $style_saved .= '#wpadminbar .quicklinks > ul > li > a, #wpadminbar .quicklinks > ul > li > .ab-item, #wpadminbar .quicklinks > ul > li > a span, #wpadminbar .quicklinks > ul > li > .ab-item span, #wpadminbar #wp-admin-bar-wp-logo > .ab-item span { height: '.$height.'px; } ';
-            $style_saved .= '#wpadminbar .menupop .menupop > .ab-item:before { top: 5px } ';
             $style_saved .= '} ';
         }
     
-    } else
-        // WP 3.8+
-        if ( version_compare( $wp_version, '3.8-alpha', '>' ) ) {
-            $style_saved .= '@media screen and ( min-width: 783px ) { ';
-            $style_saved .= '#wpadminbar .ab-top-secondary .menupop .menupop > .ab-item:before { top: 1px } ';
-            $style_saved .= '} ';
-        }
+    }
     
     // Toolbar - Background
@@ -1867 +1855 @@
             }
         if ( $icon_color . $font_shadow != "" )
-            $style_saved .= '#wpadminbar #wp-admin-bar-root-default .ab-icon, #wpadminbar #wp-admin-bar-top-secondary .ab-icon, #wpadminbar .ab-item span:before, #wpadminbar .ab-top-menu > li > .ab-item:before, #wpadminbar .ab-top-menu > li.menupop > .ab-item:before, #wpadminbar li #adminbarsearch:before, #wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon, #wpadminbar li > .ab-item > .ab-icon:before { '.$icon_color . $font_shadow.'} ';
+            if ( get_option( 'wpst_toolbar_search_field', array() ) != array() ) $style_saved .= '#wpadminbar li #adminbarsearch:before, ';
+            $style_saved .= '#wpadminbar #wp-admin-bar-root-default .ab-icon, #wpadminbar #wp-admin-bar-top-secondary .ab-icon, #wpadminbar .ab-item span:before, #wpadminbar .ab-top-menu > li > .ab-item:before, #wpadminbar .ab-top-menu > li.menupop > .ab-item:before, #wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon, #wpadminbar li > .ab-item > .ab-icon:before { '.$icon_color . $font_shadow.'} ';
         
         // Add icon colour as border to Toolbar Avatar
@@ -1873 +1862 @@
             $style_saved .= '#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { ' . $border_color . $background_color . $box_shadow . '} ';
         
+        // Add icon size to icons
         $icon_size = ( isset( $wpst_style_tb_current['icon_size'] ) ) ? $wpst_style_tb_current['icon_size'] : $wpst_default_toolbar['icon_size'] ;
         if ( isset( $wpst_style_tb_current['icon_size'] ) )
@@ -1879 +1869 @@
                 
                 // Add icon size to Toolbar fonticons
-                $style_saved .= '#wpadminbar #wp-admin-bar-root-default .ab-icon, #wpadminbar .ab-item span:before, #wpadminbar .ab-top-menu > li.menupop > .ab-item:before, #wpadminbar .ab-top-menu > li > .ab-item:before, #wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon, #wpadminbar li > .ab-item > .ab-icon:before { font-size: '.$wpst_style_tb_current['icon_size'].'px; } ';
+                if ( get_option( 'wpst_toolbar_wp_logo', array() ) != array() ) $style_saved .= '#wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon, ';
+                $style_saved .= '#wpadminbar #wp-admin-bar-root-default .ab-icon, #wpadminbar .ab-item span:before, #wpadminbar .ab-top-menu > li.menupop > .ab-item:before, #wpadminbar .ab-top-menu > li > .ab-item:before, #wpadminbar li > .ab-item > .ab-icon:before { font-size: '.$wpst_style_tb_current['icon_size'].'px; } ';
+                
+                // Add icon size to Search icon with "Important" in it
+                if ( get_option( 'wpst_toolbar_search_field', array() ) != array() ) {
+                    $style_saved .= '#wpadminbar #adminbarsearch:before { font-size: '.$wpst_style_tb_current['icon_size'].'px !Important; } ';
+                }
                 
                 // Resize WP Logo
@@ -1885 +1881 @@
                 
                 // Add size to Toolbar Avatar, non-responsive only
-                if ( get_option( 'wpst_myaccount_avatar_small', 'on' ) == "on" ) $style_saved .= '#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { width: '.($wpst_style_tb_current['icon_size'] - 4).'px; height: '.($wpst_style_tb_current['icon_size'] - 4).'px; } ';
-                
-                // Add font size to Search fonticon with "Important" in it
-                $style_saved .= '#wpadminbar #adminbarsearch:before { font-size: '.$wpst_style_tb_current['icon_size'].'px !Important; top: '. round( ( $height - $wpst_style_tb_current['icon_size'] ) /2 ) .'px; } ';
+                if ( get_option( 'wpst_myaccount_avatar_small', 'on' ) == "on" ) $style_saved .= '#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { width: '.($wpst_style_tb_current['icon_size'] - 4).'px; height: '.($wpst_style_tb_current['icon_size'] - 4).'px; margin-top: -3px; } ';
+                
+                $style_saved .= '} ';
             }
-                
+        
         // Add paddings to icons as needed
         if ( ( $icon_size != $wpst_default_toolbar['icon_size'] ) || ( $height != $wpst_default_toolbar['height'] ) ) {
-        
-            // This is essentially based on trial-error method, please don't tell my wife, OK?
-            if ( $icon_size < $wpst_default_toolbar['icon_size'] - 1 ) {  // fonticons of 18px and less
-                $icon_W_margin_top = round( ( $icon_size - $wpst_default_toolbar['icon_size'] ) /2 );
-                $icon_S_margin_top = round( ( ( $icon_size - $wpst_default_toolbar['icon_size'] ) /2 ) -1.5 );
+            $style_saved .= '@media screen and ( min-width: 783px ) { ';
+            
+            // 32px Toolbar needs a special treatment
+            if ( $height == $wpst_default_toolbar['height'] ) {
+            
+                // My Sites and Site Name icons
+                (int)$icon_sites_margin_top = round( ( $wpst_default_toolbar['icon_size'] - $icon_size ) /2 ) + 2;
+                
+                // WP Logo and Updates icons
+                if ( $icon_size < $wpst_default_toolbar['icon_size'] ) {
+                    (int)$icon_W_margin_top = round( ( $icon_size - $wpst_default_toolbar['icon_size'] ) /2 ) + 2;
+                } else {
+                    (int)$icon_W_margin_top = $icon_sites_margin_top;
+                }
+                
+                // WP Symposium icons
+                if ( $icon_size < $wpst_default_toolbar['icon_size'] - 2 ) {
+                    (int)$icon_S_margin_top = round( ( ( $icon_size - $wpst_default_toolbar['icon_size'] ) /2 ) + 1 );
+                } elseif ( $icon_size > $wpst_default_toolbar['icon_size'] + 4 ) {
+                    (int)$icon_S_margin_top = $icon_sites_margin_top;
+                } else {
+                    (int)$icon_S_margin_top = 0;
+                }
+                
+            // Custom Toolbar height 
             } else {
-                $icon_W_margin_top = 0;
-                $icon_S_margin_top = -1;
+            
+                // My Sites and Site Name icons
+                (int)$icon_sites_margin_top = -4;
+                
+                // WP Logo and Updates icons
+                if ( $icon_size < $wpst_default_toolbar['icon_size'] ) {
+                    (int)$icon_W_margin_top = round( ( ( $icon_size - $wpst_default_toolbar['icon_size'] ) /2 ) - 4 );
+                } else {
+                    (int)$icon_W_margin_top = -4;
+                }
+                
+                // WP Symposium icons
+                if ( $icon_size < $wpst_default_toolbar['icon_size'] ) {
+                    (int)$icon_S_margin_top = round( ( ( $icon_size - $wpst_default_toolbar['icon_size'] ) /2 ) - 5 );
+                } else {
+                    (int)$icon_S_margin_top = -5;
+                }
             }
-            $icon_new_content_margin_top = $icon_W_margin_top + 2;
-            
-            $style_saved .= '#wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon:before, #wpadminbar #wp-admin-bar-updates .ab-icon:before { top: '.$icon_W_margin_top.'px; } '; 
-            $style_saved .= '#wpadminbar #wp-admin-bar-new-content .ab-icon:before, #wpadminbar #wp-admin-bar-comments .ab-icon:before { top: '.$icon_new_content_margin_top.'px; } '; 
-            $style_saved .= '#wpadminbar #wp-admin-bar-my-symposium-admin > .ab-item > span.ab-icon:before, #wpadminbar li.symposium-toolbar-notifications-mail > .ab-item > .ab-icon:before, #wpadminbar li.symposium-toolbar-notifications-friendship > .ab-item > .ab-icon:before { top: '.$icon_S_margin_top.'px; } '; 
-            $style_saved .= '#wpadminbar #wp-admin-bar-my-sites > .ab-item:before, #wpadminbar #wp-admin-bar-site-name > .ab-item:before, #wpadminbar #wp-admin-bar-my-wpms-admin > .ab-item:before { top: 0; } ';
-            $style_saved .= '#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { margin-top: -2px; } ';
+            
+            // New Content icon
+            (int)$icon_new_content_margin_top = $icon_W_margin_top + 2;
+            
+            // Add My Sites and Site Name icons top margin
+            $comma = '';
+            $style_chunk = "";
+            if ( get_option( 'wpst_toolbar_my_sites', array() ) != array() ) { $style_chunk .= '#wpadminbar #wp-admin-bar-my-sites > .ab-item:before'; $comma = ', '; }
+            if ( get_option( 'wpst_toolbar_site_name', array() ) != array() ) { $style_chunk .= $comma.'#wpadminbar #wp-admin-bar-site-name > .ab-item:before'; $comma = ', '; }
+            if ( get_option( 'wpst_wpms_network_superadmin_menu', 'on' ) == "on" ) { $style_chunk .= $comma.'#wpadminbar #wp-admin-bar-my-wpms-admin > .ab-item:before'; $comma = ', '; }
+            $style_saved .= $style_chunk.$comma.'#wpadminbar .ab-top-menu > li > a:before { top: '.$icon_sites_margin_top.'px; } ';
+            
+            // Add WP Logo and Updates icons top margin
+            $comma = '';
+            $style_chunk = "";
+            if ( get_option( 'wpst_toolbar_wp_logo', array() ) != array() ) { $style_chunk .= '#wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon:before'; $comma = ', '; }
+            if ( get_option( 'wpst_toolbar_updates_icon', array() ) != array() ) { $style_chunk .= $comma.'#wpadminbar #wp-admin-bar-updates .ab-icon:before'; }
+            if ( $style_chunk != "" ) $style_saved .= $style_chunk.' { top: '.$icon_W_margin_top.'px; } ';
+            
+            // Add New Content and Comments icons top margin
+            $comma = '';
+            $style_chunk = "";
+            if ( get_option( 'wpst_toolbar_new_content', array() ) != array() ) { $style_chunk .= '#wpadminbar #wp-admin-bar-new-content .ab-icon:before'; $comma = ', '; }
+            if ( get_option( 'wpst_toolbar_comments_bubble', array() ) != array() ) { $style_chunk .= $comma.'#wpadminbar #wp-admin-bar-comments .ab-icon:before'; }
+            if ( $style_chunk != "" ) $style_saved .= $style_chunk.' { top: '.$icon_new_content_margin_top.'px; } ';
+            
+            // Add WPS icons top margin
+            $comma = '';
+            $style_chunk = "";
+            if ( get_option( 'wpst_toolbar_new_content', array() ) != array() ) { $style_chunk .= '#wpadminbar #wp-admin-bar-my-symposium-admin > .ab-item > span.ab-icon:before'; $comma = ', '; }
+            if ( get_option( 'wpst_wps_notification_friendship', array() ) != array() ) { $style_chunk .= $comma.'#wpadminbar li.symposium-toolbar-notifications-mail > .ab-item > .ab-icon:before'; $comma = ', '; }
+            if ( get_option( 'wpst_wps_notification_mail', array() ) != array() ) { $style_chunk .= $comma.'#wpadminbar li.symposium-toolbar-notifications-friendship > .ab-item > .ab-icon:before'; }
+            if ( $style_chunk != "" ) $style_saved .= $style_chunk.' { top: '.$icon_S_margin_top.'px; } ';
+            
+            // $style_saved .= '#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img { margin-top: -2px; } ';
             
             $style_saved .= '} ';
-            
-            // Add height and margin to Search fonticon
-            $style_saved .= '#wpadminbar > #wp-toolbar > #wp-admin-bar-root-default > #wp-admin-bar-search #adminbarsearch input.adminbar-input { height: '.$icon_size.'px; padding-left: '.$icon_size.'px; top: '. round( ( $height - $wpst_default_toolbar['height'] ) /2 ) .'px; } ';
-        }
-    }
-    
+        }
+    }
+    
+    
+    // Search form
+    $style_saved .= '#wpadminbar #wp-admin-bar-search .ab-item { height: '. $height . 'px; top: 0px; } ';
     
     // Search field
-    // Determine Search field height and padding-top
-    // Ensure the search field fits in the Toolbar
-    $search_height = ( $wpst_default_toolbar['search_height'] > $height - 4 ) ? ( $height - 4 ) : $wpst_default_toolbar['search_height'];
-    // Apply ratio so that font fits in search field
-    $font_size = round( ( $search_height * $wpst_default_toolbar['font_size'] ) / $wpst_default_toolbar['search_height'] );
-    // Center the search field in the Toolbar
-    $search_padding_top = round( ( $height  - $search_height ) / 2 ) - 4;
-    
-    if ( $search_height > 0 ) {
-        $style_saved .= '#wpadminbar #adminbarsearch { height: '. $search_height . 'px; } ';
-        $style_saved .= '#wpadminbar #adminbarsearch .adminbar-input, #wpadminbar #adminbarsearch input { height: ' . $search_height . 'px; font-size: ' . $font_size . 'px; } ';
-    }
-    if ( $search_padding_top > 0 ) $style_saved .= '#wpadminbar #wp-admin-bar-search .ab-item { padding-top: ' . $search_padding_top . 'px; } ';
-    
-    // Add the font shadow to the Search icon and field as a box-shadow
+    $search_height = ( $height - 4 < $wpst_default_toolbar['search_height'] ) ? ( $height - 4 ) : $wpst_default_toolbar['search_height'];   // Ensure the search form fits in the Toolbar
+    $search_top = round( ( $height  - $search_height ) / 2 );                                                                               // Center the search form in the Toolbar
+    $style_saved .= '#wpadminbar #adminbarsearch { height: '. $search_height . 'px; top: ' . $search_top . 'px; } ';
+    $style_saved .= '#wpadminbar > #wp-toolbar > #wp-admin-bar-root-default > #wp-admin-bar-search #adminbarsearch input.adminbar-input { height: '. $search_height . 'px; top: -4px; padding-left: '.$height.'px; } ';
+    
+    // Search icon
+    if ( get_option( 'wpst_toolbar_search_field', array() ) != array() ) {
+        $search_icon_top = round( ( $wpst_default_toolbar['icon_size'] - $icon_size ) /2 ) + 2;
+        $style_saved .= '#wpadminbar #adminbarsearch:before { top: '. $search_icon_top .'px; } ';
+    }
+    
+    // Add the font shadow to the Search field as a box-shadow
     if ( $box_shadow != '' )
         $style_saved .= '#wpadminbar #adminbarsearch .adminbar-input:focus { ' . $box_shadow . '} ';
     
-    // JetPack
-    // Correct some paddings for its Toolbar items
+    // JetPack - Correct some paddings for its Toolbar items
     if ( is_multisite() )
         (bool)$jetpack_is_active = ( is_plugin_active_for_network( 'jetpack/jetpack.php' ) || is_plugin_active( 'jetpack/jetpack.php' ) );
@@ -1984 +2038 @@
     
     // Hover Toolbar - Background plain colour only
+    $style_chunk = "";
+    $style_chunk_tablet = "";
     if ( $linear_gradient == '' ) {
         if ( $background_colour != $wpst_default_toolbar['hover_background_colour'] ) {
@@ -2111 +2167 @@
             }
         
-        if ( isset( $wpst_style_tb_current['icon_colour'] ) )
-            if ( $wpst_style_tb_current['icon_colour'] != '' ) {
-                $wpst_hover_icon_colour = ( isset( $wpst_style_tb_current['hover_icon_colour'] ) ) ? $wpst_style_tb_current['hover_icon_colour'] : $wpst_default_toolbar['hover_icon_colour'];
+        if ( isset( $wpst_style_tb_current['hover_icon_colour'] ) )
+            if ( $wpst_style_tb_current['hover_icon_colour'] != '' ) {
+                // $wpst_hover_icon_colour = ( isset( $wpst_style_tb_current['hover_icon_colour'] ) ) ? $wpst_style_tb_current['hover_icon_colour'] : $wpst_default_toolbar['hover_icon_colour'];
+                $wpst_hover_icon_colour = $wpst_style_tb_current['hover_icon_colour'];
                 $icon_color = 'color: '.$wpst_hover_icon_colour.'; ';
                 $border_color = 'border-'.$icon_color;
@@ -2158 +2215 @@
         $style_chunk .= 'font-family: ' . trim( $wpst_font_clean, ',' ) . '; ';
     }
-    
-    // Font family for display name
-    // if ( version_compare( $wp_version, '3.8-alpha', '>' ) && $wpst_font_clean )
-        // $style_saved .= '#wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary span.display-name, #wpadminbar #wp-admin-bar-user-info .username { font-family: ' . trim( $wpst_font_clean, ',' ) . ' } ';
     
     // Font Size
@@ -2426 +2479 @@
 
 /**
+ * Create an array of arrays by parsing activated features of WPS, to create a menu available site wide for instant use
+ * This function is called
+ *  - upon plugin activation,
+ *  - saving plugin options,
+ *  - conditionally upon WPS activation,
+ *  - and at each visit of the WPS Install page
+ * [0] - title      - string    - The title of the node.
+ * [1] - view       - string    - The admin page to display, will be used for the href
+ * [2] - ID         - string    - The ID of the item, made of 'symposium_toolbar_'.$slug except for the top level item
+ * [3] - parent     - string    - The ID of the parent node.
+ * [4] - meta       - string    - Meta data that may include the following keys: html, class, onclick, target, title, tabindex.
+ *
+ * @since O.0.3
+ *
+ * @param none
+ * @return none
+ */
+function symposium_toolbar_update_wps_admin_menu() {
+    
+    global $wpdb, $submenu;
+    $args = array();
+    
+    // Menu entry - Top level menu item
+    array_push( $args, array ( '<span class="ab-icon ab-icon-wps"></span><span class="ab-label ab-label-wps">WP Symposium</span>', admin_url( 'admin.php?page=symposium_debug' ), 'my-symposium-admin', '', array( 'class' => 'my-toolbar-page' ) ) );
+    
+    // Aggregate menu items?
+    $hidden = get_option( WPS_OPTIONS_PREFIX.'_long_menu' ) == "on" ? '_hidden': '';
+    
+    if ( isset( $submenu["symposium_debug"] ) && is_array( $submenu["symposium_debug"] ) ) foreach ( $submenu["symposium_debug"] as $symposium_toolbar_admin_menu_item ) {
+        $slug = symposium_toolbar_make_slug( $symposium_toolbar_admin_menu_item[0] );                                       // Slug
+        $symposium_toolbar_admin_menu_item[1] = admin_url( 'admin.php?page='.$symposium_toolbar_admin_menu_item[2] );       // URL
+        $symposium_toolbar_admin_menu_item[2] = 'symposium_toolbar_'.$slug;                                                 // ID
+        $symposium_toolbar_admin_menu_item[3] = "my-symposium-admin";                                                       // Parent ID
+        array_push( $symposium_toolbar_admin_menu_item, array( 'class' => 'symposium_toolbar_admin' ) );                    // Meta
+        $args[] = $symposium_toolbar_admin_menu_item;
+        
+        if ( $hidden && ( $symposium_toolbar_admin_menu_item[0] == __( 'Options', WPS_TEXT_DOMAIN ) ) ) {
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__profile_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__profile_network_activated' ) ) array_push( $args, array ( __( 'Profile', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_profile' ), 'symposium_toolbar_profile', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__profile_plus_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__profile_plus_network_activated' ) ) array_push( $args, array ( __( 'Plus', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/plus_admin.php' ), 'symposium_toolbar_plus', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__forum_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__forum_network_activated' ) ) array_push( $args, array ( __( 'Forum', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_forum' ), 'symposium_toolbar_forum', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__members_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__members_network_activated' ) ) array_push( $args, array ( __( 'Directory', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'__wps__members_menu' ), 'symposium_toolbar_directory', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__mail_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__mail_network_activated' ) ) array_push( $args, array ( __( 'Mail', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'__wps__mail_menu' ), 'symposium_toolbar_mail', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__groups_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__groups_network_activated' ) ) array_push( $args, array ( __( 'Groups', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/groups_admin.php' ), 'symposium_toolbar_groups', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__gallery_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__gallery_network_activated' ) ) array_push( $args, array ( __( 'Gallery', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/gallery_admin.php' ), 'symposium_toolbar_gallery', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__news_main_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__news_main_network_activated' ) )   array_push( $args, array ( __( 'Alerts', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/news_admin.php' ), 'symposium_toolbar_alerts', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__add_notification_bar_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__add_notification_bar_network_activated' ) ) array_push( $args, array ( __( 'Panel', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_bar' ), 'symposium_toolbar_panel', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__events_main_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__events_main_network_activated' ) ) array_push( $args, array ( __( 'Events', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/events_admin.php' ), 'symposium_toolbar_events', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__facebook_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__facebook_network_activated' ) ) array_push( $args, array ( __( 'Facebook', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/facebook_admin.php' ), 'symposium_toolbar_facebook', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__mobile_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__mobile_network_activated' ) )  array_push( $args, array ( __( 'Mobile', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'__wps__mobile_menu' ), 'symposium_toolbar_mobile', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__mailinglist_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__mailinglist_network_activated' ) ) array_push( $args, array ( __( 'Reply', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/mailinglist_admin.php' ), 'symposium_toolbar_reply', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__lounge_main_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__lounge_main_network_activated' ) ) array_push( $args, array ( __( 'Lounge', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/lounge_admin.php' ), 'symposium_toolbar_lounge', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+        }
+        if ( $hidden && ( $symposium_toolbar_admin_menu_item[0] == __( 'Manage', WPS_TEXT_DOMAIN ) ) ) {
+            array_push( $args, array ( __( 'Settings', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_settings' ), 'symposium_toolbar_settings', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            array_push( $args, array ( __( 'Advertising', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_advertising' ), 'symposium_toolbar_advertising', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            array_push( $args, array ( __( 'Thesaurus', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_thesaurus' ), 'symposium_toolbar_thesaurus', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__forum_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__forum_network_activated' ) ) array_push( $args, array ( __( 'Categories', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_categories' ), 'symposium_toolbar_categories', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__forum_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__forum_network_activated' ) ) array_push( $args, array ( __( 'Forum Posts', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_moderation' ), 'symposium_toolbar_forum_posts', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__mail_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__mail_network_activated' ) ) array_push( $args, array ( __( 'Mail Messages', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'__wps__mail_messages_menu' ), 'symposium_toolbar_mail_messages', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            array_push( $args, array ( __( 'Templates', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_templates' ), 'symposium_toolbar_templates', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+            if ( get_option( WPS_OPTIONS_PREFIX.'_audit' ) ) array_push( $args, array ( __( 'Audit', WPS_TEXT_DOMAIN ), 'symposium_audit', 'symposium_toolbar_audit', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
+        }
+    }
+    
+    // Store the menu structure
+    update_option( 'wpst_tech_wps_admin_menu', $args );
+}
+
+/**
  * Check that an array of roles is actually an array of roles of the site
  * The returned value may be checked against the sent param for a boolean result

wp-symposium-toolbar/trunk/wp-symposium-toolbar_functions.php

@@ -698 +698 @@
 function symposium_toolbar_symposium_admin() {
     
-    if ( !is_admin_bar_showing() || !current_user_can( 'manage_options' ) || ( get_option( 'wpst_wps_admin_menu', 'on' ) != "on" ) )
-        return;
-    
-    global $submenu, $wp_admin_bar;
-    $args = array();
-    
-    // Aggregate menu items?
-    $hidden = get_option( WPS_OPTIONS_PREFIX.'_long_menu' ) == "on" ? '_hidden': '';
-    
-    // Menu entry - Top level menu item
-    array_push( $args, array ( '<span class="ab-icon ab-icon-wps"></span><span class="ab-label ab-label-wps">WP Symposium</span>', admin_url( 'admin.php?page=symposium_debug' ), 'my-symposium-admin', '', array( 'class' => 'my-toolbar-page' ) ) );
-    
-    // Now, loop over menu items
-    if ( isset( $submenu["symposium_debug"] ) && is_array( $submenu["symposium_debug"] ) ) foreach ( $submenu["symposium_debug"] as $symposium_toolbar_admin_menu_item ) {
-        $slug = symposium_toolbar_make_slug( $symposium_toolbar_admin_menu_item[0] );                                       // Slug
-        $symposium_toolbar_admin_menu_item[1] = admin_url( 'admin.php?page='.$symposium_toolbar_admin_menu_item[2] );       // URL
-        $symposium_toolbar_admin_menu_item[2] = 'symposium_toolbar_'.$slug;                                                 // ID
-        $symposium_toolbar_admin_menu_item[3] = "my-symposium-admin";                                                       // Parent ID
-        array_push( $symposium_toolbar_admin_menu_item, array( 'class' => 'symposium_toolbar_admin' ) );                    // Meta
-        $args[] = $symposium_toolbar_admin_menu_item;
-        
-        if ( $hidden && ( $symposium_toolbar_admin_menu_item[0] == __( 'Options', WPS_TEXT_DOMAIN ) ) ) {
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__profile_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__profile_network_activated' ) ) array_push( $args, array ( __( 'Profile', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_profile' ), 'symposium_toolbar_profile', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__profile_plus_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__profile_plus_network_activated' ) ) array_push( $args, array ( __( 'Plus', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/plus_admin.php' ), 'symposium_toolbar_plus', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__forum_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__forum_network_activated' ) ) array_push( $args, array ( __( 'Forum', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_forum' ), 'symposium_toolbar_forum', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__members_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__members_network_activated' ) ) array_push( $args, array ( __( 'Directory', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'__wps__members_menu' ), 'symposium_toolbar_directory', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__mail_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__mail_network_activated' ) ) array_push( $args, array ( __( 'Mail', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'__wps__mail_menu' ), 'symposium_toolbar_mail', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__groups_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__groups_network_activated' ) ) array_push( $args, array ( __( 'Groups', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/groups_admin.php' ), 'symposium_toolbar_groups', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__gallery_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__gallery_network_activated' ) ) array_push( $args, array ( __( 'Gallery', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/gallery_admin.php' ), 'symposium_toolbar_gallery', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__news_main_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__news_main_network_activated' ) )   array_push( $args, array ( __( 'Alerts', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/news_admin.php' ), 'symposium_toolbar_alerts', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__add_notification_bar_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__add_notification_bar_network_activated' ) ) array_push( $args, array ( __( 'Panel', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_bar' ), 'symposium_toolbar_panel', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__events_main_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__events_main_network_activated' ) ) array_push( $args, array ( __( 'Events', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/events_admin.php' ), 'symposium_toolbar_events', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__facebook_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__facebook_network_activated' ) ) array_push( $args, array ( __( 'Facebook', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/facebook_admin.php' ), 'symposium_toolbar_facebook', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__mobile_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__mobile_network_activated' ) )  array_push( $args, array ( __( 'Mobile', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'__wps__mobile_menu' ), 'symposium_toolbar_mobile', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__mailinglist_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__mailinglist_network_activated' ) ) array_push( $args, array ( __( 'Reply', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/mailinglist_admin.php' ), 'symposium_toolbar_reply', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__lounge_main_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__lounge_main_network_activated' ) ) array_push( $args, array ( __( 'Lounge', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.WPS_DIR.'/lounge_admin.php' ), 'symposium_toolbar_lounge', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-        }
-        if ( $hidden && ( $symposium_toolbar_admin_menu_item[0] == __( 'Manage', WPS_TEXT_DOMAIN ) ) ) {
-            array_push( $args, array ( __( 'Settings', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_settings' ), 'symposium_toolbar_settings', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            array_push( $args, array ( __( 'Advertising', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_advertising' ), 'symposium_toolbar_advertising', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            array_push( $args, array ( __( 'Thesaurus', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_thesaurus' ), 'symposium_toolbar_thesaurus', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__forum_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__forum_network_activated' ) ) array_push( $args, array ( __( 'Categories', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_categories' ), 'symposium_toolbar_categories', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__forum_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__forum_network_activated' ) ) array_push( $args, array ( __( 'Forum Posts', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_moderation' ), 'symposium_toolbar_forum_posts', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'__wps__mail_activated' ) || get_option( WPS_OPTIONS_PREFIX.'__wps__mail_network_activated' ) ) array_push( $args, array ( __( 'Mail Messages', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'__wps__mail_messages_menu' ), 'symposium_toolbar_mail_messages', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            array_push( $args, array ( __( 'Templates', WPS_TEXT_DOMAIN ), admin_url( 'admin.php?page='.'symposium_templates' ), 'symposium_toolbar_templates', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-            if ( get_option( WPS_OPTIONS_PREFIX.'_audit' ) ) array_push( $args, array ( __( 'Audit', WPS_TEXT_DOMAIN ), 'symposium_audit', 'symposium_toolbar_audit', 'symposium_toolbar_'.$slug, array( 'class' => 'symposium_toolbar_admin symposium_toolbar_admin_'.$slug ) ) );
-        }
-    }
-    
-    // Now, draw the menu itself
-    if ( $args ) foreach ( $args as $symposium_toolbar_admin_menu_item ) {
-        $args = array( 
-            'title' => $symposium_toolbar_admin_menu_item[0],
-            'href' => $symposium_toolbar_admin_menu_item[1],
-            'id' => $symposium_toolbar_admin_menu_item[2],
-            'parent' => $symposium_toolbar_admin_menu_item[3],
-            'meta' => $symposium_toolbar_admin_menu_item[4]
-        );
-        $wp_admin_bar->add_node( $args );
+    global $wp_admin_bar;
+    
+    if ( is_admin_bar_showing() && current_user_can( 'manage_options' ) && ( get_option( 'wpst_wps_admin_menu', 'on' ) == "on" ) ) {
+    
+        $symposium_toolbar_admin_menu_args = get_option( 'wpst_tech_wps_admin_menu', array() );
+        
+        if ( $symposium_toolbar_admin_menu_args ) foreach ( $symposium_toolbar_admin_menu_args as $args ) {
+            $symposium_toolbar_admin_menu_item = array( 
+                'title' => $args[0],
+                'href' => $args[1],
+                'id' => $args[2],
+                'parent' => $args[3],
+                'meta' => $args[4]
+            );
+            $wp_admin_bar->add_node( $symposium_toolbar_admin_menu_item );
+        }
     }
 }
@@ -861 +818 @@
     
     // Add Group
-    if ( !empty( $share ) ) {
+/*  if ( !empty( $share ) ) {
         $args = array(
             'id' => 'symposium-toolbar-share',
@@ -868 +825 @@
             'meta' => array( 'class' => 'symposium-toolbar-social-icon symposium-toolbar-share' )
         );
-        $wp_admin_bar->add_node( $args );
+        $wp_admin_bar->add_group( $args );
         $parent = 'symposium-toolbar-share';
-    }
+    } /* */
     
     // LinkedIn