progress towards modal confirmation dialogs on bookmarks page.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/f76eb9d9 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/f76eb9d9 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/f76eb9d9 Branch: refs/heads/bootstrap-ui Commit: f76eb9d9f55501679b1b39e56545652bf716a51f Parents: 0f5c869 Author: Dave Johnson <[email protected]> Authored: Mon Mar 28 08:25:21 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Mon Mar 28 08:25:21 2016 -0400 ---------------------------------------------------------------------- .../resources/ApplicationResources.properties | 4 +- .../webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 62 +++++++++++++++++++- .../webapp/WEB-INF/jsps/editor/Categories.jsp | 3 +- 3 files changed, 65 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/f76eb9d9/app/src/main/resources/ApplicationResources.properties ---------------------------------------------------------------------- diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties index ac0f1a8..45b1e2c 100644 --- a/app/src/main/resources/ApplicationResources.properties +++ b/app/src/main/resources/ApplicationResources.properties @@ -110,7 +110,9 @@ bookmarksForm.noresults=There are currently no Blogroll links bookmarksForm.addBlogroll.title=Add New Blogroll bookmarksForm.editBlogroll.title=Edit Blogroll bookmarksForm.blogroll.requiredFields=You must specify a blogroll name -bookmarkForm.error.duplicateName=No duplicate blogroll names + +blogrollDeleteOK.removeBlogroll=Confirm Blogroll Delete +blogrollDeleteOK.areYouSure=Are you sure you want to delete blogroll # --------------------------------------------------------- Bookmarks import.jsp http://git-wip-us.apache.org/repos/asf/roller/blob/f76eb9d9/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 ee4eb61..0ed4f00 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp @@ -321,11 +321,19 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and } function deleteFolder() { - // TODO: do not use plain old DHTML confirm here + + $('#boomarks_delete_folder_folderId').val('<s:text name="%{folder.id}"/>'); + + $('#deleteBlogrollName').html('<s:text name="%{folder.name}"/>'); + + $('#delete-blogroll-modal').modal({show: true}); + + <%-- if (confirm("<s:text name='bookmarksForm.deleteFolder.confirm' />")) { document.bookmarks.action = '<s:url action="bookmarks!deleteFolder" />'; document.bookmarks.submit(); } + --%> } function onMoveToFolder() { @@ -452,6 +460,58 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and </script> + +<%-- ========================================================================================== --%> + +<%-- delete blogroll confirmation modal --%> + +<div id="delete-blogroll-modal" class="modal fade delete-blogroll-modal" tabindex="-1" role="dialog"> + + <div class="modal-dialog modal-lg"> + + <div class="modal-content"> + + <div class="modal-header"> + <h3> + <s:text name="blogrollDeleteOK.removeBlogroll"/>: + <span id="blogroll-name"></span> + </h3> + </div> + + <s:form id="boomarks_delete_folder" action="bookmarks!deleteFolder" theme="bootstrap" cssClass="form-horizontal"> + <s:hidden name="salt"/> + <s:hidden name="weblog"/> + <s:hidden name="folderId"/> + + <div class="modal-body"> + <s:text name="blogrollDeleteOK.areYouSure"></s:text> + <span id="deleteBlogrollName"></span>? + </div> + + <div class="modal-footer"> + <s:submit cssClass="btn" value="%{getText('generic.yes')}"/> + <button type="button" class="btn btn-default btn-primary" data-dismiss="modal"> + <s:text name="generic.no" /> + </button> + </div> + + </s:form> + + </div> + </div> +</div> + +<script> + + function showBlogrollDeleteModal( id, name ) { + $('#blogrollRemove_removeId').val(id); + $('#blogroll-name').html(name); + $('#delete-remove-modal').modal({show: true}); + } + +</script> + + <%-- ================================================================================================ --%> <%-- add/edit link form: a modal --%> http://git-wip-us.apache.org/repos/asf/roller/blob/f76eb9d9/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp index ad6fb62..0f159ff 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp @@ -235,8 +235,7 @@ </div> <div class="modal-footer"> - <s:submit cssClass="btn" - value="%{getText('generic.yes')}"/> + <s:submit cssClass="btn" value="%{getText('generic.yes')}"/> <button type="button" class="btn btn-default btn-primary" data-dismiss="modal"> <s:text name="generic.no" /> </button>
