More progress: the Entries page is essentially complete.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/bf13e4f3 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/bf13e4f3 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/bf13e4f3 Branch: refs/heads/bootstrap-ui Commit: bf13e4f31aa21c76dd1c5e2c0e8aa67891a1da50 Parents: 2da6c3c Author: Dave Johnson <[email protected]> Authored: Tue Dec 22 18:27:06 2015 -0500 Committer: Dave Johnson <[email protected]> Committed: Tue Dec 22 18:27:06 2015 -0500 ---------------------------------------------------------------------- .../main/webapp/WEB-INF/jsps/core/MainMenu.jsp | 39 ++-- .../main/webapp/WEB-INF/jsps/editor/Entries.jsp | 233 +++++++++++-------- .../WEB-INF/jsps/editor/EntriesSidebar.jsp | 151 +++++------- .../webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 137 ++++++----- .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp | 16 +- .../webapp/WEB-INF/jsps/editor/EntrySidebar.jsp | 43 ++-- .../webapp/WEB-INF/jsps/tiles/head-ajax.jsp | 20 +- app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp | 22 +- .../main/webapp/WEB-INF/jsps/tiles/messages.jsp | 4 +- .../WEB-INF/jsps/tiles/tiles-mainmenupage.jsp | 2 +- .../WEB-INF/jsps/tiles/tiles-tabbedpage.jsp | 7 +- app/src/main/webapp/roller-ui/styles/roller.css | 31 ++- 12 files changed, 374 insertions(+), 331 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/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 6a5b547..7b57b0d 100644 --- a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp @@ -122,35 +122,24 @@ <%-- And only show theme option if custom themes are enabled --%> <s:if test="getProp('themes.customtheme.allowed')"> - <s:if test="#perms.weblog.editorTheme == 'custom'"> - - <%-- Templates button --%> - <button type="button" class="btn btn-default"> - <s:url action="templates" namespace="/roller-ui/authoring" id="weblogTheme"> - <s:param name="weblog" value="#perms.weblog.handle"/> - </s:url> - </button> - + <s:url action="templates" namespace="/roller-ui/authoring" id="weblogTheme"> + <s:param name="weblog" value="#perms.weblog.handle" /> + </s:url> </s:if> <s:else> - - <%-- Theme edit button --%> - <button type="button" class="btn btn-default"> - <s:url action="themeEdit" namespace="/roller-ui/authoring" id="weblogTheme"> - <s:param name="weblog" value="#perms.weblog.handle"/> - </s:url> - <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span> - <a href='<s:property value="weblogTheme" />'> - <s:text name="yourWebsites.theme"/></a> - </button> - + <s:url action="themeEdit" namespace="/roller-ui/authoring" id="weblogTheme"> + <s:param name="weblog" value="#perms.weblog.handle" /> + </s:url> </s:else> - + <button type="button" 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:if> - - - <%-- Resign button --%> + + <%-- 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"/> @@ -162,7 +151,7 @@ </s:if> - <%-- don't allow last admin to resign from blog --%> + <%-- don't allow last admin to resign from blog --%> <s:if test='!(#perms.hasAction("admin") && #perms.weblog.adminUserCount == 1)'> <button type="button" class="btn btn-default"> http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp index 2aa9d38..27b4aa6 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp @@ -28,76 +28,32 @@ <%-- ============================================================= --%> -<%-- Number of entries and date message --%> +<%-- Next / previous links --%> <%-- ============================================================= --%> -<div class="tablenav"> - - <div style="float:left;"> - <s:text name="weblogEntryQuery.nowShowing"> - <s:param value="pager.items.size()" /> - </s:text> - </div> - <s:if test="pager.items.size() > 0"> - <div style="float:right;"> - <s:if test="firstEntry.pubTime != null"> - <s:text name="weblogEntryQuery.date.toStringFormat"> - <s:param value="firstEntry.pubTime" /> - </s:text> - </s:if> - --- - <s:if test="lastEntry.pubTime != null"> - <s:text name="weblogEntryQuery.date.toStringFormat"> - <s:param value="lastEntry.pubTime" /> - </s:text> - </s:if> - </div> - </s:if> - <br /> - - - <%-- ============================================================= --%> - <%-- Next / previous links --%> - <%-- ============================================================= --%> - - <s:if test="pager.prevLink != null && pager.nextLink != null"> - <br /><center> - « - <a href='<s:property value="pager.prevLink" />'> - <s:text name="weblogEntryQuery.prev" /></a> - | <a href='<s:property value="pager.nextLink" />'> - <s:text name="weblogEntryQuery.next" /></a> - » - </center><br /> - </s:if> - <s:elseif test="pager.prevLink != null"> - <br /><center> - « - <a href='<s:property value="pager.prevLink" />'> - <s:text name="weblogEntryQuery.prev" /></a> - | <s:text name="weblogEntryQuery.next" /> - » - </center><br /> - </s:elseif> - <s:elseif test="pager.nextLink != null"> - <br /><center> - « - <s:text name="weblogEntryQuery.prev" /> - | <a class="" href='<s:property value="pager.nextLink" />'> - <s:text name="weblogEntryQuery.next" /></a> - » - </center><br /> - </s:elseif> - <s:else><br /></s:else> +<nav> + <ul class="pager"> + <s:if test="pager.prevLink != null"> + <li class="previous"> + <a href='<s:property value="pager.prevLink" />'> + <span aria-hidden="true">←</span>Newer</a> + </li> + </s:if> + <s:if test="pager.nextLink != null"> + <li class="next"> + <a href='<s:property value="pager.nextLink"/>'>Older + <span aria-hidden="true">→</span></a> + </li> + </s:if> + </ul> +</nav> -</div> <%-- class="tablenav" --%> - <%-- ============================================================= --%> <%-- Entry table--%> <%-- ============================================================= --%> -<p> +<p style="text-align: center"> <span class="draftEntryBox"> </span> <s:text name="weblogEntryQuery.draft" /> <span class="pendingEntryBox"> </span> @@ -106,9 +62,11 @@ <s:text name="weblogEntryQuery.scheduled" /> </p> -<table class="rollertable" width="100%"> +<table class="rollertable table table-striped" width="100%"> <tr> + <th class="rollertable" width="5%"> </th> + <th class="rollertable" width="5%"> </th> <th class="rollertable" width="5%"> <s:text name="weblogEntryQuery.pubTime" /> </th> @@ -121,12 +79,6 @@ <th class="rollertable" width="5%"> <s:text name="weblogEntryQuery.category" /> </th> - <th class="rollertable" width="5%"> - </th> - <th class="rollertable" width="5%"> - </th> - <th class="rollertable" width="5%"> - </th> </tr> <s:iterator id="post" value="pager.items"> @@ -143,6 +95,26 @@ <s:else> <tr> </s:else> + + <td> + <s:url var="editUrl" action="entryEdit"> + <s:param name="weblog" value="%{actionWeblog.handle}" /> + <s:param name="bean.id" value="#post.id" /> + </s:url> + <s:a href="%{editUrl}"><span class="glyphicon glyphicon-edit"></s:a> + </td> + + <td> + <s:url var="deleteUrl" action="entryRemoveViaList"> + <s:param name="weblog" value="%{actionWeblog.handle}" /> + <s:param name="removeId" value="#post.id" /> + </s:url> + <s:set name="postId" value="#post.id" /> + <s:set name="postTitle" value="#post.title" /> + <a href="#" + onclick="showDeleteModal('<s:property value="postId" />', '<s:property value="postTitle"/>' )"> + <span class="glyphicon glyphicon-trash"></span></a> + </td> <td> <s:if test="#post.pubTime != null"> @@ -161,33 +133,18 @@ </td> <td> - <str:truncateNicely upper="80"><s:property value="#post.displayTitle" /></str:truncateNicely> - </td> - - <td> - <s:property value="#post.category.name" /> - </td> - - <td> <s:if test="#post.status.name() == 'PUBLISHED'"> - <a href='<s:property value="#post.permalink" />'><s:text name="weblogEntryQuery.view" /></a> + <a href='<s:property value="#post.permalink" />'> + <str:truncateNicely upper="80"><s:property value="#post.displayTitle" /></str:truncateNicely> + </a> </s:if> + <s:else> + <str:truncateNicely upper="80"><s:property value="#post.displayTitle" /></str:truncateNicely> + </s:else> </td> - - <td> - <s:url var="editUrl" action="entryEdit"> - <s:param name="weblog" value="%{actionWeblog.handle}" /> - <s:param name="bean.id" value="#post.id" /> - </s:url> - <s:a href="%{editUrl}"><s:text name="generic.edit" /></s:a> - </td> - + <td> - <s:url var="deleteUrl" action="entryRemoveViaList"> - <s:param name="weblog" value="%{actionWeblog.handle}" /> - <s:param name="removeId" value="#post.id" /> - </s:url> - <s:a href="%{deleteUrl}"><s:text name="generic.delete" /></s:a> + <s:property value="#post.category.name" /> </td> </tr> @@ -195,7 +152,97 @@ </table> + +<%-- ============================================================= --%> +<%-- Next / previous links --%> +<%-- ============================================================= --%> + +<nav> + <ul class="pager"> + <s:if test="pager.prevLink != null"> + <li class="previous"> + <a href='<s:property value="pager.prevLink" />'> + <span aria-hidden="true">←</span> Older</a> + </li> + </s:if> + <s:if test="pager.nextLink != null"> + <li class="next"> + <a href='<s:property value="pager.nextLink"/>'>Newer + <span aria-hidden="true">→</span></a> + </li> + </s:if> + </ul> +</nav> + <s:if test="pager.items.isEmpty"> <s:text name="weblogEntryQuery.noneFound" /> - <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /> </s:if> + + +<div id="delete-entry-modal" class="modal fade delete-entry-modal" tabindex="-1" role="dialog"> + + <div class="modal-dialog modal-lg"> + + <div class="modal-content"> + + <s:set var="deleteAction">entryRemoveViaList!remove</s:set> + + <s:form action="%{#deleteAction}" theme="bootstrap"> + <s:hidden name="salt"/> + <s:hidden name="weblog"/> + <s:hidden name="removeId" id="removeId"/> + + <div class="modal-header"> + <div class="modal-title"> + <h3><s:text name="weblogEntryRemove.removeWeblogEntry"/></h3> + <p><s:text name="weblogEntryRemove.areYouSure"/></p> + </div> + </div> + + <div class="modal-header"> + + <div class="form-group"> + <label class="col-sm-3 control-label"> + <s:text name="weblogEntryRemove.entryTitle"/> + </label> + <div class="col-sm-9 controls"> + <p class="form-control-static" style="padding-top:0px" id="postTitleLabel"></p> + </div> + </div> + + <div class="form-group"> + <label class="col-sm-3 control-label"> + <s:text name="weblogEntryRemove.entryId"/> + </label> + <div class="col-sm-9 controls"> + <p class="form-control-static" style="padding-top:0px" id="postIdLabel"></p> + </div> + </div> + + </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 showDeleteModal( postId, postTitle ) { + $('#postIdLabel').html(postId); + $('#postTitleLabel').html(postTitle); + $('#removeId').val(postId); + $('#delete-entry-modal').modal({show: true}); + } +</script> + + http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp index c1903db..8d9f376 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp @@ -17,8 +17,7 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' /> -<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script> +<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>'/> <script src='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script> <div class="sidebarFade"> @@ -27,128 +26,106 @@ <div class="sidebarInner"> - <h3><s:text name="weblogEntryQuery.sidebarTitle" /></h3> - <hr size="1" noshade="noshade" /> + <h3><s:text name="weblogEntryQuery.sidebarTitle"/></h3> + <hr size="1" noshade="noshade"/> - <p><s:text name="weblogEntryQuery.sidebarDescription" /></p> + <p><s:text name="weblogEntryQuery.sidebarDescription"/></p> - <s:form action="entries"> - <s:hidden name="salt" /> - <s:hidden name="weblog" /> + <s:form action="entries" theme="bootstrap" cssClass="form-vertical"> + <s:hidden name="salt"/> + <s:hidden name="weblog"/> <%-- ========================================================= --%> <%-- filter by category --%> - <div class="sideformrow"> - <label for="categoryId" class="sideformrow"> - <s:text name="weblogEntryQuery.label.category" /></label> - <s:select name="bean.categoryName" list="categories" listKey="name" listValue="name" size="1" /> - </div> - <br /> - <br /> + <s:select name="bean.categoryName" + label="%{getText('weblogEntryQuery.label.category')}" + list="categories" listKey="name" listValue="name" size="1"/> <%-- ========================================================= --%> <%-- filter by tag --%> - <div class="sideformrow"> - <label for="tags" class="sideformrow"> - <s:text name="weblogEntryQuery.label.tags" /></label> - <s:textfield name="bean.tagsAsString" size="14" /> - </div> - <br /> - <br /> + <s:textfield name="bean.tagsAsString" size="14" + label="%{getText('weblogEntryQuery.label.tags')}"/> <%-- ========================================================= --%> <%-- filter by text --%> - <div class="sideformrow"> - <label for="text" class="sideformrow"> - <s:text name="weblogEntryQuery.label.text" /></label> - <s:textfield name="bean.text" size="14" /> - </div> - <br /> - <br /> + <s:textfield name="bean.text" size="14" + label="%{getText('weblogEntryQuery.label.text')}"/> <%-- ========================================================= --%> <%-- filter by date --%> - <div class="sideformrow"> - <label for="startDateString" class="sideformrow"><s:text name="weblogEntryQuery.label.startDate" />:</label> - <script> - $(function() { - $( "#entries_bean_startDateString" ).datepicker({ - showOn: "button", - buttonImage: "../../images/calendar.png", - buttonImageOnly: true, - changeMonth: true, - changeYear: true - }); + <script> + $(function () { + $("#entries_bean_startDateString").datepicker(); }); - </script> - <s:textfield name="bean.startDateString" size="12" readonly="true"/> - </div> + </script> - <div class="sideformrow"> - <label for="endDateString" class="sideformrow"><s:text name="weblogEntryQuery.label.endDate" />:</label> - <script> - $(function() { - $( "#entries_bean_endDateString" ).datepicker({ - showOn: "button", - buttonImage: "../../images/calendar.png", - buttonImageOnly: true, - changeMonth: true, - changeYear: true - }); + <div class="control-group"> + <label for="bean.startDateString" class="control-label"> + <s:text name="weblogEntryQuery.label.startDate" /> + </label> + <div class="controls"> + <div class="input-group"> + + <s:textfield name="bean.startDateString" readonly="true" + theme="simple" cssClass="date-picker form-control" /> + <label for="bean.startDateString" class="input-group-addon btn"> + <span class="glyphicon glyphicon-calendar"></span> + </label> + + </div> + </div> + </div> + + <script> + $(function () { + $("#entries_bean_endDateString").datepicker(); }); - </script> - <s:textfield name="bean.endDateString" size="12" readonly="true"/> + </script> + + <div class="control-group"> + <label for="bean.endDateString" class="control-label"> + <s:text name="weblogEntryQuery.label.endDate" /> + </label> + <div class="controls"> + <div class="input-group"> + + <s:textfield name="bean.endDateString" readonly="true" + theme="simple" cssClass="date-picker form-control" /> + <label for="bean.endDateString" class="input-group-addon btn"> + <span class="glyphicon glyphicon-calendar"></span> + </label> + + </div> + </div> </div> - <br /> - <br /> + <br/> + <%-- ========================================================= --%> <%-- filter by status --%> - <div class="sideformrow"> - <label for="status" class="sideformrow"> - <s:text name="weblogEntryQuery.label.status" />: - <br /> - <br /> - <br /> - <br /> - <br /> - <br /> - </label> - <div> - <s:radio theme="roller" name="bean.status" list="statusOptions" listKey="key" listValue="value" /> - </div> - </div> + <s:radio name="bean.status" + label="%{getText('weblogEntryQuery.label.status')}" + list="statusOptions" listKey="key" listValue="value"/> <%-- ========================================================= --%> <%-- sort by --%> - <div class="sideformrow"> - <label for="status" class="sideformrow"> - <s:text name="weblogEntryQuery.label.sortby" />: - <br /> - <br /> - </label> - <div> - <s:radio theme="roller" name="bean.sortBy" list="sortByOptions" listKey="key" listValue="value" /> - </div> - </div> + <s:radio name="bean.sortBy" + label="%{getText('weblogEntryQuery.label.sortby')}" + list="sortByOptions" listKey="key" listValue="value"/> <%-- ========================================================= --%> <%-- search button --%> - <br /> - - <s:submit value="%{getText('weblogEntryQuery.button.query')}" /> + <s:submit cssClass="btn" value="%{getText('weblogEntryQuery.button.query')}"/> </s:form> - <br /> - <br /> </div> <!-- sidebarInner --> </div> http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp index 1a54a2f..b5ba20b 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp @@ -57,81 +57,92 @@ <%-- Title, category, dates and other metadata --%> <%-- title --%> - <s:textfield label="%{getText('weblogEdit.title')}" name="bean.title" maxlength="255" tabindex="1"/> - - <%-- status --%> - <div class="form-group"> - <label class="col-sm-3 control-label" for="weblogEdit.status"><s:text name="weblogEdit.status"/></label> - - <div class="col-sm-9 controls"> - <s:if test="bean.published"> - <span class="label label-success"> - <s:text name="weblogEdit.published"/> - (<s:text name="weblogEdit.updateTime"/> - <s:date name="entry.updateTime"/>) - </span> - </s:if> - <s:elseif test="bean.draft"> - <span class="label label-info"> - <s:text name="weblogEdit.draft"/> - (<s:text name="weblogEdit.updateTime"/> - <s:date name="entry.updateTime"/>) - </span> - </s:elseif> - <s:elseif test="bean.pending"> - <span class="label label-warning"> - <s:text name="weblogEdit.pending"/> - (<s:text name="weblogEdit.updateTime"/> - <s:date name="entry.updateTime"/>) - </span> - </s:elseif> - <s:elseif test="bean.scheduled"> - <span class="label label-info"> - <s:text name="weblogEdit.scheduled"/> - (<s:text name="weblogEdit.updateTime"/> - <s:date name="entry.updateTime"/>) - </span> - </s:elseif> - <s:else> - <span class="label label-danger"><s:text name="weblogEdit.unsaved"/></span> - </s:else> - </div> - - </div> + <s:textfield label="%{getText('weblogEdit.title')}" name="bean.title" maxlength="255" tabindex="1" /> <%-- permalink --%> <s:if test="actionName == 'entryEdit'"> <div class="form-group"> - <label for="entry_bean_permalink"><s:text name="weblogEdit.permaLink"/></label> - <s:if test="bean.published"> - <a id="entry_bean_permalink" href='<s:property value="entry.permalink" />'> - <s:property value="entry.permalink"/> - </a> - <img src='<s:url value="/images/launch-link.png"/>'/> - </s:if> - <s:else> - <s:property value="entry.permalink"/> - </s:else> + + <label class="col-sm-3 control-label" for="entry_bean_permalink"> + <s:text name="weblogEdit.permaLink"/> + </label> + + <div class="col-sm-9 controls"> + <p class="form-control-static"> + <s:if test="bean.published"> + <a id="entry_bean_permalink" href='<s:property value="entry.permalink" />'> + <s:property value="entry.permalink"/> + </a> + <img src='<s:url value="/images/launch-link.png"/>'/> + </s:if> + <s:else> + <s:property value="entry.permalink"/> + </s:else> + </p> + </div> + </div> </s:if> <%-- tags --%> <s:textfield label="%{getText('weblogEdit.tags')}" id="tagAutoComplete" name="bean.tagsAsString" - maxlength="255" tabindex="3"/> + maxlength="255" tabindex="2"/> <%-- category --%> <s:select label="%{getText('weblogEdit.category')}" name="bean.categoryId" - list="categories" listKey="id" listValue="name"/> + list="categories" listKey="id" listValue="name" tabindex="3" /> <s:if test="actionWeblog.enableMultiLang"> + <%-- locale --%> <s:select label="%{getText('weblogEdit.locale')}" name="bean.locale" size="1" - list="localesList" listValue="displayName"/> + list="localesList" listValue="displayName" tabindex="4"/> </s:if> - <s:else> <s:hidden name="bean.locale"/> </s:else> + <%-- status --%> + <div class="form-group"> + <label class="col-sm-3 control-label" for="weblogEdit.status"><s:text name="weblogEdit.status"/></label> + + <div class="col-sm-9 controls"> + <p class="form-control-static"> + <s:if test="bean.published"> + <span class="label label-success"> + <s:text name="weblogEdit.published"/> + (<s:text name="weblogEdit.updateTime"/> + <s:date name="entry.updateTime"/>) + </span> + </s:if> + <s:elseif test="bean.draft"> + <span class="label label-info"> + <s:text name="weblogEdit.draft"/> + (<s:text name="weblogEdit.updateTime"/> + <s:date name="entry.updateTime"/>) + </span> + </s:elseif> + <s:elseif test="bean.pending"> + <span class="label label-warning"> + <s:text name="weblogEdit.pending"/> + (<s:text name="weblogEdit.updateTime"/> + <s:date name="entry.updateTime"/>) + </span> + </s:elseif> + <s:elseif test="bean.scheduled"> + <span class="label label-info"> + <s:text name="weblogEdit.scheduled"/> + (<s:text name="weblogEdit.updateTime"/> + <s:date name="entry.updateTime"/>) + </span> + </s:elseif> + <s:else> + <span class="label label-danger"><s:text name="weblogEdit.unsaved"/></span> + </s:else> + </p> + </div> + + </div> + <div class="panel-group" id="accordion"> @@ -147,13 +158,13 @@ <div class="panel-heading"> <h4 class="panel-title"> - <a aria-expanded="false" - data-toggle="collapse" data-target="#collapsePlugins" href="#collapsePlugins"> + <a class="collapsed" data-toggle="collapse" data-target="#collapsePlugins" + href="#collapsePlugins"> <s:text name="weblogEdit.pluginsToApply"/> </a> </h4> </div> - <div id="collapsePlugins" class="panel-collapse collapse in"> + <div id="collapsePlugins" class="panel-collapse collapse"> <div class="panel-body"> <s:checkboxlist name="bean.plugins" list="entryPlugins" listKey="name" listValue="name"/> @@ -170,13 +181,13 @@ <div class="panel-heading"> <h4 class="panel-title"> - <a class="accordion-toggle" aria-expanded="false" - data-toggle="collapse" data-parent="#collapseAdvanced" href="#collapseAdvanced"> + <a class="collapsed" data-toggle="collapse" data-parent="#collapseAdvanced" + href="#collapseAdvanced"> <s:text name="weblogEdit.miscSettings"/> </a> </h4> </div> - <div id="collapseAdvanced" class="panel-collapse collapse in"> + <div id="collapseAdvanced" class="panel-collapse collapse"> <div class="panel-body"> <div class="form-group"> @@ -327,8 +338,7 @@ <%-- ================================================================== --%> - <%-- Trackback control --%> - + <%-- Trackback control <s:if test="actionName == 'entryEdit' && userAnAuthor"> <br/> <h2><s:text name="weblogEdit.trackback"/></h2> @@ -338,6 +348,7 @@ <s:submit value="%{getText('weblogEdit.sendTrackback')}" action="entryEdit!trackback"/> </s:if> + --%> </s:form> http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp index d881f87..110b07f 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp @@ -34,11 +34,13 @@ <div id="collapseContentEditor" class="panel-collapse collapse in"> <div class="panel-body"> - <span style="font-weight:normal;float:right;"> + <s:textarea id="edit_content" name="bean.text" + tabindex="5" rows="18" cssClass="col-sm-12" theme="simple" + /> + + <span> <a href="#" onClick="onClickAddImage();"><s:text name="weblogEdit.insertMediaFile"/></a> </span> - - <s:textarea id="edit_content" name="bean.text" cols="75" rows="25" tabindex="5"/> </div> </div> @@ -50,18 +52,18 @@ <div class="panel-heading"> <h4 class="panel-title"> - <a href="#collapseSummaryEditor" - aria-controls="collapseSummaryEditor" aria-expanded="false" + <a href="#collapseSummaryEditor" class="collapsed" data-toggle="collapse" data-target="#collapseSummaryEditor" > <s:text name="weblogEdit.summary"/> </a> </h4> </div> - <div id="collapseSummaryEditor" class="panel-collapse collapse in"> + <div id="collapseSummaryEditor" class="panel-collapse collapse"> <div class="panel-body"> - <s:textarea id="edit_summary" name="bean.summary" cols="75" rows="10" tabindex="6"/> + <s:textarea id="edit_summary" name="bean.summary" + tabindex="6" rows="10" cssClass="col-sm-12" theme="simple" /> </div> </div> http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp index 39b7428..8d4b1a2 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp @@ -22,6 +22,8 @@ <div class="menu-tl"> <div class="sidebarInner"> + + <%-- comments on this entry --%> <h3><s:text name="weblogEdit.comments" /></h3> @@ -38,7 +40,9 @@ <s:else> <span><s:text name="generic.none" /></span> </s:else> - + + <%-- pending entries --%> + <hr size="1" noshade="noshade" /> <h3><s:text name="weblogEdit.pendingEntries" /></h3> @@ -52,12 +56,13 @@ <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="#post.id" /> </s:url> - <img src='<s:url value="/images/table_error.png"/>' - align="absmiddle" border="0" alt="icon" title="Edit" /> - <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property value="#post.title" /></str:truncateNicely></s:a> + <span class="glyphicon glyphicon-lock" aria-hidden="true"> </span> + <s:a href="%{editUrl}"><str:truncateNicely lower="70"> + <s:property value="#post.title" /></str:truncateNicely></s:a> </span><br /> </s:iterator> - + + <%-- draft entries --%> <hr size="1" noshade="noshade" /> <h3><s:text name="weblogEdit.draftEntries" /></h3> @@ -72,15 +77,17 @@ <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="#post.id" /> </s:url> - <img src='<s:url value="/images/table_edit.png"/>' - align="absmiddle" border="0" alt="icon" title="Edit" /> - <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property value="#post.title" /></str:truncateNicely></s:a> + <span class="glyphicon glyphicon-edit" aria-hidden="true"> </span> + <s:a href="%{editUrl}"><str:truncateNicely lower="70"> + <s:property value="#post.title" /></str:truncateNicely></s:a> </span><br /> </s:iterator> <s:if test="userAnAuthor"> - + + <%-- published entries --%> + <hr size="1" noshade="noshade" /> <h3><s:text name="weblogEdit.publishedEntries" /></h3> @@ -94,13 +101,15 @@ <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="#post.id" /> </s:url> - <img src='<s:url value="/images/table_edit.png"/>' - align="absmiddle" border="0" alt="icon" title="Edit" /> - <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property value="#post.title" /></str:truncateNicely></s:a> + <span class="glyphicon glyphicon-book" aria-hidden="true"> </span> + <s:a href="%{editUrl}"><str:truncateNicely lower="70"> + <s:property value="#post.title" /></str:truncateNicely></s:a> </span><br /> </s:iterator> - - + + + <%-- scheduled entries --%> + <hr size="1" noshade="noshade" /> <h3><s:text name="weblogEdit.scheduledEntries" /></h3> @@ -114,9 +123,9 @@ <s:param name="weblog" value="%{actionWeblog.handle}" /> <s:param name="bean.id" value="#post.id" /> </s:url> - <img src='<s:url value="/images/table_edit.png"/>' - align="absmiddle" border="0" alt="icon" title="Edit" /> - <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property value="#post.title" /></str:truncateNicely></s:a> + <span class="glyphicon glyphicon-time" aria-hidden="true"> </span> + <s:a href="%{editUrl}"><str:truncateNicely lower="70"> + <s:property value="#post.title" /></str:truncateNicely></s:a> </span><br /> </s:iterator> http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp index 2acbab6..2a978ba 100644 --- a/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp @@ -5,31 +5,21 @@ You can override it with your own file via WEB-INF/tiles-def.xml <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<%-- -<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssreset/cssreset-min.css'/>" /> -<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssfonts/cssfonts-min.css'/>" /> -<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssbase/cssbase-min.css'/>" /> -<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/layout.css"/>' /> -<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' /> -<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/menu.css"/>' /> -<link rel="stylesheet" media="all" href="<s:url value="/roller-ui/theme/"/><s:property value="getProp('editor.theme')" />/colors.css" /> ---%> - -<%-- jquery and bootstrap --%> - +<%-- jquery --%> <script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script> + +<%-- bootstrap --%> <link rel="stylesheet" media="all" href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.min.css"/>' /> <link rel="stylesheet" media="all" href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css"/>' /> <script src="<s:url value="/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.min.js"/>"></script> -<%-- the links generated by the Struts-Bootstrap plugin are 404s --%> - +<%-- the links generated by the Struts-Bootstrap plugin are 404s <sb:head includeScripts="false" includeScriptsValidation="false"/> +--%> <%-- roller Javascropt and styles --%> - <link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' /> <script src="<s:url value="/theme/scripts/roller.js"/>"></script> http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp index 23efc18..7b7291c 100644 --- a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp @@ -5,30 +5,20 @@ You can override it with your own file via WEB-INF/tiles-def.xml <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<%-- -<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssreset/cssreset-min.css'/>" /> -<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssfonts/cssfonts-min.css'/>" /> -<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssbase/cssbase-min.css'/>" /> -<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/layout.css"/>' /> -<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' /> -<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/menu.css"/>' /> -<link rel="stylesheet" media="all" href="<s:url value="/roller-ui/theme/"/><s:property value="getProp('editor.theme')" />/colors.css" /> ---%> - -<%-- jquery and bootstrap --%> - +<%-- jquery --%> <script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script> + +<%-- bootstrap --%> <link rel="stylesheet" media="all" href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.min.css"/>' /> <link rel="stylesheet" media="all" href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css"/>' /> <script src="<s:url value="/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.min.js"/>"></script> -<%-- the links generated by the Struts-Bootstrap plugin are 404s --%> - -<sb:head includeScripts="false" includeScriptsValidation="false"/> +<%-- the links generated by the Struts-Bootstrap plugin are 404s +<sb:head includeScripts="false" includeScriptsValidation="false"></sb:head> +--%> <%-- roller Javascropt and styles --%> - <link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' /> <script src="<s:url value="/theme/scripts/roller.js"/>"></script> http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp index 5e54d5c..164ca5a 100644 --- a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp @@ -19,14 +19,14 @@ <%-- Success Messages --%> <s:if test="!actionMessages.isEmpty"> - <div id="messages" class="messages"> + <div id="messages" class="alert alert-success"> <s:actionmessage /> </div> </s:if> <%-- Error Messages --%> <s:if test="!actionErrors.isEmpty || !fieldErrors.isEmpty"> - <div id="errors" class="errors"> + <div id="errors" class="alert alert-danger"> <ul> <s:iterator id="actionError" value="actionErrors"> <li><s:property value="#actionError" escape="false" /></li> http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp index 9f5c3c5..0c89f15 100644 --- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp @@ -47,7 +47,7 @@ <div class="panel panel-default"> <div class="panel-body"> - <h1><s:property value="pageTitle"/></h1> + <h2 class="roller-page-title"><s:property value="pageTitle"/></h2> <tiles:insertAttribute name="messages"/> <tiles:insertAttribute name="content"/> </div> http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp index acf44be..7a735d1 100644 --- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp @@ -23,7 +23,6 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon"> <title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle"/></title> - <tiles:insertAttribute name="head"/> <style> <tiles:insertAttribute name="styles" /> </style> </head> @@ -32,16 +31,16 @@ <tiles:insertAttribute name="bannerStatus"/> <div class="row"> - <div class="col-md-9 roller-column-left"> + <div class="col-md-8 roller-column-left"> <div class="panel panel-default"> <div class="panel-body"> - <h2><s:property value="pageTitle"/></h2> <tiles:insertAttribute name="messages"/> + <h2 class="roller-page-title"><s:property value="pageTitle"/></h2> <tiles:insertAttribute name="content"/> </div> </div> </div> - <div class="col-md-3 roller-column-right"> + <div class="col-md-4 roller-column-right"> <div class="panel panel-default"> <div class="panel-body"> <s:if test="authenticatedUser != null || actionWeblog != null"> http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/roller-ui/styles/roller.css ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css index ca0f28d..4677e46 100644 --- a/app/src/main/webapp/roller-ui/styles/roller.css +++ b/app/src/main/webapp/roller-ui/styles/roller.css @@ -23,7 +23,8 @@ table { } .roller-page-title { - text-align: center; + margin-top: 0px; + margin-bottom: 5px; } .roller-column-right { @@ -36,6 +37,8 @@ table { padding-right: 1em; } +.date-form { margin: 10px; } + /* main menu */ .mm_subtable_label { @@ -78,6 +81,32 @@ table.mm_table_actions td { z-index: 10000 !important; } +/* entries page */ + +.scheduledEntryBox { + background: #EEEEE0; + border: 1px gray solid; +} + +.pendingEntryBox { + background: #ffcccc; + border: 1px gray solid; +} + +.draftEntryBox { + background: #ffffcc; + border: 1px gray solid; +} + +td.pendingentry, tr.pendingentry { + background: #ffcccc; +} +td.draftentry, tr.draftentry { + background: #ffffcc; +} +td.scheduledentry, tr.scheduledentry { + background: #EEEEE0; +} /* sign-in */
