Minor interface tweaks.

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

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

@@ -13,7 +13,6 @@ package org.jivesoftware.admin;
 
 import org.jivesoftware.util.*;
 import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.container.PluginManager;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.DocumentFactory;
@@ -42,33 +41,6 @@ public class AdminConsole {
     static {
         overrideModels = new LinkedHashMap<String,Element>();
         load();
-
-        // The admin console model has special logic to include an informational
-        // Enterprise tab when the Enterprise plugin is not installed. A property
-        // controls whether to show that tab. Listen for the property value changing
-        // and rebuild the model when that happens.
-        PropertyEventDispatcher.addListener(new PropertyEventListener() {
-
-            public void propertySet(String property, Map params) {
-                if ("enterpriseInfoEnabled".equals(property)) {
-                    rebuildModel();
-                }
-            }
-
-            public void propertyDeleted(String property, Map params) {
-                if ("enterpriseInfoEnabled".equals(property)) {
-                    rebuildModel();
-                }
-            }
-
-            public void xmlPropertySet(String property, Map params) {
-                // Do nothing
-            }
-
-            public void xmlPropertyDeleted(String property, Map params) {
-                // Do nothing    
-            }
-        });
     }
 
     /** Not instantiatable */
@@ -362,27 +334,6 @@ public class AdminConsole {
                 }
             }
         }
-
-        // Special case: show an informational tab about Openfire Enterprise if Enterprise
-        // is not installed and if the user has not chosen to hide tab.
-        PluginManager pluginManager = XMPPServer.getInstance().getPluginManager();
-        boolean pluginExists = pluginManager != null && pluginManager.isPluginDownloaded(
-                "enterprise.jar");
-        if (!pluginExists && JiveGlobals.getBooleanProperty("enterpriseInfoEnabled", true)) {
-            Element enterprise = generatedModel.addElement("tab");
-            enterprise.addAttribute("id", "tab-enterprise");
-            enterprise.addAttribute("name", "Enterprise");
-            enterprise.addAttribute("url", "enterprise-info.jsp");
-            enterprise.addAttribute("description", "Click for Enterprise information.");
-            Element sidebar = enterprise.addElement("sidebar");
-            sidebar.addAttribute("id", "sidebar-enterprise-info");
-            sidebar.addAttribute("name", "Openfire Enterprise");
-            Element item = sidebar.addElement("item");
-            item.addAttribute("id", "enterprise-info");
-            item.addAttribute("name", "Try Enterprise");
-            item.addAttribute("url", "enterprise-info.jsp");
-            item.addAttribute("description", "Openfire Enterprise overview inforation");
-        }
     }
 
     private static void overrideTab(Element tab, Element overrideTab) {

src/web/style/global.css

@@ -879,80 +879,6 @@ th.jive-table-th-center {
     padding:0 0 3px;
 }
 
-/* --------------------------------------------- */
-/*  Enterprise information                       */
-/* --------------------------------------------- */
-
-.jive-enterprise-info img {
-    clear:both;
-}
-.jive-enterprise-info h3 {
-    color:#555555;
-    font-size:13pt;
-    margin:4px 0;
-    padding:0;
-}
-.jive-enterprise-info ul, .jive-enterprise-info ol {
-    margin:0 0 20px 30px;
-    padding:0;
-}
-.jive-enterprise-info ul li, .jive-enterprise-info ol li {
-    margin:0;
-    padding:3px 0;
-}
-.jive-enterprise-info ul p {
-    margin:0;
-    padding:20px 0 10px;
-}
-.jive-enterprise-info-install {
-    clear:both;
-    margin:0;
-    padding:10px 0 20px;
-}
-.jive-enterprise-info-install a.jive-enterprise-info-install-btn {
-    background:transparent url(../images/enterprise-info-btn.gif) repeat-x scroll center;
-    clear:both;
-    color:#FFFFFF;
-    display:block;
-    float:left;
-    font-size:10pt;
-    font-weight:bold;
-    margin:0;
-    padding:8px 20px;
-    text-decoration:none;
-}
-.jive-enterprise-info-install p {
-    clear:both;
-    float:left;
-    font-size:8pt;
-    margin:0;
-    padding:5px 0 20px 1px;
-}
-.jive-enterprise-info {
-    font-size:9pt;
-}
-.jive-enterprise-info-close {
-    clear:both;
-    margin:0 0 6px;
-    padding:20px 0;
-}
-.jive-enterprise-info-wait, .jive-enterprise-info-success {
-    clear:both;
-    padding:4px 0 140px;
-}
-.jive-enterprise-info-wait img, .jive-enterprise-info-wait strong {
-    float:left;
-    padding:0 2px;
-}
-.jive-enterprise-info-wait strong {
-    padding-top:4px;
-}
-.jive-enterprise-info-success strong {
-    background:transparent url(../images/success-16x16.gif) no-repeat scroll left center;
-    color:#106600;
-    padding-left:20px;
-}
-
 /* --------------------------------------------- */
 /*  Footer                                       */
 /* --------------------------------------------- */