[JM-1218] Switched to submenus for categories instead of black colored sections.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9810 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/admin/AdminConsole.java

@@ -248,19 +248,23 @@ public class AdminConsole {
 
         // Load other admin-sidebar.xml files from the classpath
         ClassLoader[] classLoaders = getClassLoaders();
-        for (int i=0; i<classLoaders.length; i++) {
+        for (ClassLoader classLoader : classLoaders) {
             URL url = null;
             try {
-                if (classLoaders[i] != null) {
-                    Enumeration e = classLoaders[i].getResources("/META-INF/admin-sidebar.xml");
+                if (classLoader != null) {
+                    Enumeration e = classLoader.getResources("/META-INF/admin-sidebar.xml");
                     while (e.hasMoreElements()) {
-                        url = (URL)e.nextElement();
+                        url = (URL) e.nextElement();
                         try {
                             in = url.openStream();
                             addModel("admin", in);
                         }
                         finally {
-                            try { if (in != null) { in.close(); } }
+                            try {
+                                if (in != null) {
+                                    in.close();
+                                }
+                            }
                             catch (Exception ignored) {
                                 // Ignore.
                             }
@@ -333,8 +337,8 @@ public class AdminConsole {
                 }
             }
             // Tabs
-            for (Iterator i=element.selectNodes("//tab").iterator(); i.hasNext(); ) {
-                Element tab = (Element)i.next();
+            for (Object o : element.selectNodes("//tab")) {
+                Element tab = (Element) o;
                 String id = tab.attributeValue("id");
                 Element existingTab = getElemnetByID(id);
                 // Simple case, there is no existing tab with the same id.
@@ -342,7 +346,7 @@ public class AdminConsole {
                     // Make sure that the URL on the tab is set. If not, default to the
                     // url of the first item.
                     if (tab.attributeValue("url") == null) {
-                        Element firstItem = (Element)tab.selectSingleNode(
+                        Element firstItem = (Element) tab.selectSingleNode(
                                 "//item[@url]");
                         if (firstItem != null) {
                             tab.addAttribute("url", firstItem.attributeValue("url"));

src/java/org/jivesoftware/admin/SidebarTag.java

@@ -151,6 +151,7 @@ public class SidebarTag extends BodyTagSupport {
         // Get the initial subpage and page IDs
         String subPageID = (String)request.getAttribute("subPageID");
         String pageID = (String)request.getAttribute("pageID");
+        String subnavID = (String)request.getAttribute("subnavID");
 
         // If the pageID is null, use the subPageID to set it. If both the pageID and
         // subPageIDs are null, return because these are key to execution of the tag.
@@ -168,10 +169,14 @@ public class SidebarTag extends BodyTagSupport {
 
                 Element current = null;
                 Element subcurrent = null;
+                Element subnav = null;
                 if (subPageID != null) {
                     subcurrent = AdminConsole.getElemnetByID(subPageID);
                 }
                 current = AdminConsole.getElemnetByID(pageID);
+                if (current != null) {
+                    subnav = current.getParent();
+                }
 
                 Element currentTab = (Element)AdminConsole.getModel().selectSingleNode(
                         "//*[@id='" + pageID + "']/ancestor::tab");
@@ -182,12 +187,8 @@ public class SidebarTag extends BodyTagSupport {
                 }
 
                 // Loop through all items in the root, print them out
-                if (currentTab != null) {
-                    Collection items = currentTab.elements();
-                    if (items.size() > 0) {
-                        buf.append("<ul>");
-                        for (Iterator iter=items.iterator(); iter.hasNext(); ) {
-                            Element sidebar = (Element)iter.next();
+                if (currentTab != null && subnav != null) {
+                    Element sidebar = subnav.getParent().getParent();
                     String header = sidebar.attributeValue("name");
                     String pluginName = sidebar.attributeValue("plugin");
                     // Print the header:
@@ -195,12 +196,12 @@ public class SidebarTag extends BodyTagSupport {
                     if (hcss == null) {
                         hcss = "";
                     }
-                            buf.append("<li class=\"").append(hcss).append("\">").append(
-                                    clean(AdminConsole.getAdminText(header, pluginName))).append("</li>");
+                    Collection items = subnav.elements();
+                    if (items.size() > 0) {
+                        buf.append("<ul>");
                         // Now print all items:
-
-                            for (Iterator subitems=sidebar.elementIterator(); subitems.hasNext(); ) {
-                                Element item = (Element)subitems.next();
+                        for (Object itemObj : items) {
+                            Element item = (Element)itemObj;
                             String subitemID = item.attributeValue("id");
                             String subitemName = item.attributeValue("name");
                             String subitemURL = item.attributeValue("url");
@@ -273,7 +274,6 @@ public class SidebarTag extends BodyTagSupport {
                                 }
                             }
                         }
-                        }
                         buf.append("</ul>");
                         try {
                             out.write(buf.toString());

src/java/org/jivesoftware/admin/SubnavTag.java

+/**
+ * $RCSfile$
+ * $Revision: 4092 $
+ * $Date: 2006-06-24 18:58:11 -0400 (Sat, 24 Jun 2006) $
+ *
+ * Copyright (C) 2004 Jive Software. All rights reserved.
+ *
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
+ */
+
+package org.jivesoftware.admin;
+
+import org.jivesoftware.util.StringUtils;
+import org.jivesoftware.util.Log;
+import org.dom4j.Element;
+
+import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collection;
+import java.io.IOException;
+
+/**
+ * <p>A simple JSP tag for displaying sub-navigation bar information in the admin console. The
+ * {@link TabsTag} is similiar to this one.</p>
+ *
+ * <p>Attributes: <ul>
+ *      <li><tt>bean</tt> (required) - the id of the request attribute which is a
+ *      {@link AdminPageBean} instance. This class holds information
+ *      needed to properly render the admin console sidebar.</li>
+ *      <li><tt>css</tt> (optional) - the CSS class name used to decorate the LI of the sidebar items.</li>
+ *      <li><tt>currentcss</tt> (optional) - the CSS class name used to decorate the LI of the
+ *      currently selected sidebar item.</li>
+ *      <li><tt>heaadercss</tt> (optional) - the CSS class name used to decorate the LI of the header
+ *      section.</li></ul></p>
+ *
+ * <p>This class assumes there is a request attribute with the name specified by the bean attribute.</p>
+ *
+ * <p>This tag prints out minimal HTML. It basically prints an unordered list (UL element) with each
+ * LI containing an "A" tag specfied by the body content of this tag. For example, the body should contain
+ * a template A tag which will have its values replaced at runtime: <ul><tt>
+ *
+ *      &lt;jive:sidebar bean="jivepageinfo"&gt; <br>
+ *          &nbsp;&nbsp;&nbsp;&lt;a href="[url]" title="[description]"&gt;[name]&lt;/a&gt; <br>
+ *          &nbsp;&nbsp;&nbsp;&lt;jive:subsidebar&gt; ... &lt;/jive:subsidebar&gt; <br>
+ *      &lt;/jive:sidebar&gt;</tt></ul>
+ *
+ * There is a subsidebar tag for rendering the sub-sidebars. For more info, see the
+ * {@link SubSidebarTag} class.</p>
+ *
+ * <p>Available tokens for the "A" tag are: <ul>
+ *      <li><tt>[id]</tt> - the ID of the sidebar item, usually not needed.</li>
+ *      <li><tt>[name]</tt> - the name of the sidebar item, should be thought of as the display name.</li>
+ *      <li><tt>[url]</tt> - the URL of the sidebar item.</li>
+ *      <li><tt>[description]</tt> - the description of the sidebar item, good for mouse rollovers.</li></ul></p>
+ */
+public class SubnavTag extends BodyTagSupport {
+
+    private String css;
+    private String currentcss;
+
+    /**
+     * Returns the value of the CSS class to be used for tab decoration. If not set will return a blank string.
+     */
+    public String getCss() {
+        return clean(css);
+    }
+
+    /**
+     * Sets the CSS used for tab decoration.
+     */
+    public void setCss(String css) {
+        this.css = css;
+    }
+
+    /**
+     * Returns the value of the CSS class to be used for the currently selected LI (tab). If not set will
+     * return a blank string.
+     */
+    public String getCurrentcss() {
+        return clean(currentcss);
+    }
+
+    /**
+     * Sets the CSS class value for the currently selected tab.
+     */
+    public void setCurrentcss(String currentcss) {
+        this.currentcss = currentcss;
+    }
+
+    /**
+     * Does nothing, returns {@link #EVAL_BODY_BUFFERED} always.
+     */
+    public int doStartTag() throws JspException {
+        return EVAL_BODY_BUFFERED;
+    }
+
+    /**
+     * Gets the {@link AdminPageBean} instance from the request. If it doesn't exist then execution is stopped
+     * and nothing is printed. If it exists, retrieve values from it and render the sidebar items. The body content
+     * of the tag is assumed to have an A tag in it with tokens to replace (see class description) as well
+     * as having a subsidebar tag..
+     *
+     * @return {@link #EVAL_PAGE} after rendering the tabs.
+     * @throws JspException if an exception occurs while rendering the sidebar items.
+     */
+    public int doEndTag() throws JspException {
+        // Start by getting the request from the page context
+        HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
+
+        // Check for body of this tag and the child tag
+        if (getBodyContent().getString() == null) {
+            throw new JspException("Error, no template (body value) set for the sidebar tag.");
+        }
+
+        // Get the initial subpage and page IDs
+        String subPageID = (String)request.getAttribute("subPageID");
+        String pageID = (String)request.getAttribute("pageID");
+
+        // If the pageID is null, use the subPageID to set it. If both the pageID and
+        // subPageIDs are null, return because these are key to execution of the tag.
+        if (subPageID != null || pageID != null) {
+
+            if (pageID == null) {
+                Element subPage = AdminConsole.getElemnetByID(subPageID);
+                pageID = subPage.getParent().getParent().attributeValue("id");
+            }
+
+            // Top level menu items
+            if (AdminConsole.getModel().elements().size() > 0) {
+                JspWriter out = pageContext.getOut();
+                StringBuilder buf = new StringBuilder();
+
+                Element current = null;
+                Element subcurrent = null;
+                Element subnav = null;
+                if (subPageID != null) {
+                    subcurrent = AdminConsole.getElemnetByID(subPageID);
+                }
+                current = AdminConsole.getElemnetByID(pageID);
+                if (current != null) {
+                    if (subcurrent != null) {
+                        subnav = subcurrent.getParent().getParent().getParent();
+                    }
+                    else {
+                        subnav = current.getParent();
+                    }
+                }
+                Log.debug("\n\n\nXXXFFINDXXX\npageID = "+pageID+"\nsubPageID = "+subPageID+"\ncurrent = "+current+"\nsubcurrent = "+subcurrent+"\nsubnav = "+subnav+"\n\n\n");
+
+                Element currentTab = (Element)AdminConsole.getModel().selectSingleNode(
+                        "//*[@id='" + pageID + "']/ancestor::tab");
+
+                // Loop through all items in the root, print them out
+                if (currentTab != null) {
+                    Collection items = currentTab.elements();
+                    if (items.size() > 0) {
+                        buf.append("<ul>");
+                        for (Object itemObj : items) {
+                            Element item = (Element) itemObj;
+                            Element firstSubItem = (Element)item.elements().get(0);
+                            String pluginName = item.attributeValue("plugin");
+                            String subitemID = item.attributeValue("id");
+                            String subitemName = item.attributeValue("name");
+                            String subitemURL = firstSubItem.attributeValue("url");
+                            String subitemDescr = item.attributeValue("description");
+                            String value = getBodyContent().getString();
+                            if (value != null) {
+                                value = StringUtils.replace(value, "[id]", clean(subitemID));
+                                value = StringUtils.replace(value, "[name]",
+                                        clean(AdminConsole.getAdminText(subitemName, pluginName)));
+                                value = StringUtils.replace(value, "[description]",
+                                        clean(AdminConsole.getAdminText(subitemDescr, pluginName)));
+                                value = StringUtils.replace(value, "[url]",
+                                        request.getContextPath() + "/" + clean(subitemURL));
+                            }
+                            String css = getCss();
+                            boolean isCurrent = subnav != null && item.equals(subnav);
+                            if (isCurrent) {
+                                css = getCurrentcss();
+                            }
+                            buf.append("<li class=\"").append(css).append("\">").append(value).append("</li>");
+                        }
+                        buf.append("</ul>");
+                        try {
+                            out.write(buf.toString());
+                        }
+                        catch (IOException e) {
+                            throw new JspException(e);
+                        }
+                    }
+                }
+            }
+        }
+        return EVAL_PAGE;
+    }
+
+    /**
+     * Cleans the given string - if it's null, it's converted to a blank string. If it has ' then those are
+     * converted to double ' so HTML isn't screwed up.
+     *
+     * @param in the string to clean
+     * @return a cleaned version - not null and with escaped characters.
+     */
+    private String clean(String in) {
+        return (in == null ? "" : StringUtils.replace(in, "'", "\\'"));
+    }
+}
\ No newline at end of file

src/java/org/jivesoftware/admin/TabsTag.java

@@ -13,6 +13,7 @@ package org.jivesoftware.admin;
 
 import org.dom4j.Element;
 import org.jivesoftware.util.StringUtils;
+import org.jivesoftware.util.Log;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
@@ -133,6 +134,13 @@ public class TabsTag extends BodyTagSupport {
         // Get the page data bean from the request:
         // If the page info bean is not in the request then no tab will be selected - so, it'll fail gracefully
         String pageID = (String)request.getAttribute("pageID");
+        String subPageID = (String)request.getAttribute("subPageID");
+
+        if (pageID == null) {
+            Element subPage = AdminConsole.getElemnetByID(subPageID);
+            pageID = subPage.getParent().getParent().attributeValue("id");
+        }
+        
         // Get tabs from the model:
         List tabs = AdminConsole.getModel().selectNodes("//tab");
         if (tabs.size() > 0) {
@@ -147,6 +155,7 @@ public class TabsTag extends BodyTagSupport {
                 currentTab = (Element)AdminConsole.getModel().selectSingleNode(
                             "//*[@id='" + pageID + "']/ancestor::tab");
             }
+            Log.debug("\n\n\nXXXFFIND2222XXX\npageID = "+pageID+"\nsubPageID = "+subPageID+"\ncurrentTab = "+currentTab+"\n\n\n");
             for (int i=0; i<tabs.size(); i++) {
                 Element tab = (Element)tabs.get(i);
                 String value = body;

src/web/WEB-INF/admin.tld

@@ -40,6 +40,32 @@
             <rtexprvalue>true</rtexprvalue>
         </attribute>
     </tag>
+    <tag>
+        <name>subnavbar</name>
+        <tagclass>org.jivesoftware.admin.SubnavTag</tagclass>
+        <bodycontent>JSP</bodycontent>
+        <info />
+        <attribute>
+            <name>css</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>currentcss</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>role</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>minEdition</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
     <tag>
 		<name>sidebar</name>
 		<tagclass>org.jivesoftware.admin.SidebarTag</tagclass>

src/web/decorators/main.jsp

@@ -95,18 +95,13 @@
             <div id="jive-nav-right"></div>
         </div>
         <div id="jive-subnav">
-            &nbsp;
-        </div>
+            <admin:subnavbar css="" currentcss="current">
+                <a href="[url]" title="[description]"
+                  onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
+                  >[name]</a>
+            </admin:subnavbar>
         </div>
-
-    <%--
-    <div id="jive-secondary">
-        <ul>
-            <li><a href="">Server Manager</a></li>
-            <li><a href="">Server Settings</a></li>
-        </ul>
     </div>
-    --%>
 
     <div id="jive-main">
     <table cellpadding="0" cellspacing="0" border="0" width="100%">