Author: ghuber
Date: Thu Aug 1 05:47:47 2013
New Revision: 1509083
URL: http://svn.apache.org/r1509083
Log:
UI tidy
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp?rev=1509083&r1=1509082&r2=1509083&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp Thu Aug
1 05:47:47 2013
@@ -35,7 +35,7 @@
</script>
<p class="subtitle">
- <s:if test="bean.entryId != null && bean.entryId !='' ">
+ <s:if test="bean.entryId != null && !bean.entryId.equals('') ">
<s:text name="commentManagement.entry.subtitle">
<s:param value="firstComment.weblogEntry.title"/>
</s:text>
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp?rev=1509083&r1=1509082&r2=1509083&view=diff
==============================================================================
---
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp
(original)
+++
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp
Thu Aug 1 05:47:47 2013
@@ -23,7 +23,7 @@
</s:text>
</p>
-<s:form action="customPingTargetAdd!save" >
+<s:form action="customPingTargetAdd" >
<s:hidden name="salt" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
@@ -40,7 +40,8 @@
<p/>
<div class="formrow">
<label for="" class="formrow"> </label>
- <s:submit value="%{getText('pingTarget.save')}" />
+ <s:submit value="%{getText('pingTarget.save')}"
action="customPingTargetAdd!save" />
+ <s:submit value="%{getText('pingTarget.cancel')}"
action="customPingTargets" />
</div>
</s:form>
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp?rev=1509083&r1=1509082&r2=1509083&view=diff
==============================================================================
---
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp
(original)
+++
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp
Thu Aug 1 05:47:47 2013
@@ -29,19 +29,10 @@
<tr><td><s:text name="pingTarget.pingUrl"
/> </td><td><b><s:property value="pingTarget.pingUrl"
/></b></td></tr>
</table>
-<br/>
-
-<div class="control">
- <s:form action="customPingTargets!delete">
- <s:hidden name="salt" />
- <s:hidden name="pingTargetId" />
- <s:hidden name="weblog" value="%{actionWeblog.handle}" />
- <s:submit value="%{getText('pingTarget.removeOK')}" />
- </s:form>
-
- <s:form action="customPingTargets">
- <s:hidden name="salt" />
- <s:hidden name="weblog" value="%{actionWeblog.handle}" />
- <s:submit value="%{getText('pingTarget.cancel')}" />
- </s:form>
-</div>
+<s:form action="customPingTargets">
+ <s:hidden name="salt" />
+ <s:hidden name="pingTargetId" />
+ <s:hidden name="weblog" value="%{actionWeblog.handle}" />
+ <s:submit value="%{getText('pingTarget.removeOK')}"
action="customPingTargets!delete" />
+ <s:submit value="%{getText('pingTarget.cancel')}"
action="customPingTargets" />
+</s:form>
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp?rev=1509083&r1=1509082&r2=1509083&view=diff
==============================================================================
---
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp
(original)
+++
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp
Thu Aug 1 05:47:47 2013
@@ -23,7 +23,7 @@
</s:text>
</p>
-<s:form action="customPingTargetEdit!save" >
+<s:form action="customPingTargetEdit" >
<s:hidden name="salt" />
<s:hidden name="bean.id" />
<s:hidden name="weblog" value="%{actionWeblog.handle}" />
@@ -41,7 +41,7 @@
<p/>
<div class="formrow">
<label for="" class="formrow"> </label>
- <s:submit value="%{getText('pingTarget.save')}" />
+ <s:submit value="%{getText('pingTarget.save')}"
action="customPingTargetEdit!save" />
<s:submit value="%{getText('pingTarget.cancel')}"
action="customPingTargets" />
</div>