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 2007/01/02 17:33:18 UTC
svn commit: r491840 - in /maven/continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/ resources/
resources/localization/ webapp/WEB-INF/jsp/
Author: evenisse
Date: Tue Jan 2 08:33:17 2007
New Revision: 491840
URL: http://svn.apache.org/viewvc?view=rev&rev=491840
Log:
[CONTINUUM-1099] Consistency in confirmation message
Submitted by: Napoleon Esmundo C. Ramirez
Removed:
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmation.jsp
Modified:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?view=diff&rev=491840&r1=491839&r2=491840
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Tue Jan 2 08:33:17 2007
@@ -151,6 +151,7 @@
}
else
{
+ name = getContinuum().getProjectGroup( projectGroupId ).getName();
return CONFIRM;
}
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?view=diff&rev=491840&r1=491839&r2=491840
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Tue Jan 2 08:33:17 2007
@@ -161,6 +161,8 @@
else
{
setConfirmationInfo( "Schedule Removal", "removeSchedule", name, "id", "" + id );
+
+ name = getContinuum().getSchedule( id ).getName();
return CONFIRM;
}
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=491840&r1=491839&r2=491840
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Tue Jan 2 08:33:17 2007
@@ -95,6 +95,7 @@
groups.page.title = Continuum - Group Summary
groups.section.title = Project Group:
groups.manage.label = Manage Group
+groups.confirmation.message = Are you sure you want to delete the project group "{0}"?
# ----------------------------------------------------------------------
# Page: Project Group
@@ -430,6 +431,7 @@
schedules.table.delay = Quiet Period
schedules.table.cronExpression = Cron Expression
schedules.table.maxJobExecutionTime = Max Job Time
+schedules.confirmation.message = Are you sure you want to delete the schedule "{0}"?
# ----------------------------------------------------------------------
# Page: Add/EditSchedule
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=491840&r1=491839&r2=491840
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Tue Jan 2 08:33:17 2007
@@ -301,7 +301,7 @@
<result name="error" type="chain">schedule</result>
</action>
<action name="removeSchedule" class="schedule" method="remove">
- <result name="confirm">/WEB-INF/jsp/confirmation.jsp</result>
+ <result name="confirm">/WEB-INF/jsp/confirmScheduleRemoval.jsp</result>
<result name="success" type="chain">schedules</result>
</action>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp?view=diff&rev=491840&r1=491839&r2=491840
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp Tue Jan 2 08:33:17 2007
@@ -14,9 +14,15 @@
<ww:hidden name="confirmed" value="true"/>
<ww:actionerror/>
- <p>
- Are you sure you wish to remove <ww:property value="projectGroup.name"/>?
- </p>
+ <div class="warningmessage">
+ <p>
+ <strong>
+ <ww:text name="groups.confirmation.message">
+ <ww:param><ww:property value="%{name}"/></ww:param>
+ </ww:text>
+ </strong>
+ </p>
+ </div>
<div class="functnbar3">
<c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp?view=diff&rev=491840&r1=491839&r2=491840
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp Tue Jan 2 08:33:17 2007
@@ -14,9 +14,15 @@
<ww:hidden name="confirmed" value="true"/>
<ww:actionerror/>
- <p>
- Are you sure you wish to remove <ww:property value="schedule.name"/>?
- </p>
+ <div class="warningmessage">
+ <p>
+ <strong>
+ <ww:text name="schedules.confirmation.message">
+ <ww:param><ww:property value="%{name}"/></ww:param>
+ </ww:text>
+ </strong>
+ </p>
+ </div>
<div class="functnbar3">
<c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>