geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r399548 - in /geronimo/branches/1.1/applications/console-framework/src/webapp: WEB-INF/aggregation/TabNavigation.jsp WEB-INF/data/pageregistry.xml main.css
Date Thu, 04 May 2006 04:56:57 GMT
Author: ammulder
Date: Wed May  3 21:56:56 2006
New Revision: 399548

URL: http://svn.apache.org/viewcvs?rev=399548&view=rev
Log:
Make the current area of the console a link so you can get back to the
  front page (GERONIMO-1769); also minor category cleanup.  Thanks Erin
  for the patch.

Modified:
    geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp
    geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
    geronimo/branches/1.1/applications/console-framework/src/webapp/main.css

Modified: geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp?rev=399548&r1=399547&r2=399548&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp
(original)
+++ geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp
Wed May  3 21:56:56 2006
@@ -22,7 +22,7 @@
 <jsp:useBean id="fragment" type="org.apache.pluto.portalImpl.aggregation.navigation.TabNavigation"
scope="request" />
 
 <table width="200px" border="0" cellpadding="0" cellspacing="0"> 
-  				 <tr><td CLASS="ReallyDarkBackground"><STRONG>&nbsp;Console Navigation</TD></TR>
+  				 <tr><td CLASS="ReallyDarkBackground"><STRONG>&nbsp;Console Navigation</strong></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>
@@ -77,7 +77,7 @@
 						if (tree[i].depth>0)
 						{
 %>
-								<tr><td><div class="Subselection"><table width="100%" border="0"
cellpadding="1" cellspacing="0"> 
+								<tr><td><div class="<%=partOfNav ? "SelectedSubselection " : ""
%>Subselection"><table width="100%" border="0" cellpadding="1" cellspacing="0">

                 <tr>
                   <td class="Left">&nbsp;</td> 
                   <td class="Indent">&nbsp;</td> 
@@ -89,18 +89,9 @@
   							&nbsp;&nbsp;&nbsp;
 <%
               }
-							  if (!partOfNav)
-								{
-%>
-                    <a href="<%=new PortalURL(request, nav.getLinkedFragment()).toString()%>"><img
border="0" src="<%=request.getContextPath()%>/images/<%=imageName%>">&nbsp;<%=nav.getTitle()%></a>
-<%
-								}
-								else
-								{
-%>                  <img border="0" src="<%=request.getContextPath()%>/images/<%=imageName%>">&nbsp;<%=nav.getTitle()%>
-<%
-								}
 %>
+             <a href="<%=new PortalURL(request, nav.getLinkedFragment()).toString()%>"><img
border="0" src="<%=request.getContextPath()%>/images/<%=imageName%>">&nbsp;<%=nav.getTitle()%></a>
+
                   </td> 
                   <td class="Right">&nbsp;</td> 
                 </tr> 

Modified: geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml?rev=399548&r1=399547&r2=399548&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
(original)
+++ geronimo/branches/1.1/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
Wed May  3 21:56:56 2006
@@ -264,7 +264,7 @@
 
         <fragment name="repo" type="page">
             <navigation>
-                <title>Common Libraries</title>
+                <title>Common Libs</title>
                 <description>ico_list_16x16.gif View Repository</description>
             </navigation>
             <fragment name="row1" type="row">
@@ -372,7 +372,7 @@
         <fragment name="ear" type="page">
             <navigation>
                 <title>Application EARs</title>
-                <description>ico_list_16x16.gif Manage EARs on this server</description>

+                <description>ico_list_16x16.gif Manage EARs on this server</description>
             </navigation>
 
             <fragment name="row1" type="row">
@@ -549,13 +549,7 @@
         </fragment>
     </fragment>
 
-    <fragment name="misc" type="page">
-        <navigation>
-            <title>Misc</title>
-            <description>ico_folder_16x16.gif Other management features</description>
-        </navigation>
-
-        <fragment name="internalDB" type="page">
+    <fragment name="internalDB" type="page">
             <navigation>
                 <title>Embedded DB</title>
                 <description>ico_folder_16x16.gif Show info about the server's internal
database</description>
@@ -597,6 +591,5 @@
                     </fragment>
                 </fragment>
             </fragment>
-        </fragment>
     </fragment>
 </portal>

Modified: geronimo/branches/1.1/applications/console-framework/src/webapp/main.css
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-framework/src/webapp/main.css?rev=399548&r1=399547&r2=399548&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-framework/src/webapp/main.css (original)
+++ geronimo/branches/1.1/applications/console-framework/src/webapp/main.css Wed May  3 21:56:56
2006
@@ -237,6 +237,16 @@
         background-color: #F2F2F2;
 }
 
+.Menu .SelectedSubselection .Middle a{
+    color: #000;
+    text-decoration: none;
+}
+
+.Menu .SelectedSubselection .Middle a:hover{
+    color: #000;
+    text-decoration: underline;
+}
+
 .Gutter
 {
 	width: 5px;



Mime
View raw message