Repository: roller Updated Branches: refs/heads/bootstrap-ui 2da0e3908 -> 525400ba4
Fixes to the Bookmarks page. Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/525400ba Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/525400ba Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/525400ba Branch: refs/heads/bootstrap-ui Commit: 525400ba4f3570cb663adf214aecd4daaca5ded4 Parents: 2da0e39 Author: Dave Johnson <[email protected]> Authored: Sat Feb 18 17:26:19 2017 -0500 Committer: Dave Johnson <[email protected]> Committed: Sat Feb 18 17:26:19 2017 -0500 ---------------------------------------------------------------------- .../ui/struts2/util/UISecurityInterceptor.java | 11 ++- .../webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 16 ++-- .../WEB-INF/jsps/editor/BookmarksSidebar.jsp | 81 +++++++++----------- app/src/main/webapp/WEB-INF/tiles.xml | 2 +- 4 files changed, 52 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/525400ba/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityInterceptor.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityInterceptor.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityInterceptor.java index 7ba142d..d4c8e8c 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityInterceptor.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityInterceptor.java @@ -67,7 +67,7 @@ public class UISecurityInterceptor extends MethodFilterInterceptor { if (log.isDebugEnabled()) { log.debug("DENIED: required user not found"); } - return "access-denied"; + return UIAction.DENIED; } // are we also enforcing global permissions? @@ -78,10 +78,9 @@ public class UISecurityInterceptor extends MethodFilterInterceptor { theAction.requiredGlobalPermissionActions()); if (!umgr.checkPermission(perm, authenticatedUser)) { if (log.isDebugEnabled()) { - log.debug("DENIED: user does not have permission = " - + perm.toString()); + log.debug("DENIED: user does not have permission = " + perm.toString()); } - return "access-denied"; + return UIAction.DENIED; } } @@ -96,7 +95,7 @@ public class UISecurityInterceptor extends MethodFilterInterceptor { " unable to process action \"" + ((UIAction) theAction).getActionName() + "\" because no weblog was defined (Check JSP form provides weblog value.)"); } - return "access-denied"; + return UIAction.DENIED; } // are we also enforcing a specific weblog permission? @@ -112,7 +111,7 @@ public class UISecurityInterceptor extends MethodFilterInterceptor { log.debug("DENIED: user does not have required weblog permissions = " + required); } - return "access-denied"; + return UIAction.DENIED; } } } http://git-wip-us.apache.org/repos/asf/roller/blob/525400ba/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp index 8313cb9..c4bcdfd 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp @@ -90,13 +90,9 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and </s:if> - <s:if test="!allFolders.isEmpty"> - - <%-- allow user to select the bookmark folder to view --%> - <s:select name="viewFolderId" list="allFolders" listKey="id" listValue="name" - label="%{getText('bookmarksForm.switchTo')}" onchange="viewChanged()" /> - - </s:if> + <%-- allow user to select the bookmark folder to view --%> + <s:select name="viewFolderId" list="allFolders" listKey="id" listValue="name" + label="%{getText('bookmarksForm.switchTo')}" onchange="viewChanged()" onmouseup="viewChanged()"/> <table class="rollertable table table-striped"> @@ -799,7 +795,11 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and feedbackAreaEdit.html('<s:text name="generic.success" />'); $('#category-edit-modal').modal("hide"); - location.reload(true); + // cause page to be reloaded so that edit appears + // and make sure we end up on the right folder + bookmarksForm = $("#bookmarks")[0]; + bookmarksForm.viewFolderId.value = bookmarksForm.folderId.value; + viewChanged(); } }).error(function (data) { http://git-wip-us.apache.org/repos/asf/roller/blob/525400ba/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp index f75ccb4..ea21b7c 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp @@ -17,48 +17,43 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<div class="sidebarFade"> - <div class="menu-tr"> - <div class="menu-tl"> - - <div class="sidebarInner"> - - <h3><s:text name="mainPage.actions" /></h3> - <hr size="1" noshade="noshade" /> - - <p> - <%-- Add Bookmark link --%> - <img src='<s:url value="/images/link_add.png"/>' border="0"alt="icon" /> - <s:url var="addBookmark" action="bookmarkAdd"> - <s:param name="weblog" value="%{actionWeblog.handle}" /> - <s:param name="folderId" value="%{folder.id}" /> - </s:url> - <s:a href="%{addBookmark}"><s:text name="bookmarksForm.addBookmark" /></s:a> - </p> - - <p> - <%-- Add Folder link --%> - <img src='<s:url value="/images/folder_add.png"/>' border="0"alt="icon" /> - <s:url var="addFolder" action="folderAdd"> - <s:param name="weblog" value="%{actionWeblog.handle}" /> - <s:param name="folderId" value="%{folder.id}" /> - </s:url> - <s:a href="%{addFolder}"><s:text name="bookmarksForm.addFolder" /></s:a> - </p> +<h3><s:text name="mainPage.actions"/></h3> +<hr size="1" noshade="noshade"/> + +<%-- Add Bookmark link +<p> + <s:url var="addBookmark" action="bookmarkAdd"> + <s:param name="weblog" value="%{actionWeblog.handle}"/> + <s:param name="folderId" value="%{folder.id}"/> + </s:url> + <s:a href="%{addBookmark}"> + <span class="glyphicon glyphicon-plus"></span> + <s:text name="bookmarksForm.addBookmark"/> + </s:a> +</p> +--%> - <%-- Import bookmarks --%> - <p> - <img src='<s:url value="/images/link_add.png"/>' border="0"alt="icon" /> - <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> - </p> +<p> + <%-- Add Folder link --%> + <s:url var="addFolder" action="folderAdd"> + <s:param name="weblog" value="%{actionWeblog.handle}"/> + <s:param name="folderId" value="%{folder.id}"/> + </s:url> + <s:a href="%{addFolder}"> + <span class="glyphicon glyphicon-plus"></span> + <s:text name="bookmarksForm.addFolder"/> + </s:a> +</p> + +<%-- Import bookmarks +<p> + <s:url var="importBookmarks" action="bookmarksImport"> + <s:param name="weblog" value="%{actionWeblog.handle}"/> + </s:url> + <s:a href="%{importBookmarks}"> + <span class="glyphicon glyphicon-plus"></span> + <s:text name="bookmarksForm.importBookmarks"/> + </s:a> +</p> +--%> - <br /> - <br /> - </div> - - </div> - </div> -</div> http://git-wip-us.apache.org/repos/asf/roller/blob/525400ba/app/src/main/webapp/WEB-INF/tiles.xml ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/tiles.xml b/app/src/main/webapp/WEB-INF/tiles.xml index ba7f365..d738ca0 100644 --- a/app/src/main/webapp/WEB-INF/tiles.xml +++ b/app/src/main/webapp/WEB-INF/tiles.xml @@ -314,7 +314,7 @@ <definition name=".Bookmarks" extends=".tiles-tabbedpage" > <put-attribute name="content" value="/WEB-INF/jsps/editor/Bookmarks.jsp" /> - <put-attribute name="sidebar" value="/WEB-INF/jsps/tiles/empty.jsp" /> + <put-attribute name="sidebar" value="/WEB-INF/jsps/editor/BookmarksSidebar.jsp" /> <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" /> </definition>
