Fix: Buttons in the menu page (such as New Entry, Entries and so on) doesn't work.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/845faf2b Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/845faf2b Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/845faf2b Branch: refs/heads/bootstrap-ui Commit: 845faf2b0ea5ceaf782f5c02680f2623331d2d23 Parents: 8042fd7 Author: Kohei Nozaki <[email protected]> Authored: Wed Jan 6 12:58:00 2016 +0900 Committer: Kohei Nozaki <[email protected]> Committed: Wed Jan 6 12:58:00 2016 +0900 ---------------------------------------------------------------------- .../main/webapp/WEB-INF/jsps/core/MainMenu.jsp | 60 ++++++++++---------- 1 file changed, 29 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/845faf2b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp index 7b57b0d..da126a9 100644 --- a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp @@ -80,40 +80,40 @@ <div class="btn-group" role="group" aria-label="..."> <%-- New entry button --%> - <button type="button" class="btn btn-default"> - <s:url action="entryAdd" namespace="/roller-ui/authoring" id="newEntry"> - <s:param name="weblog" value="#perms.weblog.handle"/> - </s:url> + <s:url action="entryAdd" namespace="/roller-ui/authoring" id="newEntry"> + <s:param name="weblog" value="#perms.weblog.handle"/> + </s:url> + <s:a href="%{newEntry}" cssClass="btn btn-default"> <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> - <s:a href="%{newEntry}"><s:text name="yourWebsites.newEntry"/></s:a> - </button> + <s:text name="yourWebsites.newEntry"/> + </s:a> <s:if test='!(#perms.hasAction("edit_draft"))'> <%-- Show Entries button with count for users above LIMITED permission --%> - <button type="button" class="btn btn-default"> - <s:url action="entries" namespace="/roller-ui/authoring" id="editEntries"> - <s:param name="weblog" value="#perms.weblog.handle"/> - </s:url> + <s:url action="entries" namespace="/roller-ui/authoring" id="editEntries"> + <s:param name="weblog" value="#perms.weblog.handle"/> + </s:url> + <s:a href="%{editEntries}" cssClass="btn btn-default"> <span class="glyphicon glyphicon-list" aria-hidden="true"></span> - <s:a href="%{editEntries}"><s:text name="yourWebsites.editEntries"/></s:a> + <s:text name="yourWebsites.editEntries"/> <span class="badge"><s:property value="#perms.weblog.entryCount"/></span> - </button> - + </s:a> + </s:if> <s:if test='!(#perms.hasAction("edit_draft"))'> <%-- Show Comments button with count for users above LIMITED permission --%> - <button type="button" class="btn btn-default"> - <s:url action="comments" namespace="/roller-ui/authoring" id="manageComments"> - <s:param name="weblog" value="#perms.weblog.handle"/> - </s:url> + <s:url action="comments" namespace="/roller-ui/authoring" id="manageComments"> + <s:param name="weblog" value="#perms.weblog.handle"/> + </s:url> + <s:a href="%{manageComments}" cssClass="btn btn-default"> <span class="glyphicon glyphicon-comment" aria-hidden="true"></span> - <s:a href="%{manageComments}"><s:text name="yourWebsites.manageComments"/></s:a> + <s:text name="yourWebsites.manageComments"/> <span class="badge"><s:property value="#perms.weblog.commentCount"/></span> - </button> - + </s:a> + </s:if> @@ -132,22 +132,20 @@ <s:param name="weblog" value="#perms.weblog.handle" /> </s:url> </s:else> - <button type="button" class="btn btn-default"> + <a href='<s:property value="weblogTheme" />' class="btn btn-default"> <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span> - <a href='<s:property value="weblogTheme" />'> - <s:text name="yourWebsites.theme" /></a> - </button> + <s:text name="yourWebsites.theme" /> + </a> </s:if> <%-- settings button --%> - <button type="button" class="btn btn-default"> - <s:url action="weblogConfig" namespace="/roller-ui/authoring" id="manageWeblog"> - <s:param name="weblog" value="#perms.weblog.handle"/> - </s:url> + <s:url action="weblogConfig" namespace="/roller-ui/authoring" id="manageWeblog"> + <s:param name="weblog" value="#perms.weblog.handle"/> + </s:url> + <a href='<s:property value="manageWeblog" />' class="btn btn-default"> <span class="glyphicon glyphicon-cog" aria-hidden="true"></span> - <a href='<s:property value="manageWeblog" />'> - <s:text name="yourWebsites.manage"/></a> - </button> + <s:text name="yourWebsites.manage"/> + </a> </s:if>
