2 files changed, 84 insertions, 22 deletions

diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
new file mode 100644
index 000000000..eba5fbc7f
--- /dev/null
+++ b/lib/plugins/extension/helper/gui.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * DokuWiki Plugin extension (Helper Component)
+ *
+ * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * Class helper_plugin_extension_list takes care of the overall GUI
+ */
+class helper_plugin_extension_gui extends DokuWiki_Plugin {
+
+    protected $tabs = array('plugins', 'templates', 'search');
+
+    /**
+     * Print the tab navigation
+     *
+     * @fixme style active one
+     */
+    public function tabNavigation() {
+        echo '<ul class="tabs">';
+        foreach(array('plugins', 'templates', 'search') as $tab) {
+            $url = $this->tabURL($tab);
+            if($this->currentTab() == $tab) {
+                $class = 'class="active"';
+            } else {
+                $class = '';
+            }
+            echo '<li '.$class.'><a href="'.$url.'">'.$this->getLang('tab_'.$tab).'</a></li>';
+        }
+        echo '</ul>';
+    }
+
+    /**
+     * Return the currently selected tab
+     *
+     * @return string
+     */
+    public function currentTab() {
+        global $INPUT;
+
+        $tab = $INPUT->str('tab', 'plugins', true);
+        if(!in_array($tab, $this->tabs)) $tab = 'plugins';
+        return $tab;
+    }
+
+    /**
+     * Create an URL inside the extension manager
+     *
+     * @param string $tab    tab to load, empty for current tab
+     * @param array  $params associative array of parameter to set
+     *
+     * @return string
+     */
+    public function tabURL($tab = '', $params = array()) {
+        global $ID;
+
+        if(!$tab) $tab = $this->currentTab();
+        $defaults = array(
+            'do'   => 'admin',
+            'page' => 'extension',
+            'tab'  => $tab,
+        );
+        return wl($ID, array_merge($defaults, $params));
+    }
+
+}
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 816d4a444..1c337176d 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -14,6 +14,17 @@ if(!defined('DOKU_INC')) die();
  */
 class helper_plugin_extension_list extends DokuWiki_Plugin {
     protected $form = '';
+    /** @var  helper_plugin_extension_gui */
+    protected $gui;
+
+    /**
+     * Constructor
+     *
+     * loads additional helpers
+     */
+    public function __construct(){
+        $this->gui = plugin_load('helper', 'extension_gui');
+    }
 
     function start_form() {
         $this->form .= '<form id="extension__list" accept-charset="utf-8" method="post" action="">';
@@ -152,7 +163,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
 
             $mailid = $extension->getEmailID();
             if($mailid){
-                $url = $this->tabURL('search', array('q' => 'mailid:'.$mailid));
+                $url = $this->gui->tabURL('search', array('q' => 'mailid:'.$mailid));
                 return '<a href="'.$url.'" class="author" title="'.$this->getLang('author_hint').'" >'.hsc($extension->getAuthor()).'</a>';
             }else{
                 return '<span class="author">'.hsc($extension->getAuthor()).'</span>';
@@ -239,7 +250,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
                 }else{
                     $first = false;
                 }
-                $url = $this->tabURL('search', array('q' => 'tag:'.$tag));
+                $url = $this->gui->tabURL('search', array('q' => 'tag:'.$tag));
                 $return .= '<a href="'.$url.'">'.hsc($tag).'</a>';
             }
             echo '</span>';
@@ -484,24 +495,4 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
 
         return '<input class="'.$classes.'" name="'.$name.'" type="submit" value="'.$this->getLang('btn_'.$action).'" '.$title.' />';
     }
-
-    /**
-     * Create an URL inside the extension manager
-     *
-     * @param string tab tb to load, empty for current tab
-     * @param array $params associative array of parameter to set
-     * @return string
-     */
-    static public function tabURL($tab='', $params=array()){
-        global $ID;
-        global $INPUT;
-
-        if(!$tab) $tab = $INPUT->str('tab', 'installed', true);
-        $defaults = array(
-            'do'   => 'admin',
-            'page' => 'extension',
-            'tab'  => $tab,
-        );
-        return wl($ID, array_merge($defaults, $params));
-    }
 }