Merge pull request #1221 from splitbrain/extension-manager-fixes

Extension manager fixes

2 files changed, 21 insertions, 16 deletions

diff --git a/lib/plugins/extension/script.js b/lib/plugins/extension/script.js
index bc1bf8b12..c74c44ad1 100644
--- a/lib/plugins/extension/script.js
+++ b/lib/plugins/extension/script.js
@@ -114,19 +114,20 @@ jQuery(function(){
         Create section for enabling/disabling viewing options
      */
     if ( $extmgr.find('.plugins, .templates').hasClass('active') ) {
+        var $extlist = jQuery('#extension__list');
+        $extlist.addClass('hasDisplayOptions');
         var $displayOpts = jQuery('<p>', { id: 'extension__viewoptions'} ).appendTo($extmgr.find( '.panelHeader' ));
 
         $displayOpts.append(LANG.plugins.extension.display_viewoptions);
-    
+
         var displayOptionsHandler = function(){
-            jQuery('#extension__list').toggleClass( this.name );
+            $extlist.toggleClass( this.name );
         };
-    
+
         jQuery(['enabled', 'disabled', 'updatable']).each(function(index, chkName){
-        
             var $label = jQuery( '<label></label>' ).appendTo($displayOpts);
             jQuery( '<input />', { type: 'checkbox', name: chkName }).change(displayOptionsHandler).appendTo($label).click();
-            jQuery( '<span/>' ).append(LANG.plugins.extension['display_'+chkName]).appendTo($label);
+            jQuery( '<span/>' ).append(' '+LANG.plugins.extension['display_'+chkName]).appendTo($label);
         });
     }
 });
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index 38b2d65d0..86e540b0f 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -281,18 +281,21 @@
  * Enabled/Disabled overrides
  */
 #extension__list {
-    
-    .enabled, .disabled,
-    .updatable {
-        display: none;
-    }
-    
-    &.enabled .enabled,
-    &.disabled .disabled,
-    &.updatable .updatable {
-        display: block;
+
+    &.hasDisplayOptions {
+        .enabled,
+        .disabled,
+        .updatable {
+            display: none;
+        }
+
+        &.enabled .enabled,
+        &.disabled .disabled,
+        &.updatable .updatable {
+            display: block;
+        }
     }
-    
+
     .enabled div.screenshot span {
         background: transparent url(images/enabled.png) no-repeat 2px 2px;
     }
@@ -376,4 +379,5 @@
 
 #extension__viewoptions label {
     margin-left: 1em;
+    vertical-align: baseline;
 }