You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2005/12/22 22:20:14 UTC
svn commit: r358632 - in /maven/continuum/trunk/continuum-webapp/src/main:
resources/localization/ webapp/
Author: evenisse
Date: Thu Dec 22 13:20:03 2005
New Revision: 358632
URL: http://svn.apache.org/viewcvs?rev=358632&view=rev
Log:
o Add more i18n in jsp
o Fix some style in html
Modified:
maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
maven/continuum/trunk/continuum-webapp/src/main/webapp/about.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=358632&r1=358631&r2=358632&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Thu Dec 22 13:20:03 2005
@@ -8,6 +8,9 @@
disabled = Disabled
cancel = Cancel
submit = Submit
+edit = Edit
+delete = Delete
+save = Save
// ----------------------------------------------------------------------
// Page: Top
@@ -32,7 +35,8 @@
// ----------------------------------------------------------------------
about.page.title = Continuum - About
about.section.title = About Continuum
-about.version = Version : ${project.version}
+about.version.label = Version
+about.version.number = ${project.version}
// ----------------------------------------------------------------------
// Page: Login
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/about.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/about.jsp?rev=358632&r1=358631&r2=358632&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/about.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/about.jsp Thu Dec 22 13:20:03 2005
@@ -7,9 +7,14 @@
<body>
<div id="axial" class="h3">
<h3><ww:text name="about.section.title"/></h3>
- <p>
- <ww:text name="about.version"/>
- </p>
+ <div class="axial">
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <tr class="b">
+ <th><ww:text name="about.version.label"/></th>
+ <td><ww:text name="about.version.number"/></td>
+ </tr>
+ </table>
+ </div>
</div>
</body>
</ww:i18n>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp?rev=358632&r1=358631&r2=358632&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp Thu Dec 22 13:20:03 2005
@@ -5,41 +5,41 @@
<title><ww:text name="add.m1.project.page.title"/></title>
</head>
<body>
-<div class="app">
- <div id="axial" class="h3">
- <h3><ww:text name="add.m1.project.section.title"/></h3>
- <ww:form method="post" action="addMavenOneProject.action" name="addMavenOneProject" enctype="multipart/form-data">
- <div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
- <tr>
- <th><ww:text name="add.m1.project.m1PomUrl.label"/> </th>
- <td>
- <input type="text" name="m1PomUrl" value="" size="100"/>
- <p><ww:text name="add.m1.project.m1PomUrl.message"/></p>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <strong>OR</strong>
- </td>
- </tr>
- <tr>
- <th><ww:text name="add.m1.project.m1PomFile.label"/></th>
- <td >
- <ww:file name="m1PomFile" value="" size="100"/>
- <p><ww:text name="add.m1.project.m1PomFile.message"/></p>
- </td>
- </tr>
- </table>
- <div class="functnbar3">
- <input type="submit" value="<ww:text name="delete.submit"/>"/>
- <input type="button" name="Cancel" value="<ww:text name="cancel"/>" onClick="history.back()"/>
+ <div class="app">
+ <div id="axial" class="h3">
+ <h3><ww:text name="add.m1.project.section.title"/></h3>
+ <div class="axial">
+ <ww:form method="post" action="addMavenOneProject.action" name="addMavenOneProject" enctype="multipart/form-data">
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <tr class="b">
+ <th><ww:text name="add.m1.project.m1PomUrl.label"/> </th>
+ <td>
+ <input type="text" name="m1PomUrl" value="" size="100"/>
+ <p><ww:text name="add.m1.project.m1PomUrl.message"/></p>
+ </td>
+ </tr>
+ <tr class="b">
+ <th> </th>
+ <td>
+ <strong>OR</strong>
+ </td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="add.m1.project.m1PomFile.label"/></th>
+ <td >
+ <input type="file" name="m1PomFile" value="" size="100"/>
+ <p><ww:text name="add.m1.project.m1PomFile.message"/></p>
+ </td>
+ </tr>
+ </table>
+ <div class="functnbar3">
+ <input type="submit" value="<ww:text name="delete.submit"/>"/>
+ <input type="button" name="Cancel" value="<ww:text name="cancel"/>" onClick="history.back()"/>
+ </div>
+ </ww:form>
+ </div>
+ </div>
</div>
- </div>
- </ww:form>
- </div>
-</div>
</body>
</html>
</ww:i18n>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp?rev=358632&r1=358631&r2=358632&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp Thu Dec 22 13:20:03 2005
@@ -5,41 +5,41 @@
<title><ww:text name="add.m2.project.page.title"/></title>
</head>
<body>
-<div class="app">
- <div id="axial" class="h3">
- <h3><ww:text name="add.m2.project.section.title"/></h3>
- <ww:form method="post" action="addMavenTwoProject.action" name="addMavenTwoProject" enctype="multipart/form-data">
- <div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
- <tr>
- <th><ww:text name="add.m2.project.m2PomUrl.label"/></th>
- <td >
- <input type="text" name="m2PomUrl" value="" size="100"/>
- <p><ww:text name="add.m2.project.m2PomUrl.message"/></p>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <strong>OR</strong>
- </td>
- </tr>
- <tr>
- <th><ww:text name="add.m2.project.m2PomFile.label"/></th>
- <td >
- <ww:file name="m2PomFile" value="" size="100"/>
- <p><ww:text name="add.m2.project.m2PomFile.message"/></p>
- </td>
- </tr>
- </table>
- <div class="functnbar3">
- <input type="submit" value="<ww:text name="delete.submit"/>"/>
- <input type="button" name="Cancel" value="<ww:text name="cancel"/>" onClick="history.back()"/>
+ <div class="app">
+ <div id="axial" class="h3">
+ <h3><ww:text name="add.m2.project.section.title"/></h3>
+ <div class="axial">
+ <ww:form method="post" action="addMavenTwoProject.action" name="addMavenTwoProject" enctype="multipart/form-data">
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <tr class="b">
+ <th><ww:text name="add.m2.project.m2PomUrl.label"/></th>
+ <td >
+ <input type="text" name="m2PomUrl" value="" size="100"/>
+ <p><ww:text name="add.m2.project.m2PomUrl.message"/></p>
+ </td>
+ </tr>
+ <tr class="b">
+ <th> </th>
+ <td>
+ <strong>OR</strong>
+ </td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="add.m2.project.m2PomFile.label"/></th>
+ <td >
+ <input type="file" name="m2PomFile" value="" size="100"/>
+ <p><ww:text name="add.m2.project.m2PomFile.message"/></p>
+ </td>
+ </tr>
+ </table>
+ <div class="functnbar3">
+ <input type="submit" value="<ww:text name="delete.submit"/>"/>
+ <input type="button" name="Cancel" value="<ww:text name="cancel"/>" onClick="history.back()"/>
+ </div>
+ </ww:form>
+ </div>
+ </div>
</div>
- </div>
- </ww:form>
- </div>
-</div>
</body>
</html>
</ww:i18n>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp?rev=358632&r1=358631&r2=358632&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp Thu Dec 22 13:20:03 2005
@@ -12,72 +12,71 @@
</title>
</head>
<body>
-
-<div class="app">
- <div id="axial" class="h3">
- <h3>
- <ww:if test="projectType == \"shell\"">
- <ww:text name="add.shell.project.section.title"/>
- </ww:if>
- <ww:else>
- <ww:text name="add.ant.project.section.title"/>
- </ww:else>
- </h3>
- <ww:form method="post" action="addProject.action">
- <input type="hidden" name="projectType" value="<ww:property value="projectType"/>">
- <div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
- <tr>
- <th><ww:text name="projectName.label"/></th>
- <td >
- <input type="text" name="projectName" value="" size="100"/>
- <p><ww:text name="projectName.message"/></p>
- </td>
- </tr>
- <tr>
- <th><ww:text name="projectVersion.label"/></th>
- <td >
- <input type="text" name="projectVersion" value="" size="100"/>
- <p><ww:text name="projectVersion.message"/></p>
- </td>
- </tr>
- <tr>
- <th><ww:text name="projectScmUrl.label"/></th>
- <td >
- <input type="text" name="projectScmUrl" value="" size="100"/>
- <p><ww:text name="projectScmUrl.message"/></p>
- </td>
- </tr>
- <tr>
- <th><ww:text name="projectScmUsername.label"/></th>
- <td >
- <input type="text" name="projectScmUsername" value="" size="100"/>
- <p><ww:text name="projectScmUsername.message"/></p>
- </td>
- </tr>
- <tr>
- <th><ww:text name="projectScmPassword.label"/></th>
- <td >
- <input type="password" name="projectScmPassword" value="" size="100"/>
- <p><ww:text name="projectScmPassword.message"/></p>
- </td>
- </tr>
- <tr>
- <th><ww:text name="projectScmTag.label"/></th>
- <td >
- <input type="text" name="projectScmTag" value="" size="100"/>
- <p><ww:text name="projectScmTag.message"/></p>
- </td>
- </tr>
- </table>
- <div class="functnbar3">
- <input type="submit" value="<ww:text name="submit"/>"/>
- <input type="button" value="<ww:text name="cancel"/>" onClick="history.back()"/>
+ <div class="app">
+ <div id="axial" class="h3">
+ <h3>
+ <ww:if test="projectType == \"shell\"">
+ <ww:text name="add.shell.project.section.title"/>
+ </ww:if>
+ <ww:else>
+ <ww:text name="add.ant.project.section.title"/>
+ </ww:else>
+ </h3>
+ <div class="axial">
+ <ww:form method="post" action="addProject.action">
+ <input type="hidden" name="projectType" value="<ww:property value="projectType"/>">
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <tr class="b">
+ <th><ww:text name="projectName.label"/></th>
+ <td >
+ <input type="text" name="projectName" value="" size="100"/>
+ <p><ww:text name="projectName.message"/></p>
+ </td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="projectVersion.label"/></th>
+ <td >
+ <input type="text" name="projectVersion" value="" size="100"/>
+ <p><ww:text name="projectVersion.message"/></p>
+ </td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="projectScmUrl.label"/></th>
+ <td >
+ <input type="text" name="projectScmUrl" value="" size="100"/>
+ <p><ww:text name="projectScmUrl.message"/></p>
+ </td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="projectScmUsername.label"/></th>
+ <td >
+ <input type="text" name="projectScmUsername" value="" size="100"/>
+ <p><ww:text name="projectScmUsername.message"/></p>
+ </td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="projectScmPassword.label"/></th>
+ <td >
+ <input type="password" name="projectScmPassword" value="" size="100"/>
+ <p><ww:text name="projectScmPassword.message"/></p>
+ </td>
+ </tr>
+ <tr class="b">
+ <th><ww:text name="projectScmTag.label"/></th>
+ <td >
+ <input type="text" name="projectScmTag" value="" size="100"/>
+ <p><ww:text name="projectScmTag.message"/></p>
+ </td>
+ </tr>
+ </table>
+ <div class="functnbar3">
+ <input type="submit" value="<ww:text name="submit"/>"/>
+ <input type="button" value="<ww:text name="cancel"/>" onClick="history.back()"/>
+ </div>
+ </ww:form>
+ </div>
+ </div>
</div>
- </div>
- </ww:form>
- </div>
-</div>
</body>
</html>
</ww:i18n>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp?rev=358632&r1=358631&r2=358632&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp Thu Dec 22 13:20:03 2005
@@ -21,7 +21,7 @@
</ww:text>
</td>
</tr>
- <tr class="a">
+ <tr class="b">
<th><ww:text name="configuration.workingDirectory.label"/></th>
<td><ww:property value="workingDirectory"/></td>
</tr>
@@ -29,7 +29,7 @@
<th><ww:text name="configuration.buildOutputDirectory.label"/></th>
<td><ww:property value="buildOutputDirectory"/></td>
</tr>
- <tr class="a">
+ <tr class="b">
<th><ww:text name="configuration.baseUrl.label"/></th>
<td><ww:property value="baseUrl"/></td>
</tr>
@@ -37,7 +37,7 @@
<th><ww:text name="configuration.companyName.label"/></th>
<td><ww:property value="companyName"/></td>
</tr>
- <tr class="a">
+ <tr class="b">
<th><ww:text name="configuration.companyLogo.label"/></th>
<td><ww:property value="companyLogo"/></td>
</tr>
@@ -48,7 +48,7 @@
</table>
<div class="functnbar3">
<ww:form action="configuration!edit.action">
- <ww:submit value="%{getText('configuration.submit.edit')}"/>
+ <ww:submit value="%{getText('edit')}"/>
</ww:form>
</div>
</div>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp?rev=358632&r1=358631&r2=358632&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp Thu Dec 22 13:20:03 2005
@@ -17,7 +17,7 @@
<ww:textfield label="%{getText('configuration.companyName.label')}" name="companyName"/>
<ww:textfield label="%{getText('configuration.companyLogo.label')}" name="companyLogo"/>
<ww:textfield label="%{getText('configuration.companyUrl.label')}" name="companyUrl"/>
- <ww:submit value="%{getText('configuration.submit.edit')}"/>
+ <ww:submit value="%{getText('save')}"/>
</ww:form>
</div>
</div>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp?rev=358632&r1=358631&r2=358632&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp Thu Dec 22 13:20:03 2005
@@ -37,7 +37,8 @@
showExports="false"
showPagination="false"
showStatusBar="false"
- filterable="false">
+ filterable="false"
+ sortable="false">
<ec:row highlightRow="true">
<ec:column property="goals" title="projectView.buildDefinition.goals"/>
<ec:column property="arguments" title="projectView.buildDefinition.arguments"/>
@@ -50,7 +51,7 @@
PROJECT
</ec:column>
<ec:column property="actions" title=" ">
- Edit Delete
+ <ww:text name="edit"/> <ww:text name="delete"/>
</ec:column>
</ec:row>
</ec:table>
@@ -61,14 +62,15 @@
showExports="false"
showPagination="false"
showStatusBar="false"
- filterable="false">
+ filterable="false"
+ sortable="false">
<ec:row highlightRow="true">
<ec:column property="type" title="projectView.notifier.type"/>
<ec:column property="recipient" title="projectView.notifier.recipient" cell="org.apache.maven.continuum.web.view.projectview.NotifierRecipientCell"/>
<ec:column property="events" title="projectView.notifier.events" cell="org.apache.maven.continuum.web.view.projectview.NotifierEventCell"/>
<ec:column property="from" title="projectView.notifier.from" cell="org.apache.maven.continuum.web.view.projectview.NotifierFromCell"/>
<ec:column property="actions" title=" ">
- Edit Delete
+ <ww:text name="edit"/> <ww:text name="delete"/>
</ec:column>
</ec:row>
</ec:table>
@@ -80,7 +82,8 @@
showExports="false"
showPagination="false"
showStatusBar="false"
- filterable="false">
+ filterable="false"
+ sortable="false">
<ec:row highlightRow="true">
<ec:column property="name" title="projectView.dependency.name">
${pageScope.dependency.groupId}:${pageScope.dependency.artifactId}:${pageScope.dependency.version}
@@ -94,7 +97,8 @@
showExports="false"
showPagination="false"
showStatusBar="false"
- filterable="false">
+ filterable="false"
+ sortable="false">
<ec:row highlightRow="true">
<ec:column property="name" title="projectView.developer.name"/>
<ec:column property="email" title="projectView.developer.email"/>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp?rev=358632&r1=358631&r2=358632&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp Thu Dec 22 13:20:03 2005
@@ -31,7 +31,7 @@
TODO
</ec:column>
<ec:column property="deleteAction" title=" ">
- <a href="${pageContext.request.contextPath}/deleteProject!default.action?projectId=${pageScope.project.id}&projectName=${pageScope.project.name}">Delete</a>
+ <a href="${pageContext.request.contextPath}/deleteProject!default.action?projectId=${pageScope.project.id}&projectName=${pageScope.project.name}"><ww:text name="delete"/></a>
</ec:column>
</ec:row>
</ec:table>