geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r476484 - in /geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view: infomanager/ keystore/
Date Sat, 18 Nov 2006 09:59:05 GMT
Author: vamsic007
Date: Sat Nov 18 01:59:04 2006
New Revision: 476484

URL: http://svn.apache.org/viewvc?view=rev&rev=476484
Log:
GERONIMO-1396 Provide consistent look and feel for table views in the web console across all
portlets: Taking care of a few pages missed earlier.

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/confirmCertificate.jsp
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/index.jsp
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?view=diff&rev=476484&r1=476483&r2=476484
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
Sat Nov 18 01:59:04 2006
@@ -35,12 +35,12 @@
     <td class="LightBackground" width="80%">${svrProps['Geronimo Version']}</td>
   </tr>
   <tr>
-    <td class="LightBackground" width="20%" nowrap>Geronimo Start Time</td>
-    <td class="LightBackground" width="80%">${svrProps['Kernel Boot Time']}</td>
+    <td class="MediumBackground" width="20%" nowrap>Geronimo Start Time</td>
+    <td class="MediumBackground" width="80%">${svrProps['Kernel Boot Time']}</td>
   </tr>
   <tr>
-    <td class="MediumBackground">Geronimo Up Time</td>
-    <td class="MediumBackground"><div id="<portlet:namespace/>UpTime">Not
Yet Available</div></td>
+    <td class="LightBackground">Geronimo Up Time</td>
+    <td class="LightBackground"><div id="<portlet:namespace/>UpTime">Not
Yet Available</div></td>
   </tr>
 </table>
 <br>

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp?view=diff&rev=476484&r1=476483&r2=476484
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp
Sat Nov 18 01:59:04 2006
@@ -18,13 +18,13 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 <table>
-<th>keystore</th>
-<th>alias</th>
-<th>type</th>
-<tr>
-<td>${id}</td>
-<td>${alias}</td>
-<td>${type}</td>
+<th class="DarkBackground">keystore</th>
+<th class="DarkBackground">alias</th>
+<th class="DarkBackground">type</th>
+<tr>
+<td class="LightBackground">${id}</td>
+<td class="LightBackground">${alias}</td>
+<td class="LightBackground">${type}</td>
 </tr>
 </table>
 <br/>
@@ -61,52 +61,69 @@
 </table>
 <br/>
 
+<c:set var="backgroundClass" value='LightBackground'/>
 <c:forEach items="${certs}" var="cert">
 <table>
-<th>Certificate Info</th>
+<th class="DarkBackground" colspan="2" align="left">Certificate Info</th>
 <tr>
-<td>Version:</td>
-<td><c:out value="${cert.version}"/></td>
+<td class="LightBackground">Version:</td>
+<td class="LightBackground"><c:out value="${cert.version}"/></td>
 </tr>
 <tr>
-<td>Subject:</td>
-<td><c:out value="${cert.subjectDN.name}"/></td>
+<td class="MediumBackground">Subject:</td>
+<td class="MediumBackground"><c:out value="${cert.subjectDN.name}"/></td>
 </tr>
 <tr>
-<td>Issuer:</td>
-<td><c:out value="${cert.issuerDN.name}"/></td>
+<td class="LightBackground">Issuer:</td>
+<td class="LightBackground"><c:out value="${cert.issuerDN.name}"/></td>
 </tr>
 <tr>
-<td>Serial Number:</td>
-<td><c:out value="${cert.serialNumber}"/></td>
+<td class="MediumBackground">Serial Number:</td>
+<td class="MediumBackground"><c:out value="${cert.serialNumber}"/></td>
 </tr>
 <tr>
-<td>Valid From:</td>
-<td><c:out value="${cert.notBefore}"/></td>
+<td class="LightBackground">Valid From:</td>
+<td class="LightBackground"><c:out value="${cert.notBefore}"/></td>
 </tr>
 <tr>
-<td>Valid To:</td>
-<td><c:out value="${cert.notAfter}"/></td>
+<td class="MediumBackground">Valid To:</td>
+<td class="MediumBackground"><c:out value="${cert.notAfter}"/></td>
 </tr>
 <tr>
-<td>Signature Alg:</td>
-<td><c:out value="${cert.sigAlgName}"/></td>
+<td class="LightBackground">Signature Alg:</td>
+<td class="LightBackground"><c:out value="${cert.sigAlgName}"/></td>
 </tr>
 <tr>
-<td>Public Key Alg:</td>
-<td><c:out value="${cert.publicKey.algorithm}"/></td>
+<td class="MediumBackground">Public Key Alg:</td>
+<td class="MediumBackground"><c:out value="${cert.publicKey.algorithm}"/></td>
 </tr>
-<tr>
+<c:set var="backgroundClass" value='MediumBackground'/> <!-- This should be set
from the row above. -->
 <c:forEach items="${cert.criticalExtensionOIDs}" var="extoid">
+<c:choose>
+    <c:when test="${backgroundClass == 'MediumBackground'}" >
+        <c:set var="backgroundClass" value='LightBackground'/>
+    </c:when>
+    <c:otherwise>
+        <c:set var="backgroundClass" value='MediumBackground'/>
+    </c:otherwise>
+</c:choose>
 <tr>
-<td>critical ext: </td>
-<td><c:out value="${extoid}"/></td>
+<td class="${backgroundClass}">critical ext: </td>
+<td class="${backgroundClass}"><c:out value="${extoid}"/></td>
 </tr>
 </c:forEach>
 <c:forEach items="${cert.nonCriticalExtensionOIDs}" var="extoid">
+<c:choose>
+    <c:when test="${backgroundClass == 'MediumBackground'}" >
+        <c:set var="backgroundClass" value='LightBackground'/>
+    </c:when>
+    <c:otherwise>
+        <c:set var="backgroundClass" value='MediumBackground'/>
+    </c:otherwise>
+</c:choose>
 <tr>
-<td>non-critical ext: </td>
-<td><c:out value="${extoid}"/></td>
+<td class="${backgroundClass}">non-critical ext: </td>
+<td class="${backgroundClass}"><c:out value="${extoid}"/></td>
 </tr>
 </c:forEach>
 </table>

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/confirmCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/confirmCertificate.jsp?view=diff&rev=476484&r1=476483&r2=476484
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/confirmCertificate.jsp
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/confirmCertificate.jsp
Sat Nov 18 01:59:04 2006
@@ -29,24 +29,27 @@
 
     <table border="0">
         <tr>
-            <th align="right">Fingerprint:</th>
-            <td>${fingerprint}</td>
+            <th class="DarkBackground" colspan="2" align="left">Certificate Details</th>
         </tr>
         <tr>
-            <th align="right">Subject:</th>
-            <td>${subject}</td>
+            <th class="LightBackground" align="right">Fingerprint:</th>
+            <td class="LightBackground">${fingerprint}</td>
         </tr>
         <tr>
-            <th align="right">Issuer:</th>
-            <td>${issuer}</td>
+            <th class="MediumBackground" align="right">Subject:</th>
+            <td class="MediumBackground">${subject}</td>
         </tr>
         <tr>
-            <th align="right">Validity:</th>
-            <td>${validStart} to ${validEnd}</td>
+            <th class="LightBackground" align="right">Issuer:</th>
+            <td class="LightBackground">${issuer}</td>
         </tr>
         <tr>
-            <th align="right">Serial Number:</th>
-            <td>${serial}</td>
+            <th class="MediumBackground" align="right">Validity:</th>
+            <td class="MediumBackground">${validStart} to ${validEnd}</td>
+        </tr>
+        <tr>
+            <th class="LightBackground" align="right">Serial Number:</th>
+            <td class="LightBackground">${serial}</td>
         </tr>
     </table>
 

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/index.jsp?view=diff&rev=476484&r1=476483&r2=476484
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/index.jsp
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/index.jsp
Sat Nov 18 01:59:04 2006
@@ -40,9 +40,18 @@
     <td class="DarkBackground" align="center">Editable</td>
     <td class="DarkBackground" align="center">Available</td>
   </tr>
+<c:set var="backgroundClass" value='MediumBackground'/>
 <c:forEach var="keystore" items="${keystores}">
+  <c:choose>
+      <c:when test="${backgroundClass == 'MediumBackground'}" >
+          <c:set var="backgroundClass" value='LightBackground'/>
+      </c:when>
+      <c:otherwise>
+          <c:set var="backgroundClass" value='MediumBackground'/>
+      </c:otherwise>
+  </c:choose>
   <tr>
-    <td>
+    <td class="${backgroundClass}">
       <c:choose>
         <c:when test="${keystore.lockedEdit}">
           ${keystore.name}
@@ -52,7 +61,7 @@
         </c:otherwise>
       </c:choose>
     </td>
-    <td>
+    <td class="${backgroundClass}">
         <c:choose>
           <c:when test="${keystore.lockedEdit}">
               <i>Keystore locked</i>
@@ -64,7 +73,7 @@
           </c:otherwise>
         </c:choose>
     </td>
-    <td>
+    <td class="${backgroundClass}">
       <c:choose>
         <c:when test="${keystore.lockedEdit}">
           <a href="<portlet:actionURL portletMode="view">
@@ -80,7 +89,7 @@
         </c:otherwise>
       </c:choose>
     </td>
-    <td>
+    <td class="${backgroundClass}">
       <c:choose>
         <c:when test="${keystore.lockedUse}">
           <a href="<portlet:actionURL portletMode="view">

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp?view=diff&rev=476484&r1=476483&r2=476484
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp
Sat Nov 18 01:59:04 2006
@@ -27,44 +27,61 @@
     <td class="DarkBackground" align="center">Type</td>
     <td class="DarkBackground" align="center">Certificate Fingerprint</td>
   </tr>
+<c:set var="backgroundClass" value='MediumBackground'/>
 <c:forEach var="alias" items="${keystore.certificates}">
+  <c:choose>
+      <c:when test="${backgroundClass == 'MediumBackground'}" >
+          <c:set var="backgroundClass" value='LightBackground'/>
+      </c:when>
+      <c:otherwise>
+          <c:set var="backgroundClass" value='MediumBackground'/>
+      </c:otherwise>
+  </c:choose>
   <tr>
-    <td><a href="<portlet:actionURL portletMode="view">
+    <td class="${backgroundClass}"><a href="<portlet:actionURL portletMode="view">
                  <portlet:param name="mode" value="certificateDetails-before" />
                  <portlet:param name="id" value="${keystore.name}" />
                  <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
         view
         </a>    
     </td>
-    <td><a href="<portlet:actionURL portletMode="view">
+    <td class="${backgroundClass}"><a href="<portlet:actionURL portletMode="view">
                  <portlet:param name="mode" value="certificateDetails-before" />
                  <portlet:param name="id" value="${keystore.name}" />
                  <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
         ${alias}
         </a>    
     </td>
-    <td>Trusted Certificate</td>
-    <td>${keystore.fingerprints[alias]}</td>
+    <td class="${backgroundClass}">Trusted Certificate</td>
+    <td class="${backgroundClass}">${keystore.fingerprints[alias]}</td>
   </tr>
 </c:forEach>
 <c:forEach var="alias" items="${keystore.keys}">
+  <c:choose>
+      <c:when test="${backgroundClass == 'MediumBackground'}" >
+          <c:set var="backgroundClass" value='LightBackground'/>
+      </c:when>
+      <c:otherwise>
+          <c:set var="backgroundClass" value='MediumBackground'/>
+      </c:otherwise>
+  </c:choose>
   <tr>
-    <td><a href="<portlet:actionURL portletMode="view">
+    <td class="${backgroundClass}"><a href="<portlet:actionURL portletMode="view">
                  <portlet:param name="mode" value="certificateDetails-before" />
                  <portlet:param name="id" value="${keystore.name}" />
                  <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
         view
         </a>    
     </td>
-    <td><a href="<portlet:actionURL portletMode="view">
+    <td class="${backgroundClass}"><a href="<portlet:actionURL portletMode="view">
                  <portlet:param name="mode" value="certificateDetails-before" />
                  <portlet:param name="id" value="${keystore.name}" />
                  <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
         ${alias}
         </a>    
     </td>
-    <td>Private Key</td>
-    <td>${keystore.fingerprints[alias]}</td>
+    <td class="${backgroundClass}">Private Key</td>
+    <td class="${backgroundClass}">${keystore.fingerprints[alias]}</td>
   </tr>
 </c:forEach>
 </table>



Mime
View raw message