Undid JM-1218 as it was moved to 3.5.0.

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

src/i18n/openfire_i18n_en.properties

@@ -275,7 +275,6 @@
 #       Added key: 'server.db.connection_details.when_created'
 #       Added key: 'server.db.connection_details.last_used'
 #       Added key: 'server.db.connection_details.thread'
-#       Added key: 'admin.logged_in_as'
 
 # Openfire
 
@@ -467,7 +466,6 @@ admin.console.restarting=Restarting admin console...
 admin.console.listening=Admin console listening at
 admin.console.devmode=Using development mode
 admin.console=Administration Console
-admin.logged_in_as=Logged in as {0}
 
 # Server messages (to users)
 

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

@@ -54,7 +54,6 @@ public class TabsTag extends BodyTagSupport {
     private String bean;
     private String css;
     private String currentcss;
-    private Boolean justlinks = false;
 
     /**
      * The name of the request attribute which holds a {@link AdminPageBean} instance.
@@ -99,20 +98,6 @@ public class TabsTag extends BodyTagSupport {
         this.currentcss = currentcss;
     }
 
-    /**
-     * Returns whether we are in just links mode.
-     */
-    public Boolean getJustlinks() {
-        return justlinks;
-    }
-
-    /**
-     * Sets whether we are just to display links, no list.
-     */
-    public void setJustlinks(Boolean justlinks) {
-        this.justlinks = justlinks;
-    }
-
     /**
      * Does nothing, returns {@link #EVAL_BODY_BUFFERED} always.
      */
@@ -139,7 +124,7 @@ public class TabsTag extends BodyTagSupport {
             JspWriter out = pageContext.getOut();
             // Build up the output in a buffer (is probably faster than a bunch of out.write's)
             StringBuilder buf = new StringBuilder();
-            if (!justlinks) { buf.append("<ul>"); }
+            buf.append("<ul>");
             String body = getBodyContent().getString();
             // For each tab, print out an <LI>.
             Element currentTab = null;
@@ -165,13 +150,12 @@ public class TabsTag extends BodyTagSupport {
                 if (tab.equals(currentTab)) {
                     css = getCurrentcss();
                 }
-                if (!justlinks) { buf.append("<li class=\"").append(css).append("\">"); }
-                if (justlinks && i > 0) { buf.append(" | "); }
+                buf.append("<li class=\"").append(css).append("\">");
                 buf.append(value);
-                if (!justlinks) { buf.append("</li>"); }
+                buf.append("</li>");
             }
 
-            if (!justlinks) { buf.append("</ul>"); }
+            buf.append("</ul>");
             try {
                 out.write(buf.toString());
             }

src/web/WEB-INF/admin.tld

@@ -34,11 +34,6 @@
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
         </attribute>
-        <attribute>
-            <name>justlinks</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
 	</tag>
 	<tag>
 		<name>sidebar</name>

src/web/available-plugins.jsp

@@ -252,7 +252,7 @@
 <div class="light-gray-border" style="padding:10px;">
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
 <thead>
-    <tr style="background:#eee;">
+    <tr style="background:#f3f7fa;">
         <td class="table-header-left">&nbsp;</td>
         <td nowrap colspan="2" class="table-header"><fmt:message key="plugin.available.open_source"/></td>
         <td nowrap class="table-header"><fmt:message key="plugin.available.description"/></td>

src/web/decorators/main.jsp

@@ -79,23 +79,19 @@
 <div id="main">
 
     <div id="jive-header">
-        <div id="jive-logo">
-            <a href="/index.jsp"><img src="/images/login_logo.gif" alt="Openfire" width="179" height="53" /></a>
+        <div id="jive-logo-image_new">
+            <strong>Administration Console</strong>
         </div>
-        <div id="jive-userstatus">
-            <%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %><br/>
-            <fmt:message key="admin.logged_in_as"><fmt:param value="<%= "<strong>"+StringUtils.escapeHTMLTags(JID.unescapeNode(webManager.getUser().getUsername()))+"</strong>" %>"/></fmt:message> - <a href="<%= path %>/index.jsp?logout=true"><%= LocaleUtils.getLocalizedString("global.logout") %></a>
+        <div id="jive-logout" style="float: right;">
+
+            <a href="<%= path %>/index.jsp?logout=true"><%= LocaleUtils.getLocalizedString("global.logout") %> [<%= StringUtils.escapeHTMLTags(JID.unescapeNode(webManager.getUser().getUsername())) %>]</a>
         </div>
-        <div id="jive-nav">
-            <div id="jive-nav-left"></div>
+        <div id="jive-tabs">
             <admin:tabs css="" currentcss="currentlink">
             <a href="[url]" title="[description]" onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;">[name]</a>
             </admin:tabs>
-            <div id="jive-nav-right"></div>
-        </div>
-        <div id="jive-subnav">
-            &nbsp;
         </div>
+        <div id="sidebar-top"></div>
     </div>
 
     <%--
@@ -111,9 +107,7 @@
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tbody>
         <tr valign="top">
-            <td width="1%">
-                <div id="jive-sidebar-container">
-                    <div id="jive-sidebar-box">
+            <td width="1%" id="jive-sidebar-box">
                 <div id="jive-sidebar">
                     <admin:sidebar css="" currentcss="currentlink" headercss="category">
                         <a href="[url]" title="[description]"
@@ -128,8 +122,6 @@
                     <br>
                     <img src="<%= path %>/images/blank.gif" width="150" height="1" border="0" alt="">
                 </div>
-                    </div>
-                </div>
             </td>
             <td width="99%" id="jive-content">
 
@@ -139,13 +131,12 @@
 
                 <%  } %>
 
-                <h1>
+                <div id="jive-title">
                     <decorator:title default="&nbsp;"/>
-                </h1>
+                </div>
 
-                <div id="jive-main-content">
                 <decorator:body/>
-                </div>
+
             </td>
         </tr>
     </tbody>
@@ -156,14 +147,11 @@
 <!-- END main -->
 
 <!-- BEGIN footer -->
-	<div id="jive-footer">
-        <div class="jive-footer-nav">
-            <admin:tabs css="" currentcss="currentlink" justlinks="true">
-            <a href="[url]" title="[description]" onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;">[name]</a>
-            </admin:tabs>
+	<div id="footer">
+        <div id="footer_padding">
+        <div id="footer_content">
+			<span><%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %>, built by <a href="http://www.jivesoftware.com">Jive Software</a> and the <a href="http://www.igniterealtime.org">IgniteRealtime.org</a> community</span>
 		</div>
-        <div class="jive-footer-copyright">
-            Built by <a href="http://www.jivesoftware.com">Jive Software</a> and the <a href="http://www.igniterealtime.org">IgniteRealtime.org</a> community
         </div>
     </div>
 <!-- END footer -->

src/web/index.jsp

@@ -171,7 +171,7 @@
     padding-top: 10px;
 	}
 .info-header {
-    background-color: #eee;
+    background-color: #f3f6fa;
     font-size: 10pt;
 }
 .info-table {

src/web/login.jsp

@@ -153,11 +153,12 @@
     <!-- BEGIN login box -->
     <div id="jive-loginBox">
 
-        <div align="center" id="jive-loginTable">
+        <div id="jive-loginLogo"></div>
+        <div id="jive-loginHeader"><fmt:message key="admin.console" /></div>
+
+
 
-            <span id="jive-login-header" style="background: transparent url(images/login_logo.gif) no-repeat left; padding: 29px 0px 10px 205px;">
-            <fmt:message key="admin.console" />
-            </span>
+        <div align="center" id="jive-loginTable">
 
             <div style="text-align: center; width: 380px;">
             <table cellpadding="0" cellspacing="0" border="0" align="center">
@@ -222,6 +223,11 @@
     <!-- END login box -->
 </div>
 
+<!-- old login log image
+ <img src="<%= AdminConsole.getLoginLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %>">
+ -->
+
+
 </form>
 
 <script language="JavaScript" type="text/javascript">

src/web/plugin-admin.jsp

@@ -463,7 +463,7 @@ else if ("false".equals(request.getParameter("uploadsuccess"))) { %>
 
 <div class="light-gray-border" style="padding:10px;">
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
- <tr style="background:#eee;">
+ <tr style="background:#f3f7fa;">
 
     <td nowrap colspan="3" class="table-header-left"><fmt:message key="plugin.admin.name"/></td>
     <td nowrap class="table-header"><fmt:message key="plugin.admin.description"/></td>

src/web/style/login.css

@@ -5,11 +5,27 @@
     text-align: left;
     top: 148px;
 }
+#jive-loginLogo {
+    display: block;
+    position: relative;
+    width: 179px;
+    height: 53px;
+    margin: 12px 0px 0px 7px;
+    background: url('../images/login_logo.gif') no-repeat;
+    float: left;
+    overflow: hidden;
+}
 #jive-loginHeader {
-    font-size: 14pt;
-    font-weight: bold;
-    color: #06698c;
-    margin: 0px;
+    display: block;
+    position: relative;
+    width: 300px;
+    height: 40px;
+    margin: 25px 0px 10px 0px;
+    padding-top: 9px;
+    font-size: 20px;
+    color: #255480;
+    float: left;
+    overflow: hidden;
 }
 #jive-loginTable {
     display: block;
@@ -18,47 +34,32 @@
     width: auto;
     margin: 10px 0px 0px 0px;
     padding: 0px;
+
 }
-#jive-loginTable table {
-        clear: both;
-        margin-top: 20px;
-        }
 #jive-loginTable td.loginFormTable {
-    padding: 17px 17px 7px 55px;
-    background: #d8e4e9 url(../images/jive-login-form-bg.gif) repeat-x top;
+    padding: 17px 17px 7px 18px;
+    background-color: #e1eaf1;
     border: 1px solid #b6c5d3;
-    -moz-border-radius: 5px;
-}
-.loginFormTable TD {
-    text-align : left;
+    -moz-border-radius: 4px;
 }
-#jive-loginTable td.loginFormTable table {
-        margin-top: 0px;
-        }
 #jive-loginVersion {
     color: #999999;
     font-weight: normal;
-    font-size: 10px;
-    padding-top: 4px;
+    font-size: 11px;
+    padding-top: 8px;
 }
 
 .jive-login-label {
-    font-size: 11px;
+    font-size : 12px;
     font-weight: bold;
-    color: #515151;
-text-align : left;
+    color: #214c74;
 }
 
-#jive-login-header {
-        font-size: 14pt;
-        font-weight: bold;
-        color: #06698c;
-
-        margin: 0px;
-        }
 
 BODY {
-    background: #b6b6b6 url(../images/jive-login-bg.gif) repeat-x top;
-    padding: 0px;
-    margin: 0px;
+    background-image : url(../images/login_background.png);
+    background-repeat : repeat-x;
+    background-color : #fff;
+    padding : 0px;
+    margin : 0px;
 }
\ No newline at end of file