some style changes

3 files changed, 14 insertions, 24 deletions

diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 62031a69b..79728b5ca 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -244,7 +244,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
         }
         if($extension->getTags()){
             $first = true;
-            echo '<span class="tags">';
+            $return .= '<span class="tags">';
             foreach ($extension->getTags() as $tag) {
                 if(!$first){
                     $return .= ', ';
@@ -254,7 +254,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                 $url = $this->gui->tabURL('search', array('q' => 'tag:'.$tag));
                 $return .= '<a href="'.$url.'">'.hsc($tag).'</a>';
             }
-            echo '</span>';
+            $return .= '</span>';
         }
         $return .= '</span>';
         return $return;
@@ -451,7 +451,9 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
             }
             if (!$extension->isProtected()) {
                 if ($extension->isEnabled()) {
-                    $return .= $this->make_action('disable', $extension);
+                    if(!$extension->isTemplate()){ // templates can't be disabled, only anothe can be enabled
+                        $return .= $this->make_action('disable', $extension);
+                    }
                 } else {
                     $return .= $this->make_action('enable', $extension);
                 }
diff --git a/lib/plugins/extension/images/tag.png b/lib/plugins/extension/images/tag.png
new file mode 100644
index 000000000..155dbb3dd
--- /dev/null
+++ b/lib/plugins/extension/images/tag.png
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index cd9eeaa74..53c260f8d 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -20,6 +20,7 @@
     background: url(images/overlay.png) repeat;
     text-align: center;
     cursor: pointer;
+    z-index: 9999;
 
     p {
         text-align: right;
@@ -44,16 +45,6 @@
     margin-left: 0;
 }
 
-#extension__manager a.taglink {
-    padding: 1px 4px;
-    background-color: @ini_background_neu;
-    border-radius: 3px;
-}
-[dir=rtl] #extension__manager a.taglink {
-    display: inline-block;
-    line-height: 1.2;
-}
-
 #extension__manager .panelHeader div.error {
     margin-top: 0;
     float: left;
@@ -173,6 +164,10 @@
     background: transparent url(images/disabled.png) no-repeat 2px 2px;
 }
 
+#extension__manager .disabled .legend {
+    opacity: 0.7;
+}
+
 #extension__manager div.screenshot img {
     width: 120px;
     height: 70px;
@@ -227,19 +222,12 @@
     font-size: 85%;
 }
 
-#extension__manager .legend span.linkbar a.urlextern + a.taglink,
-#extension__manager .legend span.linkbar a.interwiki + a.taglink {
-    margin-left: 0.4em;
-}
-[dir=rtl] #extension__manager .legend span.linkbar a.urlextern + a.taglink,
-[dir=rtl] #extension__manager .legend span.linkbar a.interwiki + a.taglink {
-    margin-left: 0;
-}
-[dir=rtl] #extension__manager .legend span.linkbar a.urlextern,
-[dir=rtl] #extension__manager .legend span.linkbar a.interwiki {
-    margin-left: .4em;
+#extension__manager .legend span.linkbar span.tags {
+    padding-left: 18px;
+    background: transparent url(images/tag.png) no-repeat 0 0;
 }
 
+
 #extension__manager .legend input.button {
     background: transparent url(images/up.png) no-repeat 0 0;
     box-shadow: none;