Author: ghuber
Date: Mon Jun 16 15:15:18 2014
New Revision: 1602890
URL: http://svn.apache.org/r1602890
Log:
Tidy js and tags.
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp?rev=1602890&r1=1602889&r2=1602890&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp Mon Jun
16 15:15:18 2014
@@ -48,7 +48,7 @@
</s:text>
</p>
-<s:form id="entry" action="entryAdd!save" onsubmit="editorCleanup()">
+<s:form id="entry" action="entryAdd!save">
<s:hidden name="salt" />
<s:hidden name="weblog" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp?rev=1602890&r1=1602889&r2=1602890&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp Mon Jun
16 15:15:18 2014
@@ -56,7 +56,7 @@ function fullPreviewMode() {
</s:text>
</p>
-<s:form id="entry" action="entryEdit!save" onsubmit="editorCleanup()">
+<s:form id="entry" action="entryEdit!save">
<s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="bean.id" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp?rev=1602890&r1=1602889&r2=1602890&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Maintenance.jsp Mon
Jun 16 15:15:18 2014
@@ -26,7 +26,7 @@
<s:text name="maintenance.prompt.flush" /><br /><br />
<s:submit value="%{getText('maintenance.button.flush')}"
action="maintenance!flushCache" />
- <s:if test="getProp('search.enabled')">
+ <s:if test="getBooleanProp('search.enabled')">
<br /><br />
<s:text name="maintenance.prompt.index" /><br /><br />
<s:submit value="%{getText('maintenance.button.index')}"
action="maintenance!index" />
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp?rev=1602890&r1=1602889&r2=1602890&view=diff
==============================================================================
---
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp
(original)
+++
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp
Mon Jun 16 15:15:18 2014
@@ -28,7 +28,7 @@ function submitPage(frm) {
}
</script>
-<s:form id="entry" action=" " onsubmit="editorCleanup()" method="POST">
+<s:form id="entry" action=" " method="POST">
<s:hidden name="salt" />
<table class="entryEditTable" cellpadding="0" cellspacing="0" width="100%">
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp?rev=1602890&r1=1602889&r2=1602890&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp Mon
Jun 16 15:15:18 2014
@@ -80,7 +80,6 @@ $("#d_clip_button").ready(function() {
<s:hidden name="mediaFileId" id="mediaFileId" />
<s:hidden name="bean.permalink" />
-
<%-- ==================================================================
--%>
<%-- Title, category, dates and other metadata --%>
@@ -193,7 +192,7 @@ $("#d_clip_button").ready(function() {
</tr>
<!-- original path from base URL of ctx/resources/ -->
- <% if
(WebloggerConfig.getBooleanProperty("mediafile.originalPathEdit.enabled")) { %>
+ <s:if test="getBooleanProp('mediafile.originalPathEdit.enabled')">
<tr>
<td class="originalPathLabel">
<label for="originalPath"><s:text
name="mediaFileEdit.originalPath" /></label>
@@ -205,7 +204,7 @@ $("#d_clip_button").ready(function() {
</div>
</td>
</tr>
- <% } %>
+ </s:if>
</table>
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp?rev=1602890&r1=1602889&r2=1602890&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
Mon Jun 16 15:15:18 2014
@@ -62,7 +62,7 @@
<br />
<s:form id="mediaFileSearchForm" name="mediaFileSearchForm"
- action="mediaFileView!search"
onsubmit="editorCleanup()">
+ action="mediaFileView!search">
<s:hidden name="salt" />
<s:hidden name="weblog" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp?rev=1602890&r1=1602889&r2=1602890&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp Mon Jun
16 15:15:18 2014
@@ -12,7 +12,7 @@ You can override it with your own file v
<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/styles/roller.css"/>' />
<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/styles/menu.css"/>' />
-<link rel="stylesheet" type="text/css" media="all" href="<%=
request.getContextPath() %>/roller-ui/theme/<s:property
value="getProp('editor.theme')"/>/colors.css" />
+<link rel="stylesheet" type="text/css" media="all" href="<s:url
value="/roller-ui/theme/"/><s:property value="getProp('editor.theme')"
/>/colors.css" />
<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/theme/sunny/jquery-ui-1.10.4.custom.min.css"/>' />
<script type="text/javascript" src="<s:url
value="/theme/scripts/roller.js"/>"></script>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp?rev=1602890&r1=1602889&r2=1602890&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp Mon Jun 16
15:15:18 2014
@@ -12,7 +12,7 @@ You can override it with your own file v
<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/styles/roller.css"/>' />
<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/styles/menu.css"/>' />
-<link rel="stylesheet" type="text/css" media="all" href="<%=
request.getContextPath() %>/roller-ui/theme/<s:property
value="getProp('editor.theme')"/>/colors.css" />
+<link rel="stylesheet" type="text/css" media="all" href="<s:url
value="/roller-ui/theme/"/><s:property
value="getProp('editor.theme')"/>/colors.css" />
<link rel="stylesheet" type="text/css" media="all" href='<s:url
value="/roller-ui/theme/sunny/jquery-ui-1.10.4.custom.min.css"/>' />
<script type="text/javascript" src="<s:url
value="/theme/scripts/roller.js"/>"></script>
