Fix bad alignment of buttons below blogroll table on Safari
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/a3f685b2 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/a3f685b2 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/a3f685b2 Branch: refs/heads/bootstrap-ui Commit: a3f685b2289214a5b82e03a5476d0c67bc0b281f Parents: 3d5d89b Author: Dave Johnson <[email protected]> Authored: Sun Apr 10 14:21:44 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Sun Apr 10 14:21:44 2016 -0400 ---------------------------------------------------------------------- .../webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp | 91 -------------------- .../webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 45 ++++------ 2 files changed, 17 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/a3f685b2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp deleted file mode 100644 index cdb01b9..0000000 --- a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp +++ /dev/null @@ -1,91 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. The ASF licenses this file to You - under the Apache License, Version 2.0 (the "License"); you may not - use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. For additional information regarding - copyright in this work, please see the NOTICE file in the top level - directory of this distribution. ---%> -<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> - -<%-- Titling, processing actions different between add and edit --%> -<s:if test="actionName == 'bookmarkEdit'"> - <s:set var="subtitleKey">bookmarkForm.edit.subtitle</s:set> - <s:set var="mainAction">bookmarkEdit</s:set> -</s:if> -<s:else> - <s:set var="subtitleKey">bookmarkForm.add.subtitle</s:set> - <s:set var="mainAction">bookmarkAdd</s:set> -</s:else> - -<p class="subtitle"> - <s:text name="%{#subtitleKey}" > - <s:param value="bookmark.folder.name"/> - </s:text> -</p> - -<p class="pagetip"> - <s:text name="bookmarkForm.requiredFields"> - <s:param><s:text name="generic.name"/></s:param> - <s:param><s:text name="bookmarkForm.url"/></s:param> - </s:text> -</p> - -<s:form> - <s:hidden name="salt" /> - <s:hidden name="weblog" /> - <%-- - Edit action uses folderId for redirection back to proper bookmarks folder on cancel - (as configured in struts.xml); add action also, plus to know which folder to put new - bookmark in. - --%> - <s:hidden name="folderId" /> - <s:if test="actionName == 'bookmarkEdit'"> - <%-- bean for bookmark add does not have a bean id yet --%> - <s:hidden name="bean.id" /> - </s:if> - - <table> - - <tr> - <td><s:text name="generic.name" /></td> - <td><s:textfield name="bean.name" maxlength="255" size="70" style="width:50%"/></td> - </tr> - - <tr> - <td><s:text name="bookmarkForm.url" /></td> - <td><s:textfield name="bean.url" maxlength="255" size="70" style="width:50%"/></td> - </tr> - - <tr> - <td><s:text name="bookmarkForm.rssUrl" /></td> - <td><s:textfield name="bean.feedUrl" maxlength="255" size="70" style="width:50%"/></td> - </tr> - - <tr> - <td><s:text name="generic.description" /></td> - <td><s:textfield name="bean.description" maxlength="255" size="70" style="width:50%"/></td> - </tr> - - <tr> - <td><s:text name="bookmarkForm.image" /></td> - <td><s:textfield name="bean.image" maxlength="255" size="70" style="width:50%"/></td> - </tr> - - </table> - - <p> - <s:submit value="%{getText('generic.save')}" action="%{#mainAction}!save"/> - <s:submit value="%{getText('generic.cancel')}" action="bookmarkEdit!cancel" /> - </p> - -</s:form> http://git-wip-us.apache.org/repos/asf/roller/blob/a3f685b2/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 1f52b9a..8313cb9 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp @@ -179,44 +179,33 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and </table> <%-- Add new blogroll link --%> - <button type="button" - class="btn btn-success" style="float:left; margin-right: 0.5em" - onclick="addBookmark();return false;"> + <button type="button" class="btn btn-success" onclick="addBookmark();return false;" + style="float:left; margin-right: 2em"> <s:text name="bookmarksForm.addBookmark"/> </button> - <s:if test="folder.bookmarks.size > 0"> - - <%-- Delete-selected button --%> - <input id="delete_selected" - value="<s:text name="bookmarksForm.delete"/>" - type="button" class="btn btn-danger" style="float:right; margin-right: 0.5em" - onclick="confirmDeleteSelected();return false;"/> - - </s:if> - <s:if test="!allFolders.isEmpty && folder.bookmarks.size > 0"> - - <%-- Move-to combo-box --%> - <s:select name="targetFolderId" - theme="simple" cssClass="form-control" cssStyle="float:right; width:30%; margin-right: 5em" - list="allFolders" listKey="id" listValue="name"/> - <%-- Move-selected button --%> - <s:submit id="move_selected" - value="%{getText('bookmarksForm.move')}" - theme="simple" cssClass="btn btn-warning" cssStyle="float:right; margin-right: 0.5em" - action="bookmarks!move" - onclick="onMoveToFolder();return false;"/> + <s:submit id="move_selected" value="%{getText('bookmarksForm.move')}" theme="simple" + cssClass="btn btn-warning" cssStyle="float:left; margin-right: 0.5em" + action="bookmarks!move" onclick="onMoveToFolder();return false;"/> + <%-- Move-to combo-box --%> + <s:select name="targetFolderId" theme="simple" + cssClass="form-control" cssStyle="float:left; width:30%; margin-right: 2em" + list="allFolders" listKey="id" listValue="name"/> + </s:if> + <s:if test="folder.bookmarks.size > 0"> + <%-- Delete-selected button --%> + <input id="delete_selected" value="<s:text name="bookmarksForm.delete"/>" type="button" + class="btn btn-danger" style="float:left;" + onclick="confirmDeleteSelected();return false;"/> </s:if> <s:if test="folder.name != 'default'"> - <%-- Delete the whole blogroll --%> - - <s:submit value="%{getText('bookmarksForm.deleteFolder')}" - theme="simple" cssClass="btn btn-danger" cssStyle="float:right; clear:left; margin-top:2em" + <s:submit value="%{getText('bookmarksForm.deleteFolder')}" theme="simple" + cssClass="btn btn-danger" cssStyle="float:right; clear:left; margin-top:2em" action="bookmarks!deleteFolder" onclick="confirmDeleteFolder();return false;"/>
