You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/08/01 12:07:06 UTC
svn commit: r1152724 - in /geronimo/server/trunk/plugins:
console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/
console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/
console/console-portal-driver/src/main/webapp/ conso...
Author: rwonly
Date: Mon Aug 1 10:07:02 2011
New Revision: 1152724
URL: http://svn.apache.org/viewvc?rev=1152724&view=rev
Log:
GERONIMO-6059 New look and feel of Geronimo 3.0 admin console (Step 2, New UI design)
Added:
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/banner-3.0-bg_1x88.png (with props)
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/banner-3.0_900x88.png (with props)
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-dark-bg_1x24.png (with props)
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-light-dark-bg_1x24.png (with props)
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-really-dark-bg_1x24.png (with props)
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/title-3.0-bg_1x28.png (with props)
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/title-3.0_200x28.png (with props)
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/favicon.ico (with props)
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/banner-3.0-bg_1x88.png (with props)
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/banner-3.0_900x88.png (with props)
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/table-head-really-dark-bg_1x24.png (with props)
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/pluto.css (with props)
Removed:
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/mgmtconsole.jpg
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/geronimo-logo.png
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/geronimo-power.gif
Modified:
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/banner.jsp
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_welcome_16x16.gif
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/loading-left.png
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/loading-right.png
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/pluto.css
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/main.css
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/FindPackages.jsp Mon Aug 1 10:07:02 2011
@@ -42,11 +42,6 @@
function showHideById(id) {
document.getElementById(id).style.display = (document.getElementById(id).style.display=='none')?'block':'none';
}
-
-function showHideTr(num) {
- showHideById("exportTr-"+num);
- showHideById("importTr-"+num);
-}
</script>
<script language="javascript">
var oldcolor;
@@ -58,9 +53,9 @@ function recoverTr(theTr){
theTr.style.backgroundColor = oldcolor;
}
</script>
-<table width="100%" class="TableLine" cellpadding="3" cellspacing="0" summary="Find Packages Result">
+<table width="100%" class="TableLine" summary="Find Packages Result">
<tr class="DarkBackground">
- <th scope="col" colspan="2">Search Result (Click to see package's exporter and importer)</th>
+ <th scope="col">Search Result (Click to see package's exporter and importer)</th>
</tr>
<c:set var="backgroundClass" value='MediumBackground'/>
<c:forEach var="pwb" items="${packageWiredBundlesList}" varStatus="status">
@@ -73,36 +68,42 @@ function recoverTr(theTr){
</c:otherwise>
</c:choose>
<tr class="${backgroundClass}" style="cursor:pointer" onmouseover="highlightTr(this)" onmouseout="recoverTr(this)">
- <td colspan="2" onclick="showHideTr(${status.index})">
+ <td onclick="showHideById('eiTr-'+${status.index})">
${pwb.packageInfo.packageName} (version=${pwb.packageInfo.packageVersion})
</td>
</tr>
- <tr class="${backgroundClass}" id="exportTr-${status.index}" style="display:none">
- <td valign="top">
- - exporting by bundles:
- </td>
- <td>
- <c:forEach var="info" items="${pwb.exportBundleInfos}">
- ${info.symbolicName} (id=${info.bundleId}) (version=${info.bundleVersion})
- <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" alt="icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
- <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" alt="icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
- <a href="<portlet:renderURL><portlet:param name='page' value='view_services'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" alt="icon_serv.png" title="View Services" style="vertical-align:middle"/></a>
- <br/>
- </c:forEach>
- </td>
- </tr>
- <tr class="${backgroundClass}" id="importTr-${status.index}" style="display:none">
- <td valign="top">
- - importing by bundles:
- </td>
+ <tr id="eiTr-${status.index}" style="background-color:#F0F8FF;display:none">
<td>
- <c:forEach var="info" items="${pwb.importBundleInfos}">
- ${info.symbolicName} (id=${info.bundleId}) (version=${info.bundleVersion})
- <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" alt="icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
- <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" alt="icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
- <a href="<portlet:renderURL><portlet:param name='page' value='view_services'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" alt="icon_serv.png" title="View Services" style="vertical-align:middle"/></a>
- <br/>
- </c:forEach>
+ <table width="100%" cellpadding="3">
+ <tr>
+ <td valign="top" width="100px">
+ - exporters:
+ </td>
+ <td>
+ <c:forEach var="info" items="${pwb.exportBundleInfos}">
+ ${info.symbolicName} (id=${info.bundleId}) (version=${info.bundleVersion})
+ <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" alt="icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
+ <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" alt="icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
+ <a href="<portlet:renderURL><portlet:param name='page' value='view_services'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" alt="icon_serv.png" title="View Services" style="vertical-align:middle"/></a>
+ <br/>
+ </c:forEach>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" width="100px">
+ - importers:
+ </td>
+ <td>
+ <c:forEach var="info" items="${pwb.importBundleInfos}">
+ ${info.symbolicName} (id=${info.bundleId}) (version=${info.bundleVersion})
+ <a href="<portlet:renderURL><portlet:param name='page' value='view_manifest'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_mf.png" alt="icon_mf.png" title="View Manifest" style="vertical-align:middle"/></a>
+ <a href="<portlet:renderURL><portlet:param name='page' value='view_wired_bundles'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_wb.png" alt="icon_wb.png" title="View Wired Bundles" style="vertical-align:middle"/></a>
+ <a href="<portlet:renderURL><portlet:param name='page' value='view_services'/><portlet:param name='bundleId' value='${info.bundleId}'/></portlet:renderURL>"><img border="0" src="<%=request.getContextPath()%>/images/icon_serv.png" alt="icon_serv.png" title="View Services" style="vertical-align:middle"/></a>
+ <br/>
+ </c:forEach>
+ </td>
+ </tr>
+ </table>
</td>
</tr>
</c:forEach>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Mon Aug 1 10:07:02 2011
@@ -21,11 +21,10 @@
<portlet:defineObjects/>
-<table style="width:100%"> <!-- an IE rendering fix -->
+<table style="width:100%" cellpadding="10"> <!-- an IE rendering fix -->
<tr>
-
<!-- Body -->
- <td width="90%" align="left" valign="top">
+ <td width="80%" align="left" valign="top">
<p><font face="Verdana" size="+1"><center><b><fmt:message key="welcome.welcomeMaximized.title"/></b></center></font></p>
<p><fmt:message key="welcome.welcomeNormal.about1"/></p>
@@ -36,14 +35,14 @@
<p><fmt:message key="welcome.welcomeNormal.about4"/></p>
- <ul>
+ <ul>
<li><b><a href="mailto:user-subscribe@geronimo.apache.org">user@geronimo.apache.org</a></b>
(<a href="http://geronimo.apache.org/redirects/userMailingList.html"><fmt:message key="welcome.welcomeNormal.archive"/></a>)
<fmt:message key="welcome.welcomeNormal.forUsers"/></li>
<li><b><a href="mailto:dev-subscribe@geronimo.apache.org">dev@geronimo.apache.org</a></b>
(<a href="http://geronimo.apache.org/redirects/developerMailingList.html"><fmt:message key="welcome.welcomeNormal.archive"/></a>)
<fmt:message key="welcome.welcomeNormal.forDevelopers"/></li>
- </ul>
+ </ul>
<p><fmt:message key="welcome.welcomeNormal.about5"/></p>
@@ -52,12 +51,9 @@
</td>
- <td> </td>
-
<!-- Geronimo Links -->
<td valign="top">
- <%if(request.isUserInRole("admin")){ %>
-
+ <%if(request.isUserInRole("admin")){ %>
<table width="100%" class="TableLine">
<tr>
<td class="DarkBackground" nowrap>
@@ -72,10 +68,8 @@
</td>
</tr>
</table>
- <%} %>
-
- <br />
<br />
+ <%} %>
<table width="100%" class="TableLine">
<tr>
@@ -93,8 +87,6 @@
</td>
</tr>
</table>
-
- <br />
<br />
<table width="100%" class="TableLine">
@@ -112,19 +104,18 @@
</td>
</tr>
</table>
-
<br />
- <br />
-
- <p align="right"><font size=-1>
- <img src="/console/images/powered_by_100x30.gif" alt="Powered by Apache Geronimo"/>
- </font><br />
-
- <font size=-1>Copyright © 2003-2010 Apache Software Foundation</font><br />
- <font size=-1>All Rights Reserved</font></p>
-
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="right">
+ <p align="right">
+ <img src="/console/images/powered_by_100x30.gif" alt="Powered by Apache Geronimo"/><br />
+ Copyright © 2003-2011 Apache Software Foundation<br />
+ All Rights Reserved
+ </p>
</td>
-
</tr>
</table>
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/banner.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/banner.jsp?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/banner.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/banner.jsp Mon Aug 1 10:07:02 2011
@@ -17,14 +17,11 @@ implied.
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="Banner" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td class="Logo"> </td>
- <td class="Top"> </td>
- <td class="Top" width="40">
- <a href="<%=request.getContextPath()%>/logout.jsp"><img border="0" style="vertical-align:middle" src="<%=request.getContextPath()%>/images/head_logout_63x86.gif" alt="Logout"/></a>
+ <td class="Logo">
+ Welcome to Geronimo Console | <a href="<%=request.getContextPath()%>/logout.jsp">Log out</a>
</td>
- <td class="Top" width="5"></td>
</tr>
</table>
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp Mon Aug 1 10:07:02 2011
@@ -28,16 +28,22 @@ limitations under the License.
<!-- Assemble the rendering result -->
<div class="portlet" id='<c:out value="${portlet}"/>'>
<div class="title">
- <!-- Portlet Mode Controls -->
- <pluto:modeAnchor portletMode="view"/>
- <pluto:modeAnchor portletMode="edit"/>
- <pluto:modeAnchor portletMode="help"/>
- <!-- Window State Controls -->
- <a href="<pluto:url windowState="minimized"/>"><span class="minimized"></span></a>
- <a href="<pluto:url windowState="maximized"/>"><span class="maximized"></span></a>
- <a href="<pluto:url windowState="normal"/>"><span class="normal"></span></a>
- <!-- Portlet Title -->
- <h2><fmt:message key="<%=(String)request.getAttribute( org.apache.pluto.driver.AttributeKeys.PORTLET_TITLE )%>"/></h2>
+ <table class="Caption" width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="Figure">
+ <!-- Portlet Title -->
+ <h2><fmt:message key="<%=(String)request.getAttribute( org.apache.pluto.driver.AttributeKeys.PORTLET_TITLE )%>"/></h2>
+ <!-- Portlet Mode Controls -->
+ <pluto:modeAnchor portletMode="view"/>
+ <pluto:modeAnchor portletMode="edit"/>
+ <pluto:modeAnchor portletMode="help"/>
+ <!-- Window State Controls -->
+ <a href="<pluto:url windowState="minimized"/>"><span class="minimized"></span></a>
+ <a href="<pluto:url windowState="maximized"/>"><span class="maximized"></span></a>
+ <a href="<pluto:url windowState="normal"/>"><span class="normal"></span></a>
+ </td>
+ </tr>
+ </table>
</div>
<div class="body">
<pluto:render/>
Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/banner-3.0-bg_1x88.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/banner-3.0-bg_1x88.png?rev=1152724&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/banner-3.0-bg_1x88.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/banner-3.0_900x88.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/banner-3.0_900x88.png?rev=1152724&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/banner-3.0_900x88.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_welcome_16x16.gif
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_welcome_16x16.gif?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
Binary files - no diff available.
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/loading-left.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/loading-left.png?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
Binary files - no diff available.
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/loading-right.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/loading-right.png?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
Binary files - no diff available.
Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-dark-bg_1x24.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-dark-bg_1x24.png?rev=1152724&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-dark-bg_1x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-light-dark-bg_1x24.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-light-dark-bg_1x24.png?rev=1152724&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-light-dark-bg_1x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-really-dark-bg_1x24.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-really-dark-bg_1x24.png?rev=1152724&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/table-head-really-dark-bg_1x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/title-3.0-bg_1x28.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/title-3.0-bg_1x28.png?rev=1152724&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/title-3.0-bg_1x28.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/title-3.0_200x28.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/title-3.0_200x28.png?rev=1152724&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/title-3.0_200x28.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp Mon Aug 1 10:07:02 2011
@@ -1,5 +1,5 @@
-<%@ page language="java"
- contentType="text/html; charset=UTF-8" %>
+<!doctype html>
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
<%--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -27,6 +27,7 @@
<head>
<title><fmt:message key="console.common.ConsoleLogIn"/></title>
<link href="<%=request.getContextPath()%>/main.css" rel="stylesheet" type="text/css"/>
+<link href="<%=request.getContextPath()%>/pluto.css" rel="stylesheet" type="text/css"/>
<link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>
</head>
@@ -37,79 +38,78 @@
}
</script>
-<body onload="document.login.j_username.focus()" leftmargin="0" topmargin="0" rightmargin="0">
+<body onload="document.login.j_username.focus()" style="margin:0px">
<%-- Top table is the banner --%>
-<table width="100%" height="86" cellpadding="0" cellspacing="0" border="0">
+<table class="Banner" cellpadding="0" cellspacing="0" border="0">
<tr>
- <td height="86" class="LoginLogo" border="0"></td>
- <td height="86" class="Top" border="0"> </td>
+ <td class="Logo" border="0"> </td>
</tr>
</table>
<%-- Main body --%>
-
+<br/>
<form name="login" action="j_security_check" method="POST">
-<p align="center">
-<table width="550" cellpadding="0" cellspacing="0" border="0">
+<div style="width:550px;margin-left:auto;margin-right:auto">
+<table width="550px" class="DarkTableLine" border="0">
<tr>
<td class="ReallyDarkBackground">
<fmt:message key="console.common.loginToConsole"/>
</td>
</tr>
<tr>
- <td class="MediumBackground" align="center">
+ <td class="MediumBackground">
<br/>
- <table border="0" cellspacing="0" cellpadding="5">
- <tr>
- <td>
- <img border="0" align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif" alt=""/>
- </td>
- <td>
- <table width="100%" border="0" cellspacing="2" cellpadding="0">
- <tr>
- <td align="right"><strong><label for="<portlet:namespace/>j_username"><fmt:message key="console.common.username"/></label>:</strong></td>
- <td><input name="j_username" id="<portlet:namespace/>j_username" type="text" class="InputField" value="" size="20px"/></td>
- </tr>
- <tr>
- <td align="right"><strong><label for="<portlet:namespace/>j_password"><fmt:message key="console.common.password"/></label>:</strong></td>
- <td><input name="j_password" id="<portlet:namespace/>j_password" type="password" class="InputField" value="" size="20px"/></td>
- </tr>
- <tr>
- <td> </td>
- <td><input name="submit" type="submit" value="<fmt:message key="console.common.login"/>"/></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
+ <div style="width:350px;margin-left:auto;margin-right:auto">
+ <table border="0" cellspacing="0" cellpadding="5">
+ <tr>
+ <td>
+ <img border="0" align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif" alt=""/>
+ </td>
+ <td>
+ <table width="100%" border="0" cellspacing="2" cellpadding="0">
+ <tr>
+ <td align="right"><strong><label for="<portlet:namespace/>j_username"><fmt:message key="console.common.username"/></label>:</strong></td>
+ <td align="left"><input name="j_username" id="<portlet:namespace/>j_username" type="text" class="InputField" value="" size="20px"/></td>
+ </tr>
+ <tr>
+ <td align="right"><strong><label for="<portlet:namespace/>j_password"><fmt:message key="console.common.password"/></label>:</strong></td>
+ <td align="left"><input name="j_password" id="<portlet:namespace/>j_password" type="password" class="InputField" value="" size="20px"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td align="left"><input name="submit" type="submit" value="<fmt:message key="console.common.login"/>"/></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>
<br/>
- </td>
- </tr>
- <tr>
- <td class="MediumBackground" align="center">
<br/>
- <table style="TableLine" width="90%" border="0">
- <tr>
- <td class="DarkBackground">
- <strong> <fmt:message key="console.login.welcome"/></strong>
- </td>
- </tr>
- <tr>
- <td>
- <div style="padding:10px;">
- <fmt:message key="console.login.introduction"/>
- <br/><br/>
- <fmt:message key="console.login.components"/>
- </div>
- </td>
- </tr>
- </table>
+ <div style="width:500px;margin-left:auto;margin-right:auto">
+ <table class="TableLine" width="100%" border="0">
+ <tr>
+ <td class="DarkBackground">
+ <strong> <fmt:message key="console.login.welcome"/></strong>
+ </td>
+ </tr>
+ <tr>
+ <td class="LightBackground">
+ <div style="padding:10px;">
+ <fmt:message key="console.login.introduction"/>
+ <br/><br/>
+ <fmt:message key="console.login.components"/>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
<br/>
</td>
</tr>
</table>
-</p>
+</div>
</form>
</body>
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css Mon Aug 1 10:07:02 2011
@@ -15,7 +15,7 @@
* limitations under the License.
======================================================================*/
-/** override the dojo's claro style **/
+/** Dojo claro style Override : Start **/
.claro .dijitLeaf {
display: none;
}
@@ -27,6 +27,7 @@
.claro .dijitTreeLabel {
font-size: 12px;
}
+/** Dojo claro style Override : End **/
body
{
@@ -41,119 +42,64 @@ td
}
a:link,
-a:visited
-{
+a:visited {
color: #204486;
}
-a:hover
-{
- /*color: #5FA3D6;*/
+a:hover {
color: #CF820A;
}
-.Logo
-{
- background-image:url("images/head_left_754x86.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;
-}
-
-.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");
- background-repeat: repeat-x;
- height: 86px;
- font-size: 11px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- text-align: right;
- vertical-align: bottom;
- font-weight: bold;
-}
-
-.Top a:link,
-.Top a:visited,
-.Top a:hover
-{
- color: #FFFFFF;
- font-size: 11px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- text-decoration: underline;
- text-align: left;
- vertical-align: bottom;
- line-height: 30px;
- font-weight: bold;
-}
-
-.TopSpacer
-{
- height: 20px;
-}
-.Hidden
-{
+.Hidden {
visibility: hidden;
height: 0px;
line-height: 0px;
display: none;
}
-.Selection
-{
+.Selection {
font-size: 12px;
font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
}
-.InputField
-{
+.InputField {
width: 150px;
}
.TableLine {
border-style: solid;
border-width: 1px;
- border-color: #DDDDDD;
+ border-color: #c3e2fd;
+ background-color: #FFFFFF;
}
-.BlankTableLine
-{
+.DarkTableLine {
+ border-style: solid;
+ border-width: 1px;
+ border-color: #769dc0;
+ background-color: #FFFFFF;
+}
+
+.BlankTableLine {
border: 0px;
padding: 0;
}
.LightBackground
{
- padding: 1px;
background-color: #FFFFFF;
+ padding: 1px;
color:#000000;
+ text-align: left;
}
.MediumBackground
{
- padding: 1px;
background-color: #F2F2F2;
+ padding: 1px;
color:#000000;
+ text-align: left;
}
.DarkBackground,
@@ -161,28 +107,38 @@ a:hover
.DarkBackground a:visited,
.DarkBackground a:hover
{
- background-color: #2581C7;
- padding: 2px;
- color:#FFFFFF;
- font-size: 14px;
- font-weight: normal;
+ background-image:url("images/table-head-dark-bg_1x24.png");
+ background-repeat: repeat-x;
+
+ padding: 3px;
+ line-height: 18px;
+ color: #204486;
+ text-align: left;
+ font-size: 12px;
+ font-weight: bold;
font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
}
.DarkBackground th
{
- padding: 2px;
- color:#FFFFFF;
- font-size: 14px;
- font-weight: normal;
+ padding: 3px;
+ line-height: 18px;
+ color: #204486;
+ text-align: left;
+ font-size: 12px;
+ font-weight: bold;
font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
}
.ReallyDarkBackground
{
- background-color: #000000;
- padding: 2px;
+ background-image:url("images/table-head-really-dark-bg_1x24.png");
+ background-repeat: repeat-x;
+
+ padding: 3px;
+ line-height: 18px;
color: #FFFFFF;
+ text-align: left;
font-size: 14px;
font-weight: bold;
font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
@@ -190,14 +146,16 @@ a:hover
.ReallyDarkBackground th
{
- padding: 2px;
+ padding: 3px;
+ line-height: 18px;
color: #FFFFFF;
+ text-align: left;
font-size: 14px;
font-weight: bold;
font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
}
-/** Accessbility **/
+/** Accessbility : Start **/
.access
{
display: none;
@@ -227,3 +185,5 @@ a:hover
border: 2px solid #000000;
font-weight: bold;
}
+
+/** Accessbility : End **/
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/pluto.css
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/pluto.css?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/pluto.css (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/pluto.css Mon Aug 1 10:07:02 2011
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-/** main layout definition **/
+/** Layout definition **/
#headerDiv {
width:100%;
- height:86px;
+ height:88px;
}
#navigationDiv {
@@ -52,6 +52,54 @@
}
+/** Banner block **/
+.Banner
+{
+ background-image:url("images/banner-3.0-bg_1x88.png");
+ background-repeat: repeat-x;
+ height: 88px; /* need keep same with #HeaderDiv */
+ width: 100%;
+}
+
+.Logo
+{
+ background-image:url("images/banner-3.0_900x88.png");
+ background-repeat: no-repeat;
+ text-align: right;
+ vertical-align: top;
+ padding: 5px;
+ padding-right: 15px;
+ color: #FFFFFF;
+ font-size: 12px;
+ font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+}
+
+.Logo a:link,
+.Logo a:visited{
+ color: #ffffff;
+}
+
+.Logo a:hover {
+ color: #c3e2fd;
+}
+
+/** Portlet title block **/
+.Caption
+{
+ background-image:url("images/title-3.0-bg_1x28.png");
+ background-repeat: repeat-x;
+ height: 28px
+ width: 100%;
+}
+
+.Figure {
+ background-image:url("images/title-3.0_200x28.png");
+ background-repeat: no-repeat;
+ text-align: left;
+ vertical-align: middle;
+ padding: 5px;
+}
+
/** 'portlet' block **/
.portlet {
margin: 0px 0px 10px 0px;
@@ -59,21 +107,18 @@
}
.portlet .title {
- white-space: nowrap;
- padding-left: 0.25em;
- background-color: #000000;
- color: #FFFFFF;
- font-weight: bold;
+ height: 28px;
}
.portlet .title h2 {
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+ float: left;
height: 18px;
line-height: 18px;
margin: 0px;
padding: 0px;
+ color: #FFFFFF;
font-size: 14px;
- float: none;
+ font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
font-weight: bold;
}
@@ -84,7 +129,6 @@
}
/** 'portlet' block: portlet mode and window state controls **/
-
.portlet .title span.minimized {
background: url(images/controls/min.png) no-repeat;
}
@@ -113,6 +157,6 @@
padding: 10px;
border-width: 0px 1px 1px 1px;
border-style: solid;
- border-color: #cccccc;
+ border-color: #769dc0;
}
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Mon Aug 1 10:07:02 2011
@@ -111,6 +111,8 @@ import org.slf4j.LoggerFactory;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+
+
/**
* @version $Rev:385659 $ $Date$
*/
Added: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/favicon.ico
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/favicon.ico?rev=1152724&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/favicon.ico
------------------------------------------------------------------------------
svn:mime-type = image/x-icon
Added: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/banner-3.0-bg_1x88.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/banner-3.0-bg_1x88.png?rev=1152724&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/banner-3.0-bg_1x88.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/banner-3.0_900x88.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/banner-3.0_900x88.png?rev=1152724&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/banner-3.0_900x88.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/table-head-really-dark-bg_1x24.png
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/table-head-really-dark-bg_1x24.png?rev=1152724&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/images/table-head-really-dark-bg_1x24.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp (original)
+++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp Mon Aug 1 10:07:02 2011
@@ -1,3 +1,5 @@
+<!doctype html>
+<%@ page language="java" contentType="text/html; charset=UTF-8" session="false" %>
<%--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,102 +17,89 @@
limitations under the License.
--%>
<!-- $Rev$ $Date$ -->
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<%@ page language="java"
- contentType="text/html; charset=UTF-8"
- session="false" %>
+
<html lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Apache Geronimo</title>
- <link rel="stylesheet" href="main.css" type="text/css"/>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Apache Geronimo</title>
+<link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>
+<link rel="stylesheet" href="main.css" type="text/css"/>
+<link rel="stylesheet" href="pluto.css" type="text/css"/>
</head>
-<body marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" rightmargin="0">
+<body style="margin:0px">
<!-- Header -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td>
- <table width="100%" height="86" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td height="86" class="WelcomeLogo" border="0"></td>
- <td height="86" class="Top" border="0"> </TD>
- </tr>
- <tr>
- <td algin="right" border="0"> </td>
- <td align="right" border="0"><b><%= application.getServerInfo() %> </b></td>
- </tr>
- </table>
- </td>
- </tr>
+<table class="Banner" cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="Logo" border="0">
+ Welcome using Geronimo! (<%=application.getServerInfo()%> integrated)
+ </td>
+ </tr>
</table>
-<br />
-
-<table>
+<table width="100%" border="0" cellspacing="0" cellpadding="10">
<tr>
-
<!-- Table of Contents -->
- <td valign="top">
- <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
+ <td valign="top" width="300px">
+
+ <table width="100%" class="DarkTableLine">
<tr>
- <td bgcolor="#5FA3D6" bordercolor="#000000" align="left" nowrap>
- <font face="Verdana" size="+1">Administration </font>
+ <td class="ReallyDarkBackground" nowrap>
+ Administration
</td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" bordercolor="#000000" nowrap>
- <a href="/console">Console</a><br />
-
+ <td class="MediumBackground" nowrap>
+ - <a href="/console">Console</a><br />
</td>
</tr>
</table>
<br />
- <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
+
+ <table width="100%" class="DarkTableLine">
<tr>
- <td bgcolor="#5FA3D6" bordercolor="#000000" align="left" nowrap>
- <font face="Verdana" size="+1">Documentation </font>
+ <td class="ReallyDarkBackground" nowrap>
+ Documentation
</td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" bordercolor="#000000" nowrap>
- <a href="http://geronimo.apache.org/redirects/faq.html">FAQ</a><br />
- <a href="http://geronimo.apache.org/redirects/wiki.html">Wiki</a><br />
- <a href="http://geronimo.apache.org/documentation.html">Geronimo Documentation</a><br />
- <a href="http://geronimo.apache.org/redirects/additionalDocumentation.html">Additional Documentation</a><br />
-
+ <td class="MediumBackground" nowrap>
+ - <a href="http://geronimo.apache.org/redirects/faq.html">FAQ</a><br />
+ - <a href="http://geronimo.apache.org/redirects/wiki.html">Wiki</a><br />
+ - <a href="http://geronimo.apache.org/documentation.html">Geronimo Documentation</a><br />
+ - <a href="http://geronimo.apache.org/redirects/additionalDocumentation.html">Additional Documentation</a><br />
</td>
</tr>
</table>
<br />
- <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
+
+ <table width="100%" class="DarkTableLine">
<tr>
- <td bgcolor="#5FA3D6" bordercolor="#000000" align="left" nowrap>
- <font face="Verdana" size="+1">Geronimo Online </font>
+ <td class="ReallyDarkBackground" nowrap>
+ Geronimo Online
</td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" bordercolor="#000000" nowrap>
- <a href="http://geronimo.apache.org/">The Geronimo Home Page</a><br />
- <a href="http://geronimo.apache.org/redirects/issues.html">Problem Tracking Database</a><br />
- <a href="http://geronimo.apache.org/redirects/userMailingList.html">Users Mailing List Archive</a><br />
- <a href="http://geronimo.apache.org/redirects/developerMailingList.html">Developers Mailing List Archive</a><br />
- <a href="irc://irc.freenode.net/#geronimo">Geronimo IRC chat</a><br />
-
+ <td class="MediumBackground" nowrap>
+ - <a href="http://geronimo.apache.org/">The Geronimo Home Page</a><br />
+ - <a href="http://geronimo.apache.org/redirects/issues.html">Problem Tracking Database</a><br />
+ - <a href="http://geronimo.apache.org/redirects/userMailingList.html">Users Mailing List Archive</a><br />
+ - <a href="http://geronimo.apache.org/redirects/developerMailingList.html">Developers Mailing List Archive</a><br />
+ - <a href="irc://irc.freenode.net/#geronimo">Geronimo IRC chat</a><br />
</td>
</tr>
</table>
-
<br />
- <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
+
+ <table width="100%" class="DarkTableLine">
<tr>
- <td bgcolor="#5FA3D6" bordercolor="#000000" align="left" nowrap>
- <font face="Verdana" size="+1">Geronimo Examples </font>
+ <td class="ReallyDarkBackground" nowrap>
+ Geronimo Examples
</td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" bordercolor="#000000" nowrap>
+ <td class="MediumBackground" nowrap>
<!--<a href="/servlets-examples/">Servlet Examples </a><br />-->
<!--<a href="/jsp-examples/">JSP Examples </a><br />-->
<!--<a href="/ldap-demo/">LDAP Demo</a><br />-->
@@ -118,9 +107,16 @@
</td>
</tr>
</table>
+
+ <br />
+ <br />
+ <img src="<%=request.getContextPath()%>/images/powered_by_100x30.gif" alt="Powered by Geronimo"/><br />
+ Copyright © 2003-2011 <br />
+ Apache Software Foundation <br />
+ All Rights Reserved <br />
+
</td>
- <td> </td>
<!-- Body -->
<td align="left" valign="top">
@@ -173,7 +169,7 @@ deploy.[bat|sh] deploy MyWebApp-1.0.war<
<li><b><a href="mailto:dev-subscribe@geronimo.apache.org">dev@geronimo.apache.org</a></b> for developers working on Geronimo</li>
</ul>
- <p>Thanks for using Geronimo!</p>
+
<%-- Needs to be updated if we want to keep using it
<div style="margin-left: 50px; margin-right: 50px; padding: 10px; background-color:#eee">
<p><b>Would you like a slimmer Geronimo installation?</b><br />
@@ -267,17 +263,8 @@ deploy.[bat|sh] deploy MyWebApp-1.0.war<
</div>
--%>
- <p align="right"><font size=-1>
- <img src="<%=request.getContextPath()%>/images/powered_by_100x30.gif" alt="Powered by Geronimo"/>
- </font><br />
-
- <font size=-1>Copyright © 2003-2010 Apache Software Foundation</font><br />
- <font size=-1>All Rights Reserved</font> <br />
- </p>
- <p align="right"> </p>
</td>
-
</tr>
</table>
Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/main.css
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/main.css?rev=1152724&r1=1152723&r2=1152724&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/main.css (original)
+++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/main.css Mon Aug 1 10:07:02 2011
@@ -14,512 +14,170 @@
* See the License for the specific language governing permissions and
* limitations under the License.
======================================================================*/
-body
-{
- /*background-color: #FFFFFF;*/
-}
-
-.BrightTitle
-{
- color: #FFFFFF;
- background-color: #5FA3D6;
- font-size: 11px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-}
-
-.BrightTitle a:hover
-{
- color: #5FA3D6;
-}
-
-.BrightBox
-{
- border: thin solid #5FA3D6;
-}
-
-td
-{
- font-size: 11px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-}
-
-th
-{
- font-size: 12px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-}
-
-a:link, a:visited
-{
- color: #204486;
-}
-
-a:hover
-{
- /*color: #5FA3D6;*/
- color: #CF820A;
-}
-
-.Logo
-{
- background-image:url("/images/head_left_754x86.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;
-}
-
-.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;
-}
-
-.WelcomeLogo
-{
- background-image:url("/images/welcome_head_570x86.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");
- background-repeat: repeat-x;
- height: 86px;
- font-size: 11px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- text-align: right;
- vertical-align: bottom;
- font-weight: bold;
-}
-
-.Top a:link, .Top a:visited, .Top a:hover
-{
- color: #FFFFFF;
- font-size: 11px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- text-decoration: underline;
- text-align: left;
- vertical-align: bottom;
- line-height: 30px;
- font-weight: bold;
-}
-
-.TopSpacer
-{
- height: 20px;
-}
-.Hidden
-{
- visibility: hidden;
- height: 0px;
- line-height: 0px;
- display: none;
-}
-
-.Menu .Selection
-{
- background-color: #F2F2F2;
- font-size: 12px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-}
-
-.Menu .Selection .CollapsedLeft
-{
- width: 12px;
- height: 12px;
- color: #000000;
- background-color: #F2F2F2;
-}
-
-.Menu .Selection .Indent
-{
- width: 2px;
- background-color: #F2F2F2;
-}
-
-.Menu .Selection .CollapsedRight
-{
- width: 8px;
- height: 12px;
- background-color: #F2F2F2;
-}
-
-.Menu .Selection .TopLeft
-{
- width: 8px;
- height: 16px;
- background-color: #F2F2F2;
-}
-
-.Menu .Selection .TopMiddle
-{
- color: #000000;
- text-decoration: none;
- background-color: #F2F2F2;
-}
-
-.Menu .Selection .TopMiddle a:link,
-.Menu .Selection .TopMiddle a:visited,
-{
- color: #000000;
- line-height: 20px;
- font-size: 12px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- background-color: #F2F2F2;
-}
-
-.Menu .Selection .TopMiddle a:hover
-{
- color: #5FA3D6;
+/** Dojo claro style Override : Start **/
+.claro .dijitLeaf {
+ display: none;
}
-.Menu .Selection .TopRight
-{
- width: 8px;
- height: 16px;
- background-color: #F2F2F2;
-}
-
-.Menu .Selection .Spacer
-{
- height: 5px;
-}
-
-.Menu .Hidden
-{
- visibility: hidden;
- height: 0px;
- display: none;
+.claro .dijitTreeNodeSelected {
+ font-size: 12px;
}
-.Menu .Subselection .Left
-{
- width: 12px;
- background-color: #F2F2F2;
-}
-
-.Menu .Subselection .Indent
-{
- width: 2px;
- background-color: #F2F2F2;
-}
-
-.Menu .Subselection .Middle
-{
- font-size: 12px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- background-color: #F2F2F2;
- color:#000000;
-}
-
-.Menu .Subselection .Middle a:link,
-.Menu .Subselection .Middle a:visited,
-{
- line-height: 20px;
- color: #000000;
+.claro .dijitTreeLabel {
+ font-size: 12px;
}
+/** Dojo claro style Override : End **/
-.Menu .Subselection .Middle a:hover
+body
{
- color: #5FA3D6;
+ font-size: 12px;
+ font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
}
-.Menu .Subselection .Right
-{
- width: 8px;
- background-color: #F2F2F2;
-}
-
-.Menu .Subselection .BottomLeft
-{
- width: 8px;
- height: 8px;
- background-color: #F2F2F2;
-}
-
-.Menu .Subselection .BottomMiddle
-{
- height: 8px;
- background-color: #F2F2F2;
-}
-
-.Menu .Subselection .BottomRight
-{
- width: 8px;
- height: 8px;
- background-color: #F2F2F2;
-}
-
-.Gutter
-{
- width: 5px;
-}
-
-.Content .TopLeft
-{
- width: 18px;
- height: 18px;
- line-height: 18px;
- background-color: #000000;
-}
-
-.Content .Title
+td
{
- font-size: 12px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- background-color: #000000;
- color: #FFFFFF;
- height: 18px;
- line-height: 18px;
+ font-size: 12px;
+ font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
}
-.Content .Title a:link, .Content .Title a:hover, .Content .Title a:visited
-{
- font-size: 12px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- background-color: #000000;
- color: #FFFFFF;
- height: 18px;
- line-height: 18px;
+a:link,
+a:visited {
+ color: #204486;
}
-.Content .Title .Indent
-{
- width: 20px;
+a:hover {
+ color: #CF820A;
}
-.Content .TopRight
-{
- width: 18px;
- height: 18px;
- background-color:#000000;
-}
-.Content .CollapsedLeft
-{
- width: 18px;
- height: 18px;
- background-color:#000000;
+.Hidden {
+ visibility: hidden;
+ height: 0px;
+ line-height: 0px;
+ display: none;
}
-.Content .CollapsedRight
-{
- width: 18px;
- height: 18px;
- background-color:#000000;
+.Selection {
+ font-size: 12px;
+ font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
}
-.Content .Left
-{
- width: 18px;
- background-color: #FFFFFF;
+.InputField {
+ width: 150px;
}
-.Content .Body, .Content .Body td
-{
- font-size: 12px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- background-color: #FFFFFF;
- color: #1E1E52;
+.TableLine {
+ border-style: solid;
+ border-width: 1px;
+ border-color: #c3e2fd;
+ background-color: #FFFFFF;
}
-.Content .Body strong
-{
- font-weight: bold;
- font-size: 12px;
+.DarkTableLine {
+ border-style: solid;
+ border-width: 1px;
+ border-color: #769dc0;
+ background-color: #FFFFFF;
}
-.Content .Body th
-{
- font-weight: bold;
- font-size: 12px;
+.BlankTableLine {
+ border: 0px;
+ padding: 0;
}
-.Content .Body .LightBackground
+.LightBackground
{
- background-color: #FFFFFF;
- color:#000000;
+ background-color: #FFFFFF;
+ padding: 1px;
+ color:#000000;
}
-.Content .Body .LightBackground .InputField
+.MediumBackground
{
- width: 150px;
+ background-color: #F2F2F2;
+ padding: 1px;
+ color:#000000;
}
-.Content .Body .MediumBackground
+.DarkBackground,
+.DarkBackground a:link,
+.DarkBackground a:visited,
+.DarkBackground a:hover
{
- background-color: #F2F2F2;
- color:#000000;
+ background-image:url("images/table-head-dark-bg_1x24.png");
+ background-repeat: repeat-x;
+
+ padding: 3px;
+ line-height: 18px;
+ color: #204486;
+ font-size: 12px;
+ font-weight: bold;
+ font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
}
-.Content .Body .DarkBackground,
-.Content .Body .DarkBackground a:link,
-.Content .Body .DarkBackground a:visited,
-.Content .Body .DarkBackground a:hover
+.DarkBackground th
{
- background-color: #2581C7;
- color:#FFFFFF;
- font-size: 15px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+ padding: 3px;
+ line-height: 18px;
+ color: #204486;
+ font-size: 12px;
+ font-weight: bold;
+ font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
}
-.Content .Body .reallyDarkBackground,
-.Content .ReallyDarkBackground,
.ReallyDarkBackground
{
- color: #FFFFFF;
- background-color: #000000;
- font-size: 15px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+ background-image:url("images/table-head-really-dark-bg_1x24.png");
+ background-repeat: repeat-x;
+
+ padding: 3px;
+ line-height: 18px;
+ color: #FFFFFF;
+ font-size: 14px;
+ font-weight: bold;
+ font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+}
+
+.ReallyDarkBackground th
+{
+ padding: 3px;
+ line-height: 18px;
+ color: #FFFFFF;
+ font-size: 14px;
+ font-weight: bold;
+ font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+}
+
+/** Accessbility : Start **/
+.access
+{
+ display: none;
+ position: absolute;
+ left: -3000px;
+ width: 500px;
+}
+
+.skip a {
+ position: absolute;
+ overflow: hidden;
+ width: 0px;
+ height: 0px;
+}
+
+.skip a:active, .skip a:focus {
+ position: absolute;
+ overflow: visible;
+ width: 135px;
+ height: auto;
+ background-color: #FFFFFF;
+ color: #000000;
+ top: 75px;
+ left: 5px;
+ z-index:1000;
+ padding: 5px;
+ border: 2px solid #000000;
+ font-weight: bold;
}
-.Content .Body .IndentedTitle
-{
- background-color: #919FBC;
- color:#FFFFFF;
-}
-
-.Content .Body .LightIndentedBG
-{
- background-color: #FFFFFF;
- color:#000000;
-}
-
-.Content .Body .MediumIndentedBG
-{
- background-color: #DDDDDD;
- color:#000000;
-}
-
-
-.Content .Body a:link,
-.Content .Body a:visited,
-{
- font-size: 10px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- text-decoration: underline;
- color: #546BC7;
- font-weight: bold;
-}
-
-.Content .Body a:hover
-{
- color: #5FA3D6;
-}
-
-.Content .Buttons {
- border-top-width: thin;
- border-right-width: thin;
- border-bottom-width: thin;
- border-left-width: thin;
- border-top-style: solid;
- border-right-style: solid;
- border-bottom-style: solid;
- border-left-style: solid;
- border-top-color: #7B7BAE;
- border-right-color: #7B7BAE;
- border-bottom-color: #141336;
- border-left-color: #141336;
- background-color: #23224C;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- font-size: 12px;
- text-decoration: underline;
- color: #5FA3D6;
-}
-
-.Content .Right
-{
- width: 18px;
- background-color: #FFFFFF;
-}
-
-.Content .BottomLeft
-{
- width: 18px;
- height: 12px;
- line-height: 12px;
- background-color:#333366;
-}
-
-.Content .Footer
-{
- line-height: 12px;
- height: 12px;
- font-size: 9px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- background-color:#333366;
- color:#000000;
-}
-
-.Content .Footer a:link,
-.Content .Footer a:visited,
-.Content .Footer a:hover
-{
- color: #5FA3D6;
-}
-
-.Content .BottomRight
-{
- width: 18px;
- line-height: 12px;
- height: 12px;
- background-color:#333366;
-}
-
-.Content .Spacer
-{
- height: 10px;
-}
-
-.BottomSpacer
-{
-}
-
-.Footer
-{
- font-size: 9px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- height: 20px;
- background-color: #5FA3D6;
-}
-
-.Footer a:link,
-.Footer a:visited,
-.Footer a:hover
-{
- color: #5FA3D6;
- text-decoration: underline;
-}
-
-.Box
-{
- border: thin solid #000000;
-}
-
-.TableLine {
- border-style: solid;
- border-width: 1px;
-}
+/** Accessbility : End **/
\ No newline at end of file
Added: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/pluto.css
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/pluto.css?rev=1152724&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/pluto.css (added)
+++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/pluto.css Mon Aug 1 10:07:02 2011
@@ -0,0 +1,162 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+/** Layout definition **/
+#headerDiv {
+ width:100%;
+ height:88px;
+}
+
+#navigationDiv {
+ width:300px;
+ /*height need calculate*/
+ float:left;
+ background-color:#f0f0f0
+}
+
+#panelDiv {
+ height: 60px;
+ padding-left: 4px;
+ padding-right: 4px;
+ font-family: Verdana,Tahoma,Arial,Helvetica,sans-serif;
+ font-size: 12px;
+}
+
+#treeDiv {
+ /*height need calculate*/
+ padding-left: 4px;
+ padding-right: 4px;
+ overflow-y: auto;
+ overflow-x: hidden;
+ font-size: 12px;
+}
+
+#contentDiv {
+ /*width need calculate*/
+ /*height need calculate*/
+ float:left;
+}
+
+
+/** Banner block **/
+.Banner
+{
+ background-image:url("images/banner-3.0-bg_1x88.png");
+ background-repeat: repeat-x;
+ height: 88px; /* need keep same with #HeaderDiv */
+ width: 100%;
+}
+
+.Logo
+{
+ background-image:url("images/banner-3.0_900x88.png");
+ background-repeat: no-repeat;
+ text-align: right;
+ vertical-align: top;
+ padding: 5px;
+ padding-right: 15px;
+ color: #FFFFFF;
+ font-size: 12px;
+ font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+}
+
+.Logo a:link,
+.Logo a:visited{
+ color: #ffffff;
+}
+
+.Logo a:hover {
+ color: #c3e2fd;
+}
+
+/** Portlet title block **/
+.Caption
+{
+ background-image:url("images/title-3.0-bg_1x28.png");
+ background-repeat: repeat-x;
+ height: 28px
+ width: 100%;
+}
+
+.Figure {
+ background-image:url("images/title-3.0_200x28.png");
+ background-repeat: no-repeat;
+ text-align: left;
+ vertical-align: middle;
+ padding: 5px;
+}
+
+/** 'portlet' block **/
+.portlet {
+ margin: 0px 0px 10px 0px;
+ padding: 0px;
+}
+
+.portlet .title {
+ height: 28px;
+}
+
+.portlet .title h2 {
+ float: left;
+ height: 18px;
+ line-height: 18px;
+ margin: 0px;
+ padding: 0px;
+ color: #FFFFFF;
+ font-size: 14px;
+ font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+ font-weight: bold;
+}
+
+.portlet .title span {
+ width: 16px;
+ height: 16px;
+ float: right;
+}
+
+/** 'portlet' block: portlet mode and window state controls **/
+.portlet .title span.minimized {
+ background: url(images/controls/min.png) no-repeat;
+}
+
+.portlet .title span.maximized {
+ background: url(images/controls/max.png) no-repeat;
+}
+
+.portlet .title span.normal {
+ background: url(images/controls/norm.png) no-repeat;
+}
+
+.portlet .title span.view {
+ background: url(images/controls/view.png) no-repeat;
+}
+
+.portlet .title span.edit {
+ background: url(images/controls/edit.png) no-repeat;
+}
+
+.portlet .title span.help {
+ background: url(images/controls/help.png) no-repeat;
+}
+
+.portlet .body {
+ padding: 10px;
+ border-width: 0px 1px 1px 1px;
+ border-style: solid;
+ border-color: #769dc0;
+}
+
Propchange: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/pluto.css
------------------------------------------------------------------------------
svn:eol-style = native