geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r345561 - in /geronimo/trunk/applications/console-framework/src/webapp: ./ WEB-INF/aggregation/ WEB-INF/data/ images/
Date Fri, 18 Nov 2005 20:30:40 GMT
Author: hogstrom
Date: Fri Nov 18 12:30:29 2005
New Revision: 345561

URL: http://svn.apache.org/viewcvs?rev=345561&view=rev
Log:
GERONIMO-1197 New Look to Console - the new Icons are groovy 

Added:
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_Gstandalone_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_beanjar_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_connect_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_db_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_doc_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_filetree_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_folder_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_geronimo_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_link_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_list_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_look_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_mail_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_servcomp_16x16.gif   (with props)
    geronimo/trunk/applications/console-framework/src/webapp/images/ico_x_16x16.gif   (with props)
Modified:
    geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp
    geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
    geronimo/trunk/applications/console-framework/src/webapp/about.jsp
    geronimo/trunk/applications/console-framework/src/webapp/login.jsp
    geronimo/trunk/applications/console-framework/src/webapp/main.css

Modified: geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp?rev=345561&r1=345560&r2=345561&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp Fri Nov 18 12:30:29 2005
@@ -21,11 +21,7 @@
 <%@ page import="org.apache.pluto.portalImpl.aggregation.navigation.NavigationTreeBean" %>
 <jsp:useBean id="fragment" type="org.apache.pluto.portalImpl.aggregation.navigation.TabNavigation" scope="request" />
 
-<TABLE WIDTH="200px" border>
-<TR>
-<TD>
-
-<table width="100%"  border="0" cellpadding="0" cellspacing="0"> 
+<table width="200px" border="0" cellpadding="0" cellspacing="0"> 
   				 <tr><td CLASS="ReallyDarkBackground"><STRONG>&nbsp;Console Navigation</TD></TR>
   				 <tr><td><div class="Selection"><table width="100%" border="0" cellpadding="0" cellspacing="0">
               <tr>
@@ -38,6 +34,8 @@
 <%
     PortalURL url = PortalEnvironment.getPortalEnvironment(request).getRequestedPortalURL();
     NavigationTreeBean[] tree = fragment.getNavigationView(url);
+    String GIF = ".gif";
+    String DEFAULT_GIF = "ico_doc_16x16.gif";
 
     // Aaron's code -- to force the navigation tree to render fully expanded, and not offer links to non-leaf nodes
     //                 todo this is pretty bad and should be replaced by a subclass of TabNavigation
@@ -65,9 +63,15 @@
     // End Aaron's Code
 
     for (int i=0; i<tree.length; i++) {
-%>
-<%
             Navigation nav = tree[i].navigation;
+            String imageName = nav.getDescription();
+            int index = imageName.indexOf(" ");
+            if ((index == -1) || !imageName.substring(index-4, index).equals(GIF)) {
+               imageName = DEFAULT_GIF;
+            } else {
+               imageName = imageName.substring(0,index);
+            }
+
             boolean partOfNav = tree[i].partOfGlobalNav;
 
 						if (tree[i].depth>0)
@@ -88,12 +92,12 @@
 							  if (!partOfNav)
 								{
 %>
-                    <a href="<%=new PortalURL(request, nav.getLinkedFragment()).toString()%>"><%=nav.getTitle()%></a>
+                    <a href="<%=new PortalURL(request, nav.getLinkedFragment()).toString()%>"><img border="0" src="<%=request.getContextPath()%>/images/<%=imageName%>">&nbsp;<%=nav.getTitle()%></a>
 <%
 								}
 								else
 								{
-%>                  <%=nav.getTitle()%>
+%>                  <img border="0" src="<%=request.getContextPath()%>/images/<%=imageName%>">&nbsp;<%=nav.getTitle()%>
 <%
 								}
 %>
@@ -115,16 +119,15 @@
 <%
 							  if (!partOfNav)
 								{
-%>                  <a href="<%=new PortalURL(request, nav.getLinkedFragment()).toString()%>"><%=nav.getTitle()%></a>
+%>                  <a href="<%=new PortalURL(request, nav.getLinkedFragment()).toString()%>"><img border="0" src="<%=request.getContextPath()%>/images/<%=imageName%>">&nbsp;<%=nav.getTitle()%></a>
 <%
 								}
 								else
 								{
-%>                  <%=nav.getTitle()%>
+%>                  <img border="0" src="<%=request.getContextPath()%>/images/<%=imageName%>">&nbsp;<%=nav.getTitle()%>
 <%
 								}
 %>
-
  							      
 	 						  </td>
                 <td class="CollapsedRight">&nbsp;</td> 
@@ -143,10 +146,5 @@
               </tr>
 						</table></div></td></tr>
   </table>
-
-
-<TD>
-</TR>
-</TABLE>
 
 

Modified: geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml?rev=345561&r1=345560&r2=345561&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml Fri Nov 18 12:30:29 2005
@@ -23,13 +23,13 @@
     <fragment name="server" type="page">
         <navigation>
             <title>Server</title>
-            <description>Holds all settings about the running server</description>
+            <description>ico_folder_16x16.gif Holds all settings about the running server</description>
         </navigation>
 
         <fragment name="info" type="page">
             <navigation>
                 <title>Information</title>
-                <description>Shows various information on the current server</description>
+                <description>ico_look_16x16.gif Shows various information on the current server</description> 
             </navigation>
 
             <fragment name="row1" type="row">
@@ -44,7 +44,7 @@
         <fragment name="jvm" type="page">
             <navigation>
                 <title>JVM</title>
-                <description>Shows JVM properties for the current server</description>
+                <description>ico_beanjar_16x16.gif Shows JVM properties for the current server</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -59,32 +59,32 @@
         <fragment name="logs" type="page">
             <navigation>
                 <title>Server Logs</title>
-                <description>View Log Files</description>
+                <description>ico_list_16x16.gif View Log Files</description>
             </navigation>
             <fragment name="row1" type="row">
                 <fragment name="col1" type="column">
-                    <fragment name="p2" type="portlet">
+                    <fragment name="p1" type="portlet">
                         <property name="portlet" value="5.10"/>
                     </fragment>
                 </fragment>
             </fragment>
             <fragment name="row2" type="row">
                 <fragment name="col1" type="column">
-                    <fragment name="p2" type="portlet">
+                    <fragment name="p1" type="portlet">
                         <property name="portlet" value="5.26"/>
                     </fragment>
                 </fragment>
             </fragment>
             <fragment name="row3" type="row">
                 <fragment name="col1" type="column">
-                    <fragment name="p2" type="portlet">
+                    <fragment name="p1" type="portlet">
                         <property name="portlet" value="5.27"/>
                     </fragment>
                 </fragment>
             </fragment>
             <fragment name="row4" type="row">
                 <fragment name="col1" type="column">
-                    <fragment name="p2" type="portlet">
+                    <fragment name="p1" type="portlet">
                         <property name="portlet" value="5.28"/>
                     </fragment>
                 </fragment>
@@ -95,7 +95,7 @@
         <fragment name="mgmt" type="page">
             <navigation>
                 <title>Shutdown/Restart</title>
-                <description>Manage this server</description>
+                <description>ico_x_16x16.gif Manage this server</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -110,7 +110,7 @@
         <fragment name="web" type="page">
             <navigation>
                 <title>Web Server</title>
-                <description>Configure Web Server</description>
+                <description>ico_servcomp_16x16.gif Configure Web Server</description>
             </navigation>
             <fragment name="row1" type="row">
                 <fragment name="col1" type="column">
@@ -121,7 +121,7 @@
             </fragment>
             <fragment name="row2" type="row">
                 <fragment name="col1" type="column">
-                    <fragment name="p4" type="portlet">
+                    <fragment name="p1" type="portlet">
                         <property name="portlet" value="5.21"/>
                     </fragment>
                 </fragment>
@@ -131,7 +131,7 @@
         <fragment name="ejb" type="page">
             <navigation>
                 <title>EJB Server</title>
-                <description>Configures the EJB server</description>
+                <description>ico_servcomp_16x16.gif Configures the EJB server</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -146,7 +146,7 @@
         <fragment name="jmsserver" type="page">
             <navigation>
                 <title>JMS Server</title>
-                <description>Configure JMS Server</description>
+                <description>ico_servcomp_16x16.gif Configure JMS Server</description>
             </navigation>
             <fragment name="row1" type="row">
                 <fragment name="col1" type="column">
@@ -157,7 +157,7 @@
             </fragment>
             <fragment name="row2" type="row">
                 <fragment name="col1" type="column">
-                    <fragment name="p2" type="portlet">
+                    <fragment name="p1" type="portlet">
                         <property name="portlet" value="5.64"/>
                     </fragment>
                 </fragment>
@@ -167,7 +167,7 @@
         <fragment name="j2ca" type="page">
             <navigation>
                 <title>J2EE Connectors</title>
-                <description>Configures the J2EE Connector server features</description>
+                <description>ico_connect_16x16.gif Configures the J2EE Connector server features</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -182,7 +182,7 @@
         <fragment name="corba" type="page">
             <navigation>
                 <title>CORBA/IIOP</title>
-                <description>Configures the CORBA/IIOP server features</description>
+                <description>ico_doc_16x16.gif Configures the CORBA/IIOP server features</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -197,7 +197,7 @@
         <fragment name="uddi" type="page">
             <navigation>
                 <title>UDDI Server</title>
-                <description>Configures the UDDI Server application</description>
+                <description>ico_servcomp_16x16.gif Configures the UDDI Server application</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -213,13 +213,13 @@
     <fragment name="services" type="page">
         <navigation>
             <title>Services</title>
-            <description>Manage services available on this server</description>
+            <description>ico_folder_16x16.gif Manage services available on this server</description>
         </navigation>
 
         <fragment name="repo" type="page">
             <navigation>
                 <title>Common Libraries</title>
-                <description>View Repository</description>
+                <description>ico_list_16x16.gif View Repository</description>
             </navigation>
             <fragment name="row1" type="row">
                 <fragment name="col1" type="column">
@@ -233,7 +233,7 @@
         <fragment name="jdbc" type="page">
             <navigation>
                 <title>Database Pools</title>
-                <description>Manage database connections</description>
+                <description>ico_db_16x16.gif Manage database connections</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -248,7 +248,7 @@
         <fragment name="jms" type="page">
             <navigation>
                 <title>JMS</title>
-                <description>Configure Java Message Service</description>
+                <description>ico_beanjar_16x16.gif Configure Java Message Service</description>
             </navigation>
             <fragment name="row1" type="row">
                 <fragment name="col1" type="column">
@@ -259,7 +259,7 @@
             </fragment>
             <fragment name="row2" type="row">
                 <fragment name="col1" type="column">
-                    <fragment name="p2" type="portlet">
+                    <fragment name="p1" type="portlet">
                         <property name="portlet" value="5.17"/>
                     </fragment>
                 </fragment>
@@ -270,7 +270,7 @@
         <fragment name="mail" type="page">
             <navigation>
                 <title>Java Mail</title>
-                <description>Configure Java Mail service</description>
+                <description>ico_mail_16x16.gif Configure Java Mail service</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -286,25 +286,25 @@
     <fragment name="apps" type="page">
         <navigation>
             <title>Applications</title>
-            <description>Manage applications on this server</description>
+            <description>ico_folder_16x16.gif Manage applications on this server</description>
         </navigation>
 
         <fragment name="all" type="page">
             <navigation>
                 <title>All Configurations</title>
-                <description>This should be replaced</description>
+                <description>ico_list_16x16.gif This should be replaced</description>
             </navigation>
 
-            <fragment name="row2" type="row">
-                <fragment name="col2" type="column">
-                    <fragment name="p3" type="portlet">
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
                         <property name="portlet" value="5.1"/>
                     </fragment>
                 </fragment>
             </fragment>
-            <fragment name="row3" type="row">
-                <fragment name="col2" type="column">
-                    <fragment name="p3" type="portlet">
+            <fragment name="row2" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
                         <property name="portlet" value="5.22"/>
                     </fragment>
                 </fragment>
@@ -314,7 +314,7 @@
         <fragment name="ear" type="page">
             <navigation>
                 <title>Application EARs</title>
-                <description>Manage EARs on this server</description>
+                <description>ico_list_16x16.gif Manage EARs on this server</description> 
             </navigation>
 
             <fragment name="row1" type="row">
@@ -329,7 +329,7 @@
         <fragment name="war" type="page">
             <navigation>
                 <title>Web App WARs</title>
-                <description>Manage EARs on this server</description>
+                <description>ico_list_16x16.gif Manage EARs on this server</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -344,7 +344,7 @@
         <fragment name="ejb" type="page">
             <navigation>
                 <title>EJB JARs</title>
-                <description>Manage EJB JARs on this server</description>
+                <description>ico_beanjar_16x16.gif Manage EJB JARs on this server</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -359,7 +359,7 @@
         <fragment name="rar" type="page">
             <navigation>
                 <title>J2EE Connectors</title>
-                <description>Manage RARs on this server</description>
+                <description>ico_connect_16x16.gif Manage RARs on this server</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -374,7 +374,7 @@
         <fragment name="client" type="page">
             <navigation>
                 <title>App Clients</title>
-                <description>Manage client JARs on this server</description>
+                <description>ico_list_16x16.gif Manage client JARs on this server</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -389,7 +389,7 @@
         <fragment name="system" type="page">
             <navigation>
                 <title>System Modules</title>
-                <description>Manage system deployments on this server</description>
+                <description>ico_list_16x16.gif Manage system deployments on this server</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -406,23 +406,24 @@
     <fragment name="Security" type="page">
         <navigation>
             <title>Security</title>
-            <description>Manage security on this server</description>
+            <description>ico_folder_16x16.gif Manage security on this server</description>
         </navigation>
+
         <fragment name="Console" type="page">
             <navigation>
                 <title>Console Realm</title>
-                <description>Manage the console security realm on this server</description>
+                <description>ico_doc_16x16.gif Manage the console security realm on this server</description>
             </navigation>
             <fragment name="row1" type="row">
                 <fragment name="col1" type="column">
-                    <fragment name="p2" type="portlet">
+                    <fragment name="p1" type="portlet">
                         <property name="portlet" value="5.3"/>
                     </fragment>
                 </fragment>
             </fragment>
             <fragment name="row2" type="row">
                 <fragment name="col1" type="column">
-                    <fragment name="p3" type="portlet">
+                    <fragment name="p1" type="portlet">
                         <property name="portlet" value="5.4"/>
                     </fragment>
                 </fragment>
@@ -432,7 +433,7 @@
         <fragment name="realms" type="page">
             <navigation>
                 <title>All Realms</title>
-                <description>Manage all security realms on this server</description>
+                <description>ico_doc_16x16.gif Manage all security realms on this server</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -447,7 +448,7 @@
         <fragment name="keystore" type="page">
             <navigation>
                 <title>Keystore</title>
-                <description>Manage the keystore for this server</description>
+                <description>ico_doc_16x16.gif Manage the keystore for this server</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -463,24 +464,24 @@
     <fragment name="misc" type="page">
         <navigation>
             <title>Misc</title>
-            <description>Other management features</description>
+            <description>ico_folder_16x16.gif Other management features</description>
         </navigation>
 
         <fragment name="internalDB" type="page">
             <navigation>
                 <title>Embedded DB</title>
-                <description>Show info about the server's internal database</description>
+                <description>ico_folder_16x16.gif Show info about the server's internal database</description>
             </navigation>
 
             <fragment name="DBInfo" type="page">
                 <navigation>
                     <title>DB Info</title>
-                    <description>Information about the internal database/s</description>
+                    <description>ico_db_16x16.gif Information about the internal database/s</description>
                 </navigation>
 
-                <fragment name="row2" type="row">
-                    <fragment name="col2" type="column">
-                        <fragment name="p8" type="portlet">
+                <fragment name="row1" type="row">
+                    <fragment name="col1" type="column">
+                        <fragment name="p1" type="portlet">
                             <property name="portlet" value="5.32"/>
                         </fragment>
                     </fragment>
@@ -490,19 +491,19 @@
             <fragment name="DBManager" type="page">
                 <navigation>
                     <title>DB Manager</title>
-                    <description>Manage the internal database/s</description>
+                    <description>ico_servcomp_16x16.gif Manage the internal database/s</description>
                 </navigation>
 
-                <fragment name="row3" type="row">
-                    <fragment name="col2" type="column">
-                        <fragment name="p9" type="portlet">
+                <fragment name="row1" type="row">
+                    <fragment name="col1" type="column">
+                        <fragment name="p1" type="portlet">
                             <property name="portlet" value="5.33"/>
                         </fragment>
                     </fragment>
                 </fragment>
                 <fragment name="row2" type="row">
-                    <fragment name="col2" type="column">
-                        <fragment name="p9" type="portlet">
+                    <fragment name="col1" type="column">
+                        <fragment name="p1" type="portlet">
                             <property name="portlet" value="5.34"/>
                         </fragment>
                     </fragment>

Modified: geronimo/trunk/applications/console-framework/src/webapp/about.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/about.jsp?rev=345561&r1=345560&r2=345561&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/about.jsp (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/about.jsp Fri Nov 18 12:30:29 2005
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Geronimo Console Login</title>
+<title>Geronimo About Page</title>
 <link href="main.css" rel="stylesheet" type="text/css">
 
   <script language="javascript">
@@ -68,7 +68,49 @@
                         <tr> 
                           <td class="CollapsedLeft"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
                           <td class="Indent"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
-                          <td class="TopMiddle">&lt;&lt;&nbsp;<a href="index.jsp">GERONIMO CONSOLE</a></td> 
+                          <td class="TopMiddle"><img src="<%=request.getContextPath()%>/images/ico_geronimo_16x16.gif">&lt;&lt;&nbsp;<a href="index.jsp">Return to main view</a></td>
+                          <td class="CollapsedRight"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td>
+                        </tr> 
+                      </table> 
+                    </div>
+									</td> 
+								</tr>
+                <tr> 
+                  <td>
+									  <div class="Selection"> 
+                      <table width="100%" border="0" cellpadding="0" cellspacing="0"> 
+                        <tr> 
+                          <td class="CollapsedLeft"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
+                          <td class="Indent"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
+                          <td class="TopMiddle"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
+                          <td class="CollapsedRight"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
+                        </tr> 
+                      </table> 
+                    </div>
+									</td> 
+								</tr>
+                <tr> 
+                  <td>
+									  <div class="Selection"> 
+                      <table width="100%" border="0" cellpadding="0" cellspacing="0"> 
+                        <tr> 
+                          <td class="CollapsedLeft"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
+                          <td class="Indent"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
+                          <td class="TopMiddle"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
+                          <td class="CollapsedRight"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
+                        </tr> 
+                      </table> 
+                    </div>
+									</td> 
+								</tr>
+                <tr> 
+                  <td>
+									  <div class="Selection"> 
+                      <table width="100%" border="0" cellpadding="0" cellspacing="0"> 
+                        <tr> 
+                          <td class="CollapsedLeft"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
+                          <td class="Indent"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
+                          <td class="TopMiddle"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
                           <td class="CollapsedRight"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"></td> 
                         </tr> 
                       </table> 

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_Gstandalone_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_Gstandalone_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_Gstandalone_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_beanjar_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_beanjar_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_beanjar_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_connect_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_connect_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_connect_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_db_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_db_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_db_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_doc_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_doc_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_doc_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_filetree_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_filetree_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_filetree_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_folder_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_folder_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_folder_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_geronimo_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_geronimo_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_geronimo_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_link_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_link_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_link_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_list_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_list_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_list_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_look_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_look_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_look_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_mail_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_mail_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_mail_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_servcomp_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_servcomp_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_servcomp_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/trunk/applications/console-framework/src/webapp/images/ico_x_16x16.gif
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/images/ico_x_16x16.gif?rev=345561&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/applications/console-framework/src/webapp/images/ico_x_16x16.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: geronimo/trunk/applications/console-framework/src/webapp/login.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/login.jsp?rev=345561&r1=345560&r2=345561&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/login.jsp (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/login.jsp Fri Nov 18 12:30:29 2005
@@ -9,12 +9,17 @@
 
 <form name="login" action="j_security_check" method="POST">
   <%--  Top table is the banner --%>
+<%--
   <table width="100%"  border="0" cellspacing="0" cellpadding="0">
     <tr>
-      <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0">
+--%>
+      <TABLE width="100%" HEIGHT="86" BORDER="0" CELLSPACING="0" CELLPADDING="0">
         <TR>
-          <td width="200"><img src="<%=request.getContextPath()%>/images/head_left_login_586x86.gif"></td>
-          <td class="Top" width="100%" border="0"></td>
+          <td height="86" class="LoginLogo" border="0"></td>
+          <td height="86" class="Top" border="0">&nbsp; </TD>
+          <td height="86" class="Top" border="0" width="40">
+<a href="<%=request.getContextPath()%>/about.jsp"><img border="0" src="<%=request.getContextPath()%>/images/head_about_51x86.gif"></a>
+          </td>
         </TR>
         <TR>
           <td>&nbsp;</td>
@@ -25,84 +30,81 @@
           <td>&nbsp;</td>
         </TR>
       </TABLE>
+<%--
     </tr>
   </TABLE>
+--%>
+
   <%--  Main body --%>
   <table WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0">
     <TR CLASS="Content">
       <td width="30%" >&nbsp;</td>
-      <td class="Body" align="CENTER" height="300" valign="top">
 
+      <td class="Body" align="CENTER" height="300" valign="top">
       <TABLE border>
       <TR>
       <TD>
-
       <table width="550" cellpadding="0" cellspacing="0" border="0">
         <tr>
           <td class="ReallyDarkBackground"><strong>&nbsp;Log In to the Geronimo Console</td>
         </tr>
         <tr>
-          <td class="LightBackground">&nbsp;</td>
+          <td class="MediumBackground">&nbsp;</td>
         </tr>
         <tr>
           <td>
           <table width="100%"  border="0" cellspacing="0" cellpadding="0">
               <tr>
-                <td width="25%" class="LightBackground">&nbsp;</td> 
-                <td align="right" class="LightBackground">&nbsp;</td>
-                <td width="6" class="LightBackground">&nbsp;</td>
-                <td width="1" class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td width="25%" class="LightBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="LightBackground" ROWSPAN=3 ALIGN="center" ><img border="0" align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif"></td> 
-                <td align="right" class="LightBackground"><strong>Username</strong></td>
-                <td class="LightBackground"><strong>:</strong></td>
-                <td width="1" class="LightBackground">&nbsp;</td>
-                <td class="LightBackground"><input name="j_username" type="text" class="InputField" value="" size="20px" maxlength="25"/></td>
-                <td width="17" class="LightBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td align="right" class="LightBackground"><strong>Password</strong></td>
-                <td class="LightBackground"><strong>:</strong></td>
-                <td width="1" class="LightBackground">&nbsp;</td>
-                <td class="LightBackground"><input name="j_password" type="password" class="InputField" value="" size="20px" maxlength="25"/></td>
-                <td class="LightBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="LightBackground">&nbsp;</td>
-                <td colspan="4" align="center" class="LightBackground"><input name="submit" type="submit" value="Login"/></td>
-                <td class="LightBackground">&nbsp;</td>
-              </tr>
-              <tr>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
-                <td class="LightBackground">&nbsp;</td>
+                <td width="25%" class="MediumBackground">&nbsp;</td> 
+                <td align="right" class="MediumBackground">&nbsp;</td>
+                <td width="6" class="MediumBackground">&nbsp;</td>
+                <td width="1" class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td width="25%" class="MediumBackground">&nbsp;</td>
+              </tr>
+              <tr>
+                <td class="MediumBackground" ROWSPAN=3 ALIGN="center" ><img border="0" align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif"></td> 
+                <td align="right" class="MediumBackground"><strong>Username</strong></td>
+                <td class="MediumBackground"><strong>:</strong></td>
+                <td width="1" class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground"><input name="j_username" type="text" class="InputField" value="" size="20px" maxlength="25"/></td>
+                <td width="17" class="MediumBackground">&nbsp;</td>
+              </tr>
+              <tr>
+                <td align="right" class="MediumBackground"><strong>Password</strong></td>
+                <td class="MediumBackground"><strong>:</strong></td>
+                <td width="1" class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground"><input name="j_password" type="password" class="InputField" value="" size="20px" maxlength="25"/></td>
+                <td class="MediumBackground">&nbsp;</td>
+              </tr>
+              <tr>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+              </tr>
+              <tr>
+                <td class="MediumBackground">&nbsp;</td>
+                <td colspan="4" align="center" class="MediumBackground"><input name="submit" type="submit" value="Login"/></td>
+                <td class="MediumBackground">&nbsp;</td>
+              </tr>
+              <tr>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
               </tr>
           </table>
           </td>
         </tr>
-<%--
-        <tr>
-          <td class="LightBackground">&nbsp;</td>
-        </tr>
---%>
+
         <tr>
-          <td><font size="1"><STRONG>Welcome to the Geronimo Console&#8482;</FONT></td>
+          <td><font size="1"><STRONG>Welcome to the Geronimo&#8482; Console</FONT></td>
         </TR>
         <tr>
-<%--           <TD><font size="1">All the other stuff that we need to say and that will take up several lines worth of information on the screen</FONT></TD>  --%>
           <TD>
           <table width="100%"  border="0" cellspacing="1" cellpadding="5">
             <tr>
@@ -119,32 +121,32 @@
 
             <tr>
               <td>&nbsp;</td>
-              <td> <strong>Geronimo Console&#8482;</strong> has integrated the following components:<BR/>
-                &nbsp;&#149;&nbsp; Application server (Apache Geronimo)<br/>
-                &nbsp;&#149;&nbsp; Web server and servlet engine (Jetty)<br/>
-                &nbsp;&#149;&nbsp; JSP compiler (Jasper)<br/>
-                &nbsp;&#149;&nbsp; Relational database (Apache Derby)<br/>
-                &nbsp;&#149;&nbsp; JSR 168 portlet container (Apache Pluto)<br/>
-                &nbsp;&#149;&nbsp; Messaging (ActiveMQ)<br/>
-                &nbsp;&#149;&nbsp; User management services<br/>
-                &nbsp;&#149;&nbsp; Centralized administration console<br/>
+              <td> <strong>Geronimo&#8482;</strong> has integrated the following components:<BR/>
+                &nbsp;&nbsp;&#149;&nbsp; Application server (Apache Geronimo)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Tomcat)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Jetty)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; JSP compiler (Jasper)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Relational database (Apache Derby)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Messaging (ActiveMQ)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; User management services<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Centralized administration console<br/>
               <td>&nbsp;</td>
             </tr>
           </table>
           </TD>
         </TR>
       </table>
-
       </TD>
       </TR>
       </TABLE>
-
       </td>
-<%--      <td class="Body" width="30%" align="Center" valign="top">     --%>
+
+      <td width="30%" >&nbsp;</td>
+<%--
       <td width="30%" align="Center" valign="top">   
-          <table class=BrightBox width="200" border cellspacing="0" cellpadding="0">
+          <table width="200" border cellspacing="0" cellpadding="0">
               <tr>
-                <td width="50%" class="BrightTitle"><STRONG>&nbsp;Related Links</td>
+                <td width="50%" class="BrightTitle"><STRONG>&nbsp;Geronimo Related Links</td>
               </tr>
               <tr>
                 <td>
@@ -156,7 +158,17 @@
                   </tr>
                   <tr>
                     <td width="20" align="center"><img src="<%=request.getContextPath()%>/images/bullet.gif"></td>
-                    <td><a href="http://">Technical Support</a></td>
+                    <td><a href="http://geronimo.apache.org/">Geronimo Home Page</a></td>
+                    <td width="10">&nbsp;</td>
+                  </tr>
+                  <tr>
+                    <td align="center">&nbsp;</td>
+                    <td>&nbsp;</td>
+                    <td>&nbsp;</td>
+                  </tr>
+                  <tr>
+                    <td width="20" align="center"><img src="<%=request.getContextPath()%>/images/bullet.gif"></td>
+                    <td><a href="http://wiki.apache.org/geronimo/">Geronimo Wiki</a> </td>
                     <td width="10">&nbsp;</td>
                   </tr>
                   <tr>
@@ -166,7 +178,7 @@
                   </tr>
                   <tr>
                     <td width="20" align="center"><img src="<%=request.getContextPath()%>/images/bullet.gif"></td>
-                    <td><a href="http://">Download Updates</a> </td>
+                    <td><a href="http://opensource2.atlassian.com/confluence/oss/display/GERONIMO/Home">Geronimo Documentation</a></td>
                     <td width="10">&nbsp;</td>
                   </tr>
                   <tr>
@@ -176,7 +188,7 @@
                   </tr>
                   <tr>
                     <td width="20" align="center"><img src="<%=request.getContextPath()%>/images/bullet.gif"></td>
-                    <td><a href="mailto:user@geronimo.apache.org">Mailing List</a></td>
+                    <td><a href="mailto:user@geronimo.apache.org">Geronimo User Mailing List</a></td>
                     <td width="10">&nbsp;</td>
                   </tr>
                   <tr>
@@ -194,6 +206,7 @@
               </tr>
             </table>
       </TD>
+--%>
     </tr>
   </table>
 </form>

Modified: geronimo/trunk/applications/console-framework/src/webapp/main.css
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/main.css?rev=345561&r1=345560&r2=345561&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/main.css (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/main.css Fri Nov 18 12:30:29 2005
@@ -1,6 +1,6 @@
 body 
 {
-	background-color: #FFFFFF;
+	/*background-color: #FFFFFF;*/
 }
 
 .BrightTitle
@@ -23,18 +23,19 @@
 
 td
 {
-	font-size: 13px;
+	font-size: 11px;
 	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
 a:link, a:visited
 {
-	color: #004C93;
+	color: #204486;
 }
 
 a:hover 
 {
-	color: #5FA3D6;
+	/*color: #5FA3D6;*/
+	color: #CF820A;
 }
 
 .Logo
@@ -51,6 +52,20 @@
 	font-weight: bold;
 }
 
+.LoginLogo
+{
+	background-image:url("images/head_left_login_586x86.gif");
+	background-repeat: no-repeat;
+	width: 570px;
+	height: 86px;
+	font-size: 35px;
+	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+	text-align: right;
+	vertical-align: bottom; 
+	line-height: 30px;
+	font-weight: bold;
+}
+
 .Top
 {
 	background-image:url("images/head_bgstretch_1x86.gif");
@@ -90,8 +105,7 @@
 
 .Menu .Selection
 {
-	color: #000000;
-        background-color: #FBF9F9;
+        background-color: #F2F2F2;
 	font-size: 12px;
 	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
@@ -101,37 +115,34 @@
 	width: 12px;
 	height: 12px;
 	color: #000000;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Selection .Indent
 {
 	width: 2px;
-	color: #000000;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Selection .CollapsedRight
 {
 	width: 8px;
 	height: 12px;
-	color: #000000;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Selection .TopLeft
 {
 	width: 8px;
 	height: 16px;
-	color: #000000;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Selection .TopMiddle
 {
 	color: #000000;
 	text-decoration: none;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Selection .TopMiddle a:link, 
@@ -141,7 +152,7 @@
 	line-height: 20px;
 	font-size: 12px;
 	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Selection .TopMiddle a:hover
@@ -153,8 +164,7 @@
 {
 	width: 8px;
 	height: 16px;
-	color: #000000;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Selection .Spacer
@@ -172,20 +182,20 @@
 .Menu .Subselection .Left
 {
 	width: 12px;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Subselection .Indent
 {
 	width: 2px;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Subselection .Middle
 {
 	font-size: 12px;
 	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 	color:#000000;
 }
 
@@ -204,27 +214,27 @@
 .Menu .Subselection .Right
 {
 	width: 8px;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Subselection .BottomLeft
 {
 	width: 8px;
 	height: 8px;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Subselection .BottomMiddle
 {
 	height: 8px;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Menu .Subselection .BottomRight
 {
 	width: 8px;
 	height: 8px;
-  background-color: #FFFFFF;
+        background-color: #F2F2F2;
 }
 
 .Gutter
@@ -276,14 +286,14 @@
 {
 	width: 18px;
 	height: 18px;
-  background-color:#000000;
+        background-color:#000000;
 }
 
 .Content .CollapsedRight
 {
 	width: 18px;
 	height: 18px;
-  background-color:#000000;
+        background-color:#000000;
 }
 
 .Content .Left
@@ -314,7 +324,7 @@
 
 .Content .Body .LightBackground
 {
-        background-color: #E7E7E7;
+        background-color: #FFFFFF;
 	color:#000000;
 }
 
@@ -325,7 +335,7 @@
 
 .Content .Body .MediumBackground
 {
-	background-color: #CCCCCC;
+	background-color: #F2F2F2;
 	color:#000000;
 }
 



Mime
View raw message