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 2006/09/27 12:07:09 UTC
svn commit: r450391 - in /maven/continuum/trunk/continuum-webapp/src/main:
resources/localization/Continuum.properties webapp/configurationEdit.jsp
webapp/navigations/Menu.jsp webapp/user.jsp webapp/userGroup.jsp
Author: evenisse
Date: Wed Sep 27 03:07:06 2006
New Revision: 450391
URL: http://svn.apache.org/viewvc?view=rev&rev=450391
Log:
[CONTINUUM-892] Add a description on all fields
Submitted by: Maria Odea Ching
Modified:
maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/user.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/userGroup.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=450391&r1=450390&r2=450391
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Wed Sep 27 03:07:06 2006
@@ -103,6 +103,13 @@
configuration.companyLogo.label = Company Logo
configuration.companyUrl.label = Company URL
configuration.submit.edit = Edit
+configuration.guest.message = Enable/Disable login as guest
+configuration.workingDirectory.message = Enter the working directory of the Continuum web application
+configuration.buildOutputDirectory.message = Enter the build output directory of the Continuum web application
+configuration.baseUrl.message = Enter the base URL for the Continuum web application
+configuration.companyName.message = Enter the company name
+configuration.companyLogo.message = Enter the company logo
+configuration.companyUrl.message = Enter the URL of the official company website
# ----------------------------------------------------------------------
# Page: Add Project
@@ -438,3 +445,26 @@
releaseViewResult.error=ERROR
releaseViewResult.output=Release Execution Output
releaseViewResult.noOutput=No Output
+
+# ----------------------------------------------------------------------
+# Page: User
+# ----------------------------------------------------------------------
+user.username.label = Username
+user.username.message = Enter the username
+user.fullName.label = Full Name
+user.fullName.message = Enter the full name of the user
+user.email.label = Email
+user.email.message = Enter the email address of the user
+user.password.label = Password
+user.passwordTwo.label = Password(again)
+user.passwordTwo.message = Password must match
+user.userGroup.label = User Group
+user.userGroup.message = Select a user group
+
+# ----------------------------------------------------------------------
+# Page: User Group
+# ----------------------------------------------------------------------
+userGroup.name.label = Name
+userGroup.name.message = Enter the user group name
+userGroup.description.label = Description
+userGroup.description.message = Enter the description
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp?view=diff&rev=450391&r1=450390&r2=450391
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp Wed Sep 27 03:07:06 2006
@@ -13,11 +13,25 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <ww:textfield label="Username" name="username"/>
- <ww:textfield label="Full Name" name="fullName"/>
- <ww:textfield label="Email" name="email"/>
- <ww:password label="Password" name="password"/>
- <ww:password label="Password(again)" name="passwordTwo"/>
+
+ <ww:textfield label="%{getText('user.username.label')}" name="username">
+ <ww:param name="desc"><p><ww:text name="user.username.message"/></p></ww:param>
+ </ww:textfield>
+
+ <ww:textfield label="%{getText('user.fullName.label')}" name="fullName">
+ <ww:param name="desc"><p><ww:text name="user.fullName.message"/></p></ww:param>
+ </ww:textfield>
+
+ <ww:textfield label="%{getText('user.email.label')}" name="email">
+ <ww:param name="desc"><p><ww:text name="user.email.message"/></p></ww:param>
+ </ww:textfield>
+
+ <ww:password label="%{getText('user.password.label')}" name="password"/>
+
+ <ww:password label="%{getText('user.passwordTwo.label')}" name="passwordTwo">
+ <ww:param name="desc"><p><ww:text name="user.passwordTwo.message"/></p></ww:param>
+ </ww:password>
+
</table>
</div>
@@ -25,16 +39,38 @@
<table>
<tbody>
+
<ww:checkbox label="%{getText('configuration.guest.label')}" name="guestAccountEnabled"
- value="guestAccountEnabled" fieldValue="true"/>
+ value="guestAccountEnabled" fieldValue="true">
+ <ww:param name="desc"><p><ww:text name="configuration.guest.message"/></p></ww:param>
+ </ww:checkbox>
+
<ww:textfield label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"
- required="true"/>
+ required="true">
+ <ww:param name="desc"><p><ww:text name="configuration.workingDirectory.message"/></p></ww:param>
+ </ww:textfield>
+
<ww:textfield label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"
- required="true"/>
- <ww:textfield label="%{getText('configuration.baseUrl.label')}" name="baseUrl" required="true"/>
- <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"/>
+ required="true">
+ <ww:param name="desc"><p><ww:text name="configuration.buildOutputDirectory.message"/></p></ww:param>
+ </ww:textfield>
+
+ <ww:textfield label="%{getText('configuration.baseUrl.label')}" name="baseUrl" required="true">
+ <ww:param name="desc"><p><ww:text name="configuration.baseUrl.message"/></p></ww:param>
+ </ww:textfield>
+
+ <ww:textfield label="%{getText('configuration.companyName.label')}" name="companyName">
+ <ww:param name="desc"><p><ww:text name="configuration.companyName.message"/></p></ww:param>
+ </ww:textfield>
+
+ <ww:textfield label="%{getText('configuration.companyLogo.label')}" name="companyLogo">
+ <ww:param name="desc"><p><ww:text name="configuration.companyLogo.message"/></p></ww:param>
+ </ww:textfield>
+
+ <ww:textfield label="%{getText('configuration.companyUrl.label')}" name="companyUrl">
+ <ww:param name="desc"><p><ww:text name="configuration.companyUrl.message"/></p></ww:param>
+ </ww:textfield>
+
</tbody>
</table>
<div class="functnbar3">
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp?view=diff&rev=450391&r1=450390&r2=450391
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp Wed Sep 27 03:07:06 2006
@@ -25,10 +25,10 @@
<a href="<ww:url value="/addMavenOneProject!default.action" includeParams="none"/>"><ww:text name="menu.add.m1Project"/></a>
</div>
<div class="body">
- <a href="<ww:url value="/addProject!default.action" includeParams="none"><ww:param name="projectType">ant</ww:param></ww:url>"><ww:text name="menu.add.antProject"/></a>
+ <a href="<ww:url value="/addProjectInput.action" includeParams="none"><ww:param name="projectType">ant</ww:param></ww:url>"><ww:text name="menu.add.antProject"/></a>
</div>
<div class="body">
- <a href="<ww:url value="/addProject!default.action" includeParams="none"><ww:param name="projectType">shell</ww:param></ww:url>"><ww:text name="menu.add.shellProject"/></a>
+ <a href="<ww:url value="/addProjectInput.action" includeParams="none"><ww:param name="projectType">shell</ww:param></ww:url>"><ww:text name="menu.add.shellProject"/></a>
</div>
</div>
</div>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/user.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/user.jsp?view=diff&rev=450391&r1=450390&r2=450391
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/user.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/user.jsp Wed Sep 27 03:07:06 2006
@@ -23,12 +23,29 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <ww:textfield label="Username" name="username" required="true"/>
- <ww:textfield label="Full Name" name="fullName" required="true"/>
- <ww:textfield label="Email" name="email"/>
- <ww:password label="Password" name="password" required="true"/>
- <ww:password label="Password(again)" name="passwordTwo" required="true"/>
- <ww:select list="userGroups" label="User Group" name="userGroupId"/>
+
+ <ww:textfield label="%{getText('user.username.label')}" name="username" required="true">
+ <ww:param name="desc"><p><ww:text name="user.username.message"/></p></ww:param>
+ </ww:textfield>
+
+ <ww:textfield label="%{getText('user.fullName.label')}" name="fullName" required="true">
+ <ww:param name="desc"><p><ww:text name="user.fullName.message"/></p></ww:param>
+ </ww:textfield>
+
+ <ww:textfield label="%{getText('user.email.label')}" name="email">
+ <ww:param name="desc"><p><ww:text name="user.email.message"/></p></ww:param>
+ </ww:textfield>
+
+ <ww:password label="%{getText('user.password.label')}" name="password" required="true"/>
+
+ <ww:password label="%{getText('user.passwordTwo.label')}" name="passwordTwo" required="true">
+ <ww:param name="desc"><p><ww:text name="user.passwordTwo.message"/></p></ww:param>
+ </ww:password>
+
+ <ww:select list="userGroups" label="%{getText('user.userGroup.label')}" name="userGroupId">
+ <ww:param name="desc"><p><ww:text name="user.userGroup.message"/></p></ww:param>
+ </ww:select>
+
</table>
</div>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/userGroup.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/userGroup.jsp?view=diff&rev=450391&r1=450390&r2=450391
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/userGroup.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/userGroup.jsp Wed Sep 27 03:07:06 2006
@@ -18,8 +18,12 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <ww:textfield label="Name" name="name" required="true"/>
- <ww:textfield label="Description" name="description"/>
+ <ww:textfield label="%{getText('userGroup.name.label')}" name="name" required="true">
+ <ww:param name="desc"><p><ww:text name="userGroup.name.message"/></p></ww:param>
+ </ww:textfield>
+ <ww:textfield label="%{getText('userGroup.description.label')}" name="description">
+ <ww:param name="desc"><p><ww:text name="userGroup.description.message"/></p></ww:param>
+ </ww:textfield>
</table>
</div>