You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/06/05 23:42:32 UTC
svn commit: r663749 - in /geronimo/server/trunk/plugins/console/console-base-portlets/src/main: resources/consolebase.properties webapp/WEB-INF/view/ca/confirmCertReq.jsp webapp/WEB-INF/view/ca/index.jsp

Author: gawor
Date: Thu Jun  5 14:42:32 2008
New Revision: 663749

URL: http://svn.apache.org/viewvc?rev=663749&view=rev
Log:
CA portlet updates

Modified:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=663749&r1=663748&r2=663749&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties Thu Jun  5 14:42:32 2008
@@ -176,7 +176,7 @@
 consolebase.common.next            = Next
 consolebase.common.password        = Password
 consolebase.common.refresh         = Refresh
-consolebase.common.reset           = Resets
+consolebase.common.reset           = Reset
 consolebase.common.restart         = Restart
 consolebase.common.return          = Return
 consolebase.common.save            = Save

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp?rev=663749&r1=663748&r2=663749&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp Thu Jun  5 14:42:32 2008
@@ -19,7 +19,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-<b><fmt:message key="ca.confirmCertReq.confirmCertRequest"/>Confirm Certificate Request</b>
+<b><fmt:message key="ca.confirmCertReq.confirmCertRequest"/></b>
 
 <p><fmt:message key="ca.confirmCertReq.summary"/></p>
 
@@ -46,8 +46,8 @@
         </tr>
         <tr><td>&nbsp;</td></tr>
     </table>
-    <input type="submit" name="approve" value='<fmt:message key="ca.common.publicKey"/>'/>
-    <input type="submit" name="reject" value='<fmt:message key="ca.common.publicKey"/>'>
+    <input type="submit" name="approve" value='<fmt:message key="ca.confirmCertReq.approveCSR"/>'/>
+    <input type="submit" name="reject" value='<fmt:message key="ca.confirmCertReq.rejectCSR"/>'>
 </form>
 
 <p><a href="<portlet:actionURL portletMode="view">

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp?rev=663749&r1=663748&r2=663749&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp Thu Jun  5 14:42:32 2008
@@ -46,7 +46,7 @@
     <p><fmt:message key="ca.index.CAInitialized"/>
     <c:choose>
       <c:when test="${caLocked}">
-        <fmt:message key="ca.index.CALocked"/>
+        &nbsp;<fmt:message key="ca.index.CALocked"/>
         <table border="0">
         <tr>
           <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="unlockCA-before" /></portlet:actionURL>">
@@ -56,30 +56,19 @@
         </table>
       </c:when>
       <c:otherwise>
-      <fmt:message key="ca.index.CAFunctionsAccessed"/>        
+      &nbsp;<fmt:message key="ca.index.CAFunctionsAccessed"/>        
         <table border="0">
         <tr>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="lock" value="lock" /></portlet:actionURL>">
-           <fmt:message key="ca.common.lockCA"/>
-           </a> &nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="caDetails-before" /></portlet:actionURL>">
-          <fmt:message key="ca.common.viewCADetails"/>
-          </a> &nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="publish" value="publish" /></portlet:actionURL>">
-          <fmt:message key="ca.index.publishCACert"/>
-          </a> &nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="lock" value="lock" /></portlet:actionURL>"><fmt:message key="ca.common.lockCA"/></a>&nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="caDetails-before" /></portlet:actionURL>"><fmt:message key="ca.common.viewCADetails"/></a>&nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="publish" value="publish" /></portlet:actionURL>"><fmt:message key="ca.index.publishCACert"/></a>&nbsp;</td>
           <td>&nbsp;</td>
         </tr>
         <tr>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsVerify-before" /></portlet:actionURL>">
-          <fmt:message key="ca.index.requestsToBeVerified"/></a>&nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsIssue-before" /></portlet:actionURL>">
-          <fmt:message key="ca.index.requestsToBeFulfilled"/></a>&nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="processCSR-before" /></portlet:actionURL>">
-          <fmt:message key="ca.common.issueNewCert"/></a> &nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="viewCert-before" /></portlet:actionURL>">
-          <fmt:message key="ca.common.viewIssuedCert"/>
-          </a> &nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsVerify-before" /></portlet:actionURL>"><fmt:message key="ca.index.requestsToBeVerified"/></a>&nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsIssue-before" /></portlet:actionURL>"><fmt:message key="ca.index.requestsToBeFulfilled"/></a>&nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="processCSR-before" /></portlet:actionURL>"><fmt:message key="ca.common.issueNewCert"/></a>&nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="viewCert-before" /></portlet:actionURL>"><fmt:message key="ca.common.viewIssuedCert"/></a>&nbsp;</td>
         </tr>
         </table>
       </c:otherwise>