roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1616975 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/admin/ resources/ webapp/WEB-INF/ webapp/WEB-INF/jsps/admin/
Date Sat, 09 Aug 2014 15:54:30 GMT
Author: gmazza
Date: Sat Aug  9 15:54:29 2014
New Revision: 1616975

URL: http://svn.apache.org/r1616975
Log:
CommonPingTargetAdd.jsp and CommonPingTargetEdit.jsp consolidated into PingTargetEdit.jsp

Added:
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetEdit.jsp
      - copied, changed from r1616933, roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp
      - copied, changed from r1616933, roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp
Removed:
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp
Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
    roller/trunk/app/src/main/resources/ApplicationResources.properties
    roller/trunk/app/src/main/resources/ApplicationResources_de.properties
    roller/trunk/app/src/main/resources/ApplicationResources_es.properties
    roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
    roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
    roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
    roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
    roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
    roller/trunk/app/src/main/resources/struts.xml
    roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
Sat Aug  9 15:54:29 2014
@@ -28,7 +28,7 @@ import org.apache.roller.weblogger.ui.st
 
 
 /**
- * Action for adding a common ping target.
+ * Add or modify a common ping target.
  */
 public class CommonPingTargetAdd extends PingTargetAddBase {
     
@@ -36,7 +36,6 @@ public class CommonPingTargetAdd extends
     
     
     public CommonPingTargetAdd() {
-        this.actionName = "commonPingTargetAdd";
         this.desiredMenu = "admin";
         this.pageTitle = "pingTarget.pingTarget";
     }
@@ -55,10 +54,8 @@ public class CommonPingTargetAdd extends
     protected Log getLogger() {
         return log;
     }
-    
-    
+
     protected PingTarget createPingTarget() {
-        
         return new PingTarget(
                 null, 
                 getBean().getName(), 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
Sat Aug  9 15:54:29 2014
@@ -25,22 +25,18 @@ import org.apache.commons.logging.LogFac
 import org.apache.roller.weblogger.pojos.GlobalPermission;
 import org.apache.roller.weblogger.ui.struts2.common.PingTargetEditBase;
 
-
 /**
- * Action for modifying a common ping target.
+ * Add or modify a common ping target.
  */
 public class CommonPingTargetEdit extends PingTargetEditBase {
     
     private static Log log = LogFactory.getLog(CommonPingTargetEdit.class);
-    
-    
+
     public CommonPingTargetEdit() {
-        this.actionName = "commonPingTargetEdit";
         this.desiredMenu = "admin";
         this.pageTitle = "pingTarget.pingTarget";
     }
-    
-    
+
     public List<String> requiredGlobalPermissionActions() {
         return Collections.singletonList(GlobalPermission.ADMIN);
     }
@@ -49,10 +45,9 @@ public class CommonPingTargetEdit extend
     public boolean isWeblogRequired() {
         return false;
     }
-    
-    
+
     protected Log getLogger() {
         return log;
     }
-    
+
 }

Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sat Aug  9 15:54:29
2014
@@ -1037,8 +1037,8 @@ Template.error.actionNull=The Action is 
 
 
 
-commonPingTargets.subtitle=Manage common weblog ping targets for all weblogs.
-commonPingTargets.commonPingTargets=Common Weblog Ping Targets
+commonPingTargets.subtitle=Ping target management
+commonPingTargets.commonPingTargets=Weblog Ping Targets
 commonPingTargets.explanation=These target sites are available to all weblogs \
 for weblog update pings.
 commonPingTargets.error.loading=Error loading common ping targets
@@ -1073,7 +1073,8 @@ a site administrator.
 
 pingTarget.pingTarget=Ping Target
 
-commonPingTarget.subtitle=Editing common ping target
+pingTargetEdit.subtitle=Edit ping target
+pingTargetAdd.subtitle=Add ping target
 
 pingTarget.pingUrl=Ping URL
 pingTarget.autoEnabled=Auto Ping?
@@ -1081,8 +1082,6 @@ pingTarget.remove=Remove
 pingTarget.confirmRemoveTitle=Remove Ping Target Confirmation
 pingTarget.confirmCommonRemove=Removing this target will also remove all user''s \
 automatic ping configurations that use this target.  Are you sure?
-pingTarget.removeOK=Yes, Remove
-pingTarget.cancel=No, Cancel
 pingTarget.enable=Enable
 pingTarget.enabled=ON
 pingTarget.disable=Disable

Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Sat Aug  9 15:54:29
2014
@@ -564,7 +564,6 @@ ping.transmittedButError=Der Ping wurde 
 ping.unknownHost=Der Hostname in der Ping Ziel URL ist unbekannt.
 pingTarget.auto=Automatisch
 pingTarget.autoEnabled=Auto Ping?
-pingTarget.cancel=Nein, abbrechen
 pingTarget.confirmCommonRemove=Das L\u00F6schen dieses Ziels l\u00F6scht auch alle automatischen
Benutzer Ping Konfigurationen, die dies Ziel benutzen. Sind Sie sicher?
 pingTarget.confirmRemoveTitle=L\u00F6sche Ping Ziel Best\u00E4tigung
 pingTarget.disable=Ausschalten
@@ -577,7 +576,6 @@ pingTarget.nameNotUnique=Der Name dieses
 pingTarget.pingTarget=Ping Ziel
 pingTarget.pingUrl=Ping URL
 pingTarget.remove=L\u00F6schen
-pingTarget.removeOK=Ja, l\u00F6schen
 pingTarget.saved=Ping-Ziel gespeichert
 pingTarget.sendPingNow=Sende jetzt ein Ping
 pingTarget.unknownHost=Der Hostname in der URL scheint nicht zu existieren.

Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Sat Aug  9 15:54:29
2014
@@ -328,8 +328,6 @@ pingTarget.pingUrl=URL para ping
 pingTarget.remove=Eliminar
 pingTarget.confirmRemoveTitle=Eliminar confirmaci\u00F3n de objetivo ping
 pingTarget.confirmCommonRemove=Eliminando este objetivo tambi\u00E9n eliminar\u00E1 la configuraci\u00F3n
de pings atom\u00E1ticos de todos los usuarios que usan este objetivo. \u00BFEst\u00E1 seguro?
-pingTarget.removeOK=S\u00ED, eliminar
-pingTarget.cancel=No, cancelar
 pingTarget.enable=Habilitar
 pingTarget.enabled=ACTIVADO
 pingTarget.disable=Deshabilitar

Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Sat Aug  9 15:54:29
2014
@@ -687,8 +687,6 @@ pingTarget.confirmRemoveTitle=Confirmati
 pingTarget.confirmCommonRemove=Effacer cette adresse affectera tous les blogs l'utilisant.
\
 Etes vous certain de vouloir effacer celle-ci ?
 
-pingTarget.removeOK=Oui
-pingTarget.cancel=Annuler
 pingTarget.enable=Activer
 pingTarget.enabled=Actif
 pingTarget.disable=Désactivé

Modified: roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Sat Aug  9 15:54:29
2014
@@ -553,8 +553,6 @@ pingTarget.autoEnabled=\u81EA\u52D5Ping\
 pingTarget.remove=\u524A\u9664
 pingTarget.confirmRemoveTitle=Ping\u30BF\u30FC\u30B2\u30C3\u30C8\u524A\u9664
 pingTarget.confirmCommonRemove=\u5168\u30E6\u30FC\u30B6\u5BFE\u8C61\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u524A\u9664\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002\uFF3C
-pingTarget.removeOK=\u672C\u5F53\u306B\u524A\u9664\u3057\u307E\u3059
-pingTarget.cancel=\u3084\u3063\u3071\u308A\u3084\u3081\u307E\u3059
 pingTarget.enable=\u81EA\u52D5\u306B\u3059\u308B
 pingTarget.enabled=\u81EA\u52D5
 pingTarget.disable=\u624B\u52D5\u306B\u3059\u308B

Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Sat Aug  9 15:54:29
2014
@@ -752,8 +752,6 @@ pingTarget.remove=\uc0ad\uc81c
 pingTarget.confirmRemoveTitle=\uc5f0\uacb0\ud655\uc778 \ub300\uc0c1 \uc0ad\uc81c \ud655\uc778
 pingTarget.confirmCommonRemove=\uc774 \uc5f0\uacb0\ud655\uc778 \ub300\uc0c1\uc744 \uc0ad\uc81c\ud558\uac8c
\ub418\uba74, \
 \uc774 \uc5f0\uacb0\ud655\uc778 \ub300\uc0c1\uc744 \uc0ac\uc6a9\ud558\ub294 \ubaa8\ub4e0
\uc0ac\uc6a9\uc790\ub4e4\uc758 \uc790\ub3d9 \uc5f0\uacb0\ud655\uc778 \uc124\uc815\ub4e4\ub3c4
\ud568\uaed8 \uc0ad\uc81c\ub429\ub2c8\ub2e4.
-pingTarget.removeOK=\uc608, \uc0ad\uc81c\ud569\ub2c8\ub2e4.
-pingTarget.cancel=\uc544\ub2c8\uc624, \ucde8\uc18c\ud569\ub2c8\ub2e4.
 pingTarget.enable=\ud65c\uc131\ud654
 pingTarget.enabled=\ud65c\uc131
 pingTarget.disable=\ube44\ud65c\uc131\ud654

Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Sat Aug  9 15:54:29
2014
@@ -452,8 +452,6 @@ pingTarget.pingUrl=URL \u043f\u0438\u043
 pingTarget.remove=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
 pingTarget.confirmRemoveTitle=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
\u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u0438\u043d\u0433\u0430
 pingTarget.confirmCommonRemove=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u044d\u0442\u043e\u0433\u043e
\u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u043e\u0432\u043b\u0435\u0447\u0435\u0442 \u0437\u0430
\u0441\u043e\u0431\u043e\u0439 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0432\u0441\u0435\u0445
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0445
\u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0445 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a
\u043f\u0438\u043d\u0433\u0430, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044e\u0449\u0438\u0445
\u044d\u0442\u043e\u0442 \u0430\u0434\u0440\u0435\u0441. \u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b?
-pingTarget.removeOK=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
-pingTarget.cancel=\u041e\u0442\u043c\u0435\u043d\u0430
 pingTarget.enable=Enable
 pingTarget.enabled=ON
 pingTarget.disable=Disable

Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Sat Aug  9 15:54:29
2014
@@ -326,7 +326,6 @@ ping.transmissionFailed=Ping\u5931\u8d25
 ping.transmittedButError=Ping\u6210\u529f\u53d1\u9001\uff0c\u4f46\u662f\u670d\u52a1\u5668\u8fd4\u56de\u5982\u4e0b\u9519\u8bef\u4fe1\u606f\u3002
 ping.unknownHost=Ping\u76ee\u6807\u7684\u4e3b\u673aURL\u672a\u77e5\u3002
 pingTarget.auto=\u81ea\u52a8
-pingTarget.cancel=\u53d6\u6d88
 pingTarget.confirmCommonRemove=\u79fb\u9664\u8fd9\u4e2a\u76ee\u6807\u5c06\u4f1a\u79fb\u9664\u6240\u6709\u7528\u6237\u7684\u4f7f\u7528\u6b64\u76ee\u6807\u81ea\u52a8Ping\u914d\u7f6e\u3002\u60a8\u8981\u7ee7\u7eed\u5417\uff1f
 pingTarget.confirmRemoveTitle=\u79fb\u9664Ping\u76ee\u6807\u914d\u7f6e
 pingTarget.disable=\u5931\u6548
@@ -339,7 +338,6 @@ pingTarget.nameNotUnique=\u8fd9\u4e2aPin
 pingTarget.pingTarget=Ping\u76ee\u6807
 pingTarget.pingUrl=Ping URL\u5730\u5740
 pingTarget.remove=\u5220\u9664
-pingTarget.removeOK=\u5220\u9664\u6210\u529f
 pingTarget.saved=Ping\u76ee\u6807\u5df2\u4fdd\u5b58\u3002
 pingTarget.sendPingNow=\u53d1\u9001Ping\u2026\u2026
 pingTarget.unknownHost=\u8be5URL\u4e3b\u673a\u5730\u5740\u4e0d\u5b58\u5728\u3002

Modified: roller/trunk/app/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/struts.xml?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/struts.xml (original)
+++ roller/trunk/app/src/main/resources/struts.xml Sat Aug  9 15:54:29 2014
@@ -190,18 +190,20 @@
         <action name="commonPingTargets!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.admin.CommonPingTargets">
             <result name="list" type="tiles">.CommonPingTargets</result>
-            <result name="confirm" type="tiles">.CommonPingTargetConfirm</result>
+            <result name="confirm" type="tiles">.PingTargetConfirm</result>
         </action>
         
         <action name="commonPingTargetAdd!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.admin.CommonPingTargetAdd">
-            <result name="input" type="tiles">.CommonPingTargetAdd</result>
+            <param name="actionName">commonPingTargetAdd</param>
+            <result name="input" type="tiles">.PingTargetEdit</result>
             <result name="success" type="chain">commonPingTargets</result>
         </action>
         
         <action name="commonPingTargetEdit!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.admin.CommonPingTargetEdit">
-            <result name="input" type="tiles">.CommonPingTargetEdit</result>
+            <param name="actionName">commonPingTargetEdit</param>
+            <result name="input" type="tiles">.PingTargetEdit</result>
             <result name="error" type="chain">commonPingTargets</result>
         </action>
         

Copied: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetEdit.jsp (from r1616933,
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp)
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetEdit.jsp?p2=roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetEdit.jsp&p1=roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp&r1=1616933&r2=1616975&rev=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetEdit.jsp Sat Aug  9 15:54:29
2014
@@ -17,29 +17,43 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
+<%-- Titling, processing actions different between add and edit --%>
+<s:if test="actionName == 'commonPingTargetEdit'">
+    <s:set var="mainAction">commonPingTargetEdit</s:set>
+    <s:set var="subtitleKey">pingTargetEdit.subtitle</s:set>
+</s:if>
+<s:else>
+    <s:set var="mainAction">commonPingTargetAdd</s:set>
+    <s:set var="subtitleKey">pingTargetAdd.subtitle</s:set>
+</s:else>
+
 <p class="subtitle">
-<s:text name="commonPingTarget.subtitle"/>
+<s:text name="%{#subtitleKey}"/>
 </p>
 
-<s:form action="commonPingTargetEdit!save" >
+<s:form>
 	<s:hidden name="salt" />
-    <s:hidden name="bean.id" />
-    
+    <s:if test="actionName == 'commonPingTargetEdit'">
+        <%-- bean for add does not have a bean id yet --%>
+        <s:hidden name="bean.id" />
+    </s:if>
+
     <div class="formrow">
        <label for="name" class="formrow"><s:text name="generic.name" /></label>
-       <s:textfield name="bean.name" size="30" maxlength="30" />
+       <s:textfield name="bean.name" size="30" maxlength="30" style="width:50%"/>
     </div>
 
     <div class="formrow">
        <label for="pingUrl" class="formrow"><s:text name="pingTarget.pingUrl" /></label>
-       <s:textfield name="bean.pingUrl" size="100" maxlength="255" />
+       <s:textfield name="bean.pingUrl" size="100" maxlength="255" style="width:50%"/>
     </div>
 
     <p/>
+
     <div class="formrow">
        <label for="" class="formrow">&nbsp;</label>
-       <s:submit value="%{getText('generic.save')}" />
-       <s:submit value="%{getText('pingTarget.cancel')}" action="commonPingTargets" />
+       <s:submit value="%{getText('generic.save')}" action="%{#mainAction}!save"/>
+       <s:submit value="%{getText('generic.cancel')}" action="commonPingTargets" />
     </div>
 
 </s:form>

Copied: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp (from r1616933,
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp)
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp?p2=roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp&p1=roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp&r1=1616933&r2=1616975&rev=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp Sat Aug  9 15:54:29
2014
@@ -35,11 +35,11 @@
     <s:form action="commonPingTargets!delete">
 		<s:hidden name="salt" />
         <s:hidden name="pingTargetId" />
-        <s:submit value="%{getText('pingTarget.removeOK')}" />
+        <s:submit value="%{getText('generic.yes')}" />
     </s:form>
     &nbsp;
     <s:form action="commonPingTargets">
 		<s:hidden name="salt" />
-        <s:submit value="%{getText('pingTarget.cancel')}" />
+        <s:submit value="%{getText('generic.cancel')}" />
     </s:form>
 </div>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml?rev=1616975&r1=1616974&r2=1616975&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml Sat Aug  9 15:54:29 2014
@@ -187,16 +187,12 @@
         <put-attribute name="content" value="/WEB-INF/jsps/admin/CommonPingTargets.jsp"
/>
     </definition>
     
-    <definition name=".CommonPingTargetConfirm" extends=".tiles-tabbedpage" >
-        <put-attribute name="content" value="/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp"
/>
+    <definition name=".PingTargetConfirm" extends=".tiles-tabbedpage" >
+        <put-attribute name="content" value="/WEB-INF/jsps/admin/PingTargetRemove.jsp"
/>
     </definition>
     
-    <definition name=".CommonPingTargetAdd" extends=".tiles-tabbedpage" >
-        <put-attribute name="content" value="/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp"
/>
-    </definition>
-    
-    <definition name=".CommonPingTargetEdit" extends=".tiles-tabbedpage" >
-        <put-attribute name="content" value="/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp"
/>
+    <definition name=".PingTargetEdit" extends=".tiles-tabbedpage" >
+        <put-attribute name="content" value="/WEB-INF/jsps/admin/PingTargetEdit.jsp" />
     </definition>
     
     <definition name=".CacheInfo" extends=".tiles-tabbedpage" >



Mime
View raw message