Author: gmazza Date: Sun Aug 3 15:56:47 2014 New Revision: 1615415 URL: http://svn.apache.org/r1615415 Log: Merged editor-xinha.jsp into editor-text.jsp; updated s:url, switching from deprecated id attribute to var.
Removed: roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-xinha.jsp Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageDimension.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java Sun Aug 3 15:56:47 2014 @@ -37,7 +37,8 @@ public class XinhaEditor implements Webl } public String getJspPage() { - return "/roller-ui/authoring/editors/editor-xinha.jsp"; + // now handled within editor-text.jsp + return "/roller-ui/authoring/editors/editor-text.jsp"; } } Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp Sun Aug 3 15:56:47 2014 @@ -61,13 +61,13 @@ <!-- TODO: Use icons here --> <td class="rollertable" align="center" > <s:if test="#pingTarget.autoEnabled"> - <s:url id="disablePing" action="commonPingTargets!disable"> + <s:url var="disablePing" action="commonPingTargets!disable"> <s:param name="pingTargetId" value="#pingTarget.id" /> </s:url> <s:a href="%{disablePing}"><s:text name="pingTarget.disable"/></s:a> </s:if> <s:else> - <s:url id="enablePing" action="commonPingTargets!enable"> + <s:url var="enablePing" action="commonPingTargets!enable"> <s:param name="pingTargetId" value="#pingTarget.id" /> </s:url> <s:a href="%{enablePing}"><s:text name="pingTarget.enable"/></s:a> @@ -75,7 +75,7 @@ </td> <td class="rollertable" align="center"> - <s:url id="editPing" action="commonPingTargetEdit"> + <s:url var="editPing" action="commonPingTargetEdit"> <s:param name="bean.id" value="#pingTarget.id" /> </s:url> <s:a href="%{editPing}"> @@ -84,7 +84,7 @@ </td> <td class="rollertable" align="center"> - <s:url id="removePing" action="commonPingTargets!deleteConfirm"> + <s:url var="removePing" action="commonPingTargets!deleteConfirm"> <s:param name="pingTargetId" value="#pingTarget.id" /> </s:url> <s:a href="%{removePing}"> @@ -98,7 +98,7 @@ </table> <div style="padding: 4px; font-weight: bold;"> - <s:url id="addPing" action="commonPingTargetAdd"> + <s:url var="addPing" action="commonPingTargetAdd"> <s:param name="weblog" value="actionWeblog.handle" /> </s:url> <img src='<s:url value="/images/add.png"/>' border="0"alt="icon" /><s:a href="%{addPing}">Add Ping Target</s:a> Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp Sun Aug 3 15:56:47 2014 @@ -56,7 +56,7 @@ <s:if test="group != null" > - <s:url id="deleteUrl" action="planetGroups!delete"> + <s:url var="deleteUrl" action="planetGroups!delete"> <s:param name="bean.id" value="%{bean.id}" /> </s:url> <input type="button" @@ -105,7 +105,7 @@ </td> <td class="rollertable"> - <s:url id="groupUrl" action="planetGroups"> + <s:url var="groupUrl" action="planetGroups"> <s:param name="bean.id" value="#group.id" /> </s:url> <s:a href="%{groupUrl}"><img src='<s:url value="/images/page_white_edit.png"/>' border="0" alt="icon" @@ -113,7 +113,7 @@ </td> <td class="rollertable"> - <s:url id="subUrl" action="planetSubscriptions"> + <s:url var="subUrl" action="planetSubscriptions"> <s:param name="groupHandle" value="#group.handle" /> </s:url> <s:a href="%{subUrl}"><img src='<s:url value="/images/page_white_edit.png"/>' border="0" alt="icon" Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Sun Aug 3 15:56:47 2014 @@ -61,7 +61,7 @@ function onMove() <s:else> <p class="subtitle"> <s:text name="bookmarksForm.path" />: <s:text name="%{folder.name}" /> - <s:url id="editUrl" action="folderEdit"> + <s:url var="editUrl" action="folderEdit"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="%{folder.id}" /> <s:param name="folderId" value="%{folder.id}" suppressEmptyParameters="true" /> @@ -127,7 +127,7 @@ function onMove() </td> <td class="rollertable" align="center"> - <s:url id="editUrl" action="bookmarkEdit"> + <s:url var="editUrl" action="bookmarkEdit"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="#bookmark.id" /> <s:param name="folderId" value="%{folderId}" suppressEmptyParameters="true" /> Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp Sun Aug 3 15:56:47 2014 @@ -29,7 +29,7 @@ <p> <%-- Add Bookmark link --%> <img src='<s:url value="/images/link_add.png"/>' border="0"alt="icon" /> - <s:url id="addBookmark" action="bookmarkAdd"> + <s:url var="addBookmark" action="bookmarkAdd"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="folderId" value="%{folder.id}" /> </s:url> @@ -39,7 +39,7 @@ <p> <%-- Add Folder link --%> <img src='<s:url value="/images/folder_add.png"/>' border="0"alt="icon" /> - <s:url id="addFolder" action="folderAdd"> + <s:url var="addFolder" action="folderAdd"> <s:param name="weblog" value="%{actionWeblog.handle}" /> </s:url> <s:a href="%{addFolder}"><s:text name="bookmarksForm.addFolder" /></s:a> @@ -48,7 +48,7 @@ <%-- Import bookmarks --%> <p> <img src='<s:url value="/images/link_add.png"/>' border="0"alt="icon" /> - <s:url id="importBookmarks" action="bookmarksImport"> + <s:url var="importBookmarks" action="bookmarksImport"> <s:param name="weblog" value="%{actionWeblog.handle}" /> </s:url> <s:a href="%{importBookmarks}"><s:text name="bookmarksForm.importBookmarks" /></s:a> Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp Sun Aug 3 15:56:47 2014 @@ -76,7 +76,7 @@ function onMove() </td> <td class="rollertable" align="center"> - <s:url id="editUrl" action="categoryEdit"> + <s:url var="editUrl" action="categoryEdit"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="#category.id" /> </s:url> @@ -85,7 +85,7 @@ function onMove() <td class="rollertable" align="center"> <s:if test="AllCategories.size() > 1"> - <s:url id="removeUrl" action="categoryRemove"> + <s:url var="removeUrl" action="categoryRemove"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="removeId" value="#category.id" /> </s:url> Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp Sun Aug 3 15:56:47 2014 @@ -28,7 +28,7 @@ <p> <%-- Add Category link --%> <img src='<s:url value="/images/folder_add.png"/>' border="0"alt="icon" /> - <s:url id="addCategory" action="categoryAdd"> + <s:url var="addCategory" action="categoryAdd"> <s:param name="weblog" value="%{actionWeblog.handle}" /> </s:url> <s:a href="%{addCategory}"><s:text name="categoriesForm.addCategory" /></s:a> Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp Sun Aug 3 15:56:47 2014 @@ -159,7 +159,7 @@ </td> <td> - <s:url id="editUrl" action="entryEdit"> + <s:url var="editUrl" action="entryEdit"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="#post.id" /> </s:url> @@ -167,7 +167,7 @@ </td> <td> - <s:url id="deleteUrl" action="entryRemoveViaList"> + <s:url var="deleteUrl" action="entryRemoveViaList"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="removeId" value="#post.id" /> </s:url> 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=1615415&r1=1615414&r2=1615415&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 Sun Aug 3 15:56:47 2014 @@ -278,7 +278,7 @@ <s:if test="actionName == 'entryEdit'"> <span style="float:right"> - <s:url id="removeUrl" action="entryRemove"> + <s:url var="removeUrl" action="entryRemove"> <s:param name="weblog" value="actionWeblog.handle" /> <s:param name="removeId" value="%{entry.id}" /> </s:url> Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp Sun Aug 3 15:56:47 2014 @@ -48,7 +48,7 @@ </s:if> <s:iterator id="post" value="#pendingEntries"> <span class="entryEditSidebarLink"> - <s:url id="editUrl" action="entryEdit"> + <s:url var="editUrl" action="entryEdit"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="#post.id" /> </s:url> @@ -68,7 +68,7 @@ </s:if> <s:iterator id="post" value="#draftEntries"> <span class="entryEditSidebarLink"> - <s:url id="editUrl" action="entryEdit"> + <s:url var="editUrl" action="entryEdit"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="#post.id" /> </s:url> @@ -90,7 +90,7 @@ </s:if> <s:iterator id="post" value="#pubEntries"> <span class="entryEditSidebarLink"> - <s:url id="editUrl" action="entryEdit"> + <s:url var="editUrl" action="entryEdit"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="#post.id" /> </s:url> @@ -110,7 +110,7 @@ </s:if> <s:iterator id="post" value="#schedEntries"> <span class="entryEditSidebarLink"> - <s:url id="editUrl" action="entryEdit"> + <s:url var="editUrl" action="entryEdit"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="#post.id" /> </s:url> Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp Sun Aug 3 15:56:47 2014 @@ -159,7 +159,7 @@ <s:text name="mediaFileSuccess.noThanks" /> <ul> <li> - <s:url id="mediaFileAddURL" action="mediaFileAdd"> + <s:url var="mediaFileAddURL" action="mediaFileAdd"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="directoryName" value="%{directoryName}" /> </s:url> @@ -169,7 +169,7 @@ </li> <li> - <s:url id="mediaFileViewURL" action="mediaFileView"> + <s:url var="mediaFileViewURL" action="mediaFileView"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="directoryId" value="%{bean.directoryId}" /> </s:url> Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp Sun Aug 3 15:56:47 2014 @@ -22,7 +22,7 @@ </s:if> <s:else> <script> - <s:url id="mediaFileURL" value="/roller-ui/rendering/media-resources/%{bean.id}" /> + <s:url var="mediaFileURL" value="/roller-ui/rendering/media-resources/%{bean.id}" /> var filePointer = "<a href='<s:property value="%{mediaFileURL}" />'><s:property value="bean.name" /></a>"; parent.onClose(filePointer); </script> 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=1615415&r1=1615414&r2=1615415&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 Sun Aug 3 15:56:47 2014 @@ -84,7 +84,7 @@ <td> <a href='<s:text name="bean.permalink" />' target="_blank" title='<s:text name="mediaFileEdit.linkTitle" />'> - <s:url id="linkIconURL" value="/images/link.png"></s:url> + <s:url var="linkIconURL" value="/images/link.png"></s:url> <img border="0" src='<s:property value="%{linkIconURL}" />' style="padding:2px 2px;" alt="link" /> </a> Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp Sun Aug 3 15:56:47 2014 @@ -68,7 +68,7 @@ <p class="subtitle"> <s:text name="mediaFileView.folderName"/> / <s:iterator id="directory" value="currentDirectoryHierarchy"> - <s:url id="getDirectoryByPathUrl" action="mediaFileImageChooser"> + <s:url var="getDirectoryByPathUrl" action="mediaFileImageChooser"> <s:param name="directoryName" value="#directory.key" /> <s:param name="weblog" value="%{actionWeblog.handle}" /> </s:url> @@ -141,10 +141,10 @@ <li class="align-images" onmouseover="highlight(this, true)" onmouseout="highlight(this, false)"> - <s:url id="mediaFileURL" includeContext="false" + <s:url var="mediaFileURL" includeContext="false" value="%{#mediaFile.permalink}"></s:url> - <s:url id="mediaFileThumbnailURL" + <s:url var="mediaFileThumbnailURL" value="%{#mediaFile.thumbnailURL}"></s:url> <div class="mediaObject" Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageDimension.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageDimension.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageDimension.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageDimension.jsp Sun Aug 3 15:56:47 2014 @@ -17,7 +17,7 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<s:url id="mediaFileURL" value="/roller-ui/rendering/media-resources/%{bean.id}" /> +<s:url var="mediaFileURL" value="/roller-ui/rendering/media-resources/%{bean.id}" /> <script> function addImage() { 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=1615415&r1=1615414&r2=1615415&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 Sun Aug 3 15:56:47 2014 @@ -28,7 +28,7 @@ <br /> <img src='<s:url value="/images/image_add.png"/>' border="0"alt="icon" /> - <s:url id="mediaFileAddURL" action="mediaFileAdd"> + <s:url var="mediaFileAddURL" action="mediaFileAdd"> <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="directoryName" value="%{directoryName}" /> </s:url> @@ -165,7 +165,7 @@ $("#searchButton").ready(function () { $("select").bind("change", maintainSearchButtonState); $("#resetButton").bind("click", function() { - <s:url id="mediaFileViewURL" action="mediaFileView"> + <s:url var="mediaFileViewURL" action="mediaFileView"> <s:param name="weblog" value="%{actionWeblog.handle}" /> </s:url> window.location = '<s:property value="%{mediaFileViewURL}" />'; Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp Sun Aug 3 15:56:47 2014 @@ -289,7 +289,7 @@ </s:if> <s:else> - <s:url id="mediaFileURL" value="/images/page.png"></s:url> + <s:url var="mediaFileURL" value="/images/page.png"></s:url> <img border="0" src='<s:property value="%{mediaFileURL}" />' style="padding:40px 50px;" alt="logo" /> </s:else> @@ -339,7 +339,7 @@ </s:if> <s:else> - <s:url id="mediaFileURL" value="/images/page.png"></s:url> + <s:url var="mediaFileURL" value="/images/page.png"></s:url> <img border="0" src='<s:property value="%{mediaFileURL}" />' style="padding:40px 50px;" /> </s:else> @@ -423,7 +423,7 @@ <script> function onClickEdit(mediaFileId) { - <s:url id="mediaFileEditURL" action="mediaFileEdit"> + <s:url var="mediaFileEditURL" action="mediaFileEdit"> <s:param name="weblog" value="%{actionWeblog.handle}" /> </s:url> $("#mediaFileEditor").attr('src', '<s:property value="%{mediaFileEditURL}" />' + '&mediaFileId=' + mediaFileId); Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp Sun Aug 3 15:56:47 2014 @@ -73,14 +73,14 @@ <!-- TODO: Use icons here --> <td class="rollertable" align="center" > <s:if test="pingStatus[#pingTarget.id]"> - <s:url id="disableUrl" action="pings!disable" > + <s:url var="disableUrl" action="pings!disable" > <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="pingTargetId" value="#pingTarget.id" /> </s:url> <s:a href="%{disableUrl}"><s:text name="pingTarget.disable"/></s:a> </s:if> <s:else> - <s:url id="enableUrl" action="pings!enable" > + <s:url var="enableUrl" action="pings!enable" > <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="pingTargetId" value="#pingTarget.id" /> </s:url> @@ -89,7 +89,7 @@ </td> <td class="rollertable"> - <s:url id="pingNowUrl" action="pings!pingNow" > + <s:url var="pingNowUrl" action="pings!pingNow" > <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="pingTargetId" value="#pingTarget.id" /> </s:url> Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp Sun Aug 3 15:56:47 2014 @@ -61,7 +61,7 @@ <s:else> <img src='<s:url value="/images/page_white_gear.png"/>' border="0" alt="icon" /> </s:else> - <s:url id="edit" action="templateEdit"> + <s:url var="edit" action="templateEdit"> <s:param name="weblog" value="actionWeblog.handle" /> <s:param name="bean.id" value="#p.id" /> </s:url> @@ -74,7 +74,7 @@ <td class="center" style="vertical-align:middle"> <s:if test="!#p.required || !customTheme" > - <s:url id="removeUrl" action="templateRemove"> + <s:url var="removeUrl" action="templateRemove"> <s:param name="weblog" value="actionWeblog.handle"/> <s:param name="removeId" value="#p.id"/> </s:url> Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp Sun Aug 3 15:56:47 2014 @@ -148,7 +148,7 @@ function toggleImportThemeDisplay() { <s:else> <s:if test="customTheme"> <p> - <s:url id="templatesUrl" action="templates"> + <s:url var="templatesUrl" action="templates"> <s:param name="weblog" value="%{actionWeblog.handle}" /> </s:url> » <s:a href="%{templatesUrl}"><s:text name="themeEditor.templatesLink" /></s:a><br/> Modified: roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp?rev=1615415&r1=1615414&r2=1615415&view=diff ============================================================================== --- roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp (original) +++ roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp Sun Aug 3 15:56:47 2014 @@ -15,25 +15,43 @@ copyright in this work, please see the NOTICE file in the top level directory of this distribution. --%> -<%-- This page is designed to be included in Entry[Edit|Add].jsp --%> +<%-- This page is designed to be included in EntryEdit.jsp --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<style> - a:link, a:visited, a:hover, a:active { text-decoration:underline; } - body { - margin:0; - padding:0; - text-align:left; - } - h1 { - font-size:20px; - font-weight:bold; - } -</style> +<%-- ********************************************************************* --%> +<%-- Text editors --%> + +<p class="toplabel"> + <span style="font-weight:normal;float:right;"> + <a href="#" onClick="onClickAddImage();">Add Image</a> + </span> +</p> + +<p class="toplabel"><s:text name="weblogEdit.content" /></p> +<s:textarea id="edit_content" name="bean.text" cols="75" rows="25" cssStyle="width: 100%" tabindex="5"/> + +<p class="toplabel"><s:text name="weblogEdit.summary" /></p> +<s:textarea id="edit_summary" name="bean.summary" cols="75" rows="10" cssStyle="width: 100%" tabindex="6"/> + +<%-- ********************************************************************* --%> +<%-- Lightbox for popping up image chooser --%> + +<div id="mediafile_edit_lightbox" title="<s:text name='mediaFileChooser.popupTitle'/>"> + <iframe id="mediaFileEditor" + style="visibility:inherit" + height="100%" + width="100%" + frameborder="no" + scrolling="auto"> + </iframe> +</div> + +<%-- ********************************************************************* --%> +<%-- Editor event handling, on close, on add image, etc. --%> <script> function onClickAddImage(){ - <s:url id="mediaFileImageChooser" action="mediaFileImageChooser" namespace="overlay"> + <s:url var="mediaFileImageChooser" action="mediaFileImageChooser" namespace="overlay"> <s:param name="weblog" value="%{actionWeblog.handle}" /> </s:url> $("#mediaFileEditor").attr('src','<s:property value="%{mediaFileImageChooser}" />'); @@ -53,110 +71,103 @@ function onSelectImage(name, url) { $("#mediafile_edit_lightbox").dialog("close"); $("#mediaFileEditor").attr('src','about:blank'); - insertAtCursor(document.getElementById('entry_bean_text'), - '<a href="' + url + '"><img src="' + url + '?t=true" alt="' + name+ '"></img></a>'); + insertImage('<a href="' + url + '"><img src="' + url + '?t=true" alt="' + name+ '"></img></a>'); } +</script> - function onClose(textForInsertion) - { - document.getElementById('overlay').style.display = 'none'; - document.getElementById('overlay_img').style.visibility = 'hidden'; - if (textForInsertion && textForInsertion.length > 0) { - insertAtCursor(document.getElementById('entry_bean_text'), textForInsertion); - } - } +<s:if test="editor.id == 'editor-text.jsp'"> + <%-- Plain text editor (raw HTML entry) --%> - function insertAtCursor(textAreaElement, valueForInsertion) { - if (document.selection) { - textAreaElement.focus(); - var range = document.selection.createRange(); - range.text = valueForInsertion; + <script> + function insertImage(imageURL) { + insertAtCursor(document.getElementById('edit_content'), imageURL); } - else if (textAreaElement.selectionStart || textAreaElement.selectionStart == '0') { - var preText; - var postText; - if (textAreaElement.selectionStart == 0) { - preText = ''; - postText = ''; + function insertAtCursor(textAreaElement, valueForInsertion) { + if (document.selection) { + textAreaElement.focus(); + var range = document.selection.createRange(); + range.text = valueForInsertion; } - else { - preText = textAreaElement.value.substring(0, textAreaElement.selectionStart); - postText = textAreaElement.value.substring(textAreaElement.selectionEnd, textAreaElement.value.length); + else if (textAreaElement.selectionStart || textAreaElement.selectionStart == '0') { + var preText; + var postText; + if (textAreaElement.selectionStart == 0) { + preText = ''; + postText = ''; + } + else { + preText = textAreaElement.value.substring(0, textAreaElement.selectionStart); + postText = textAreaElement.value.substring(textAreaElement.selectionEnd, textAreaElement.value.length); + } + textAreaElement.value = preText + valueForInsertion + postText; + textAreaElement.selectionStart = preText.length + valueForInsertion.length; + textAreaElement.selectionEnd = textAreaElement.selectionStart; + textAreaElement.focus(); + } else { + textAreaElement.value += valueForInsertion; + textAreaElement.focus(); } - textAreaElement.value = preText + valueForInsertion + postText; - textAreaElement.selectionStart = preText.length + valueForInsertion.length; - textAreaElement.selectionEnd = textAreaElement.selectionStart; - textAreaElement.focus(); - } else { - textAreaElement.value += valueForInsertion; - textAreaElement.focus(); } - } - -</script> - -<script> - <!-- - function editorCleanup() { - // no-op - } - function changeSize(e, num) { - a = e.rows + num; - if (a > 0) e.rows = a; - var expires = new Date(); - expires.setTime(expires.getTime() + 24 * 90 * 60 * 60 * 1000); // sets it for approx 90 days. - setCookie("editorSize",e.rows,expires); - } - function changeSize1(e, num) { - a = e.rows + num; - if (a > 0) e.rows = a; - var expires = new Date(); - expires.setTime(expires.getTime() + 24 * 90 * 60 * 60 * 1000); // sets it for approx 90 days. - setCookie("editorSize1",e.rows,expires); - } - // --> -</script> - - -<%-- ===================================================================== --%> - -<p class="toplabel"> - <span style="float:left;"><s:text name="weblogEdit.content" /></span> - <span style="font-weight:normal;float:right;"> - <a href="#" onClick="onClickAddImage();">Add Image</a> - </span> -</p> - -<s:textarea name="bean.text" cols="75" rows="25" cssStyle="width: 100%" tabindex="5"/> -<table style="width:100%"><tr><td align="right"> - <!-- Add buttons to make this textarea taller or shorter --> - <input type="button" name="taller" value=" ↓ " - onclick="changeSize1(document.getElementById('entry_bean_text'), 5)" /> - <input type="button" name="shorter" value=" ↑ " - onclick="changeSize1(document.getElementById('entry_bean_text'), -5)" /> -</td></tr></table> - - -<%-- ===================================================================== --%> - -<p class="toplabel"><s:text name="weblogEdit.summary" /></p> + </script> +</s:if> +<s:else> + <%-- Rich text editor (Xinha, see: http://trac.xinha.org/wiki/NewbieGuide) --%> + + <s:url var="xinhaHome" value="/roller-ui/authoring/editors/xinha-0.96.1"></s:url> + <script> + // (preferably absolute) URL (including trailing slash) where Xinha is installed + _editor_url = '<s:property value="xinhaHome" />'; + _editor_lang = "en"; // And the language we need to use in the editor. + _editor_skin = "blue-look"; // If you want use a skin, add the name (of the folder) here + </script> + <script src="<s:property value="xinhaHome" />/XinhaCore.js"></script> + + <script> + function insertImage(imageURL) { + xinha_editors.edit_content.insertHTML(imageURL); + } -<s:textarea name="bean.summary" cols="75" rows="5" cssStyle="width: 100%" tabindex="6"/> + xinha_editors = null; + xinha_init = null; + xinha_config = null; + xinha_plugins = null; + + xinha_init = xinha_init ? xinha_init : function() { + + xinha_editors = xinha_editors ? xinha_editors : [ + 'edit_content', 'edit_summary' + ]; + + xinha_plugins = xinha_plugins ? xinha_plugins :[]; + if(!Xinha.loadPlugins(xinha_plugins, xinha_init)) return; + + xinha_config = xinha_config ? xinha_config() : new Xinha.Config(); + xinha_config.pageStyleSheets = [ _editor_url + "examples/full_example.css" ]; + xinha_config.toolbar = + [ + ["popupeditor"], + ["separator","formatblock","fontname","fontsize","bold","italic","underline","strikethrough"], + ["separator","forecolor","hilitecolor","textindicator"], + ["separator","subscript","superscript"], + ["linebreak","separator","justifyleft","justifycenter","justifyright","justifyfull"], + ["separator","insertorderedlist","insertunorderedlist","outdent","indent"], + ["separator","inserthorizontalrule","createlink","insertimage","inserttable"], + ["linebreak","separator","undo","redo","selectall","print"], (Xinha.is_gecko ? [] : ["cut","copy","paste","overwrite","saveas"]), + ["separator","killword","clearfonts","removeformat","toggleborders","splitblock","lefttoright", "righttoleft"], + ["separator","htmlmode","showhelp","about"] + ]; + + // turn off Xinha's URL stripping default. Blog entries need absolute URLs, + // otherwise links will be broken in RSS/Atom feeds. + xinha_config.stripBaseHref = false; + + xinha_editors = Xinha.makeEditors(xinha_editors, xinha_config, xinha_plugins); + xinha_editors.edit_content.config.height = '300px'; + xinha_editors.edit_summary.config.height = '200px'; -<table style="width:100%"><tr><td align="right"> - <!-- Add buttons to make this textarea taller or shorter --> - <input type="button" name="taller" value=" ↓ " - onclick="changeSize(document.getElementById('entry_bean_summary'), 5)" /> - <input type="button" name="shorter" value=" ↑ " - onclick="changeSize(document.getElementById('entry_bean_summary'), -5)" /> -</td></tr></table> + Xinha.startEditors(xinha_editors); + } -<div id="mediafile_edit_lightbox" title="<s:text name='mediaFileChooser.popupTitle'/>"> - <iframe id="mediaFileEditor" - style="visibility:inherit" - height="100%" - width="100%" - frameborder="no" - scrolling="auto"> - </iframe> -</div> + Xinha._addEvent(window,'load', xinha_init); + </script> +</s:else>