Repository: roller Updated Branches: refs/heads/bootstrap-ui e83e5f811 -> bb92ba2ad
Weblog config and remove pages converted to Struts Bootstrap. Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/bb92ba2a Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/bb92ba2a Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/bb92ba2a Branch: refs/heads/bootstrap-ui Commit: bb92ba2ad1a92d81e062a34bd05a7a21a07163c2 Parents: e83e5f8 Author: Dave Johnson <[email protected]> Authored: Sat Aug 18 08:14:09 2018 -0400 Committer: Dave Johnson <[email protected]> Committed: Sat Aug 18 08:14:09 2018 -0400 ---------------------------------------------------------------------- .../ui/struts2/editor/WeblogConfig.java | 3 +- .../resources/ApplicationResources.properties | 3 +- .../resources/template/roller/checkboxlist.ftl | 106 ----------- .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp | 2 +- .../webapp/WEB-INF/jsps/editor/WeblogConfig.jsp | 190 +++++++------------ .../WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp | 49 ++--- 6 files changed, 98 insertions(+), 255 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/bb92ba2a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java index bcc9f57..9a7fde6 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java @@ -66,8 +66,7 @@ public class WeblogConfig extends UIAction { this.desiredMenu = "editor"; this.pageTitle = "websiteSettings.title"; } - - + public void myPrepare() { try { http://git-wip-us.apache.org/repos/asf/roller/blob/bb92ba2a/app/src/main/resources/ApplicationResources.properties ---------------------------------------------------------------------- diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties index c522cd9..297ff22 100644 --- a/app/src/main/resources/ApplicationResources.properties +++ b/app/src/main/resources/ApplicationResources.properties @@ -26,6 +26,7 @@ generic.none=None generic.cancel=Cancel generic.done=Done generic.yes=Yes +generic.yesRemove=Yes Remove generic.no=No generic.name=Name generic.description=Description @@ -1742,7 +1743,7 @@ NOT REVERSIBLE</b>. websiteRemove.title=Confirm Weblog Remove websiteRemove.subtitle=Weblog removal is <b>NOT REVERSIBLE</b> -websiteRemove.youSure=Are you sure you want to remove weblog [{0}]? +websiteRemove.youSure=Are you sure you want to remove the weblog <b style="color:red">{0}</b>? websiteRemove.websiteId=Weblog ID websiteRemove.websiteName=Weblog Name websiteRemove.success=Successfully removed weblog [{0}] http://git-wip-us.apache.org/repos/asf/roller/blob/bb92ba2a/app/src/main/resources/template/roller/checkboxlist.ftl ---------------------------------------------------------------------- diff --git a/app/src/main/resources/template/roller/checkboxlist.ftl b/app/src/main/resources/template/roller/checkboxlist.ftl deleted file mode 100644 index 0a9107b..0000000 --- a/app/src/main/resources/template/roller/checkboxlist.ftl +++ /dev/null @@ -1,106 +0,0 @@ -<#-- -/* - * Roller Modifications - * ==================== - * Add <br/> to the end - * - * $Id: checkboxlist.ftl 1366934 2012-07-29 20:10:06Z jogep $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. 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. - */ ---> -<#assign itemCount = 0/> -<#if parameters.list??> -<@s.iterator value="parameters.list"> - <#assign itemCount = itemCount + 1/> - <#if parameters.listKey??> - <#assign itemKey = stack.findValue(parameters.listKey)/> - <#else> - <#assign itemKey = stack.findValue('top')/> - </#if> - <#if parameters.listValue??> - <#assign itemValue = stack.findString(parameters.listValue)?default("")/> - <#else> - <#assign itemValue = stack.findString('top')/> - </#if> - <#if parameters.listCssClass??> - <#if stack.findString(parameters.listCssClass)??> - <#assign itemCssClass= stack.findString(parameters.listCssClass)/> - <#else> - <#assign itemCssClass = ''/> - </#if> - </#if> - <#if parameters.listCssStyle??> - <#if stack.findString(parameters.listCssStyle)??> - <#assign itemCssStyle= stack.findString(parameters.listCssStyle)/> - <#else> - <#assign itemCssStyle = ''/> - </#if> - </#if> - <#if parameters.listTitle??> - <#if stack.findString(parameters.listTitle)??> - <#assign itemTitle= stack.findString(parameters.listTitle)/> - <#else> - <#assign itemTitle = ''/> - </#if> - </#if> - <#assign itemKeyStr=itemKey.toString() /> -<input type="checkbox" name="${parameters.name?html}" value="${itemKeyStr?html}" - id="${parameters.name?html}-${itemCount}"<#rt/> - <#if tag.contains(parameters.nameValue, itemKey)> - checked="checked"<#rt/> - </#if> - <#if parameters.disabled?default(false)> - disabled="disabled"<#rt/> - </#if> - <#if itemCssClass?if_exists != ""> - class="${itemCssClass?html}"<#rt/> - <#else> - <#if parameters.cssClass??> - class="${parameters.cssClass?html}"<#rt/> - </#if> - </#if> - <#if itemCssStyle?if_exists != ""> - style="${itemCssStyle?html}"<#rt/> - <#else> - <#if parameters.cssStyle??> - style="${parameters.cssStyle?html}"<#rt/> - </#if> - </#if> - <#if itemTitle?if_exists != ""> - title="${itemTitle?html}"<#rt/> - <#else> - <#if parameters.title??> - title="${parameters.title?html}"<#rt/> - </#if> - </#if> - <#include "/${parameters.templateDir}/simple/css.ftl" /> - <#include "/${parameters.templateDir}/simple/scripting-events.ftl" /> - <#include "/${parameters.templateDir}/simple/common-attributes.ftl" /> - /> -<label for="${parameters.name?html}-${itemCount}" class="checkboxLabel">${itemValue?html}</label><br/><#-- Roller + <br/> --> -</@s.iterator> - <#else> - -</#if> -<input type="hidden" id="__multiselect_${parameters.id?html}" name="__multiselect_${parameters.name?html}" - value=""<#rt/> -<#if parameters.disabled?default(false)> - disabled="disabled"<#rt/> -</#if> - /> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/roller/blob/bb92ba2a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp index d9f8f11..90d75d6 100644 --- a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp @@ -21,7 +21,7 @@ <p><s:text name="configForm.prompt"/></p> -<s:form action="globalConfig!save" theme="bootstrap" cssClass="form-vertical"> +<s:form action="globalConfig!save" theme="bootstrap" cssClass="form-horizontal"> <s:hidden name="salt"/> http://git-wip-us.apache.org/repos/asf/roller/blob/bb92ba2a/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp index 356c775..ffd6f1a 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp @@ -28,8 +28,8 @@ <s:hidden name="weblog" value="%{actionWeblog.handle}" /> <%-- ***** General settings ***** --%> - - <s:text name="websiteSettings.generalSettings" /> + + <h2><s:text name="websiteSettings.generalSettings" /></h2> <s:textfield label="%{getText('websiteSettings.websiteTitle')}" name="bean.name" size="30" maxlength="40" /> @@ -46,169 +46,117 @@ <s:textfield label="%{getText('websiteSettings.emailAddress')}" name="bean.emailAddress" size="30" maxlength="40" /> - <s:text name="websiteSettings.editor" /> - <s:select name="bean.editorPage" size="1" list="editorsList" listKey="id" listValue="getText(name)" /> - - <td class="label"><s:text name="websiteSettings.active" /></td> - <td class="field"><s:checkbox name="bean.active" /></td> - <td class="description"></td> + <s:select name="bean.editorPage" label="%{getText('websiteSettings.editor')}" + size="1" list="editorsList" listKey="id" listValue="getText(name)" /> - <s:textfield label="%{getText('')}" - name="" size="30" maxlength="40" /> + <s:textfield type="number" label="%{getText('websiteSettings.entryDisplayCount')}" + name="bean.entryDisplayCount" size="4" /> - <td class="label"><s:text name="websiteSettings.entryDisplayCount" /></td> - <td class="field"><s:textfield name="bean.entryDisplayCount" size="4"/></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> - - <s:textfield label="%{getText('')}" - name="" size="30" maxlength="40" /> - - <s:textfield label="%{getText('')}" - name="" size="30" maxlength="40" /> + <s:checkbox label="%{getText('websiteSettings.active')}" + name="bean.active" size="30" maxlength="40" /> <%-- ***** Language/i18n settings ***** --%> - <td colspan="3"><h2><s:text name="websiteSettings.languageSettings" /></h2></td> + <h2><s:text name="websiteSettings.languageSettings" /></h2> - <td class="label"><s:text name="websiteSettings.enableMultiLang" /></td> - <td class="field"><s:checkbox name="bean.enableMultiLang" /></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + <s:select name="bean.locale" size="1" list="localesList" listValue="displayName" + label="%{getText('createWebsite.locale')}" /> - <td class="label"><s:text name="websiteSettings.showAllLangs" /></td> - <td class="field"><s:checkbox name="bean.showAllLangs" /></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + <s:select name="bean.timeZone" size="1" list="timeZonesList" + label="%{getText('createWebsite.timeZone')}" /> - <td class="label"><s:text name="createWebsite.locale" /> - <td class="field"> - <s:select name="bean.locale" size="1" list="localesList" listValue="displayName" /> - </td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + <s:checkbox name="bean.enableMultiLang" + label="%{getText('websiteSettings.enableMultiLang')}" /> - <td class="label"><s:text name="createWebsite.timeZone" /> - <td class="field"> - <s:select name="bean.timeZone" size="1" list="timeZonesList" /> - </td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + <s:checkbox name="bean.showAllLangs" + label="%{getText('websiteSettings.showAllLangs')}" /> - <%-- ***** Comment settings ***** --%> - - <td colspan="3"><h2><s:text name="websiteSettings.commentSettings" /></h2></td> - <td class="label"><s:text name="websiteSettings.allowComments" /></td> - <td class="field"><s:checkbox name="bean.allowComments" /></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + <h2><s:text name="websiteSettings.commentSettings" /></h2> - <s:if test="!getBooleanProp('users.moderation.required')"> - <td class="label"><s:text name="websiteSettings.moderateComments" /></td> - <td class="field"><s:checkbox name="bean.moderateComments" /></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> - </s:if> - - <s:if test="getBooleanProp('users.comments.emailnotify')"> - <td class="label"><s:text name="websiteSettings.emailComments" /></td> - <td class="field"><s:checkbox name="bean.emailComments"/></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> - </s:if> + <s:checkbox name="bean.allowComments" + label="%{getText('websiteSettings.allowComments')}" /> + + <s:if test="getBooleanProp('users.comments.emailnotify')"> + <s:checkbox name="bean.emailComments" + label="%{getText('websiteSettings.emailComments')}" /> + </s:if> + + <s:if test="!getBooleanProp('users.moderation.required')"> + <s:checkbox name="bean.moderateComments" + label="%{getText('websiteSettings.moderateComments')}" /> + </s:if> <%-- ***** Default entry comment settings ***** --%> - <td colspan="3"><h2><s:text name="websiteSettings.defaultCommentSettings" /></h2></td> + <h2><s:text name="websiteSettings.defaultCommentSettings" /></h2> - <td class="label"><s:text name="websiteSettings.defaultAllowComments" /></td> - <td class="field"><s:checkbox name="bean.defaultAllowComments" /></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + <s:select name="bean.defaultCommentDays" label="%{getText('websiteSettings.applyCommentDefaults')}" + list="commentDaysList" size="1" listKey="key" listValue="value" /> - <td class="label"><s:text name="websiteSettings.defaultCommentDays" /></td> - <td class="field"> - <s:select name="bean.defaultCommentDays" list="commentDaysList" size="1" listKey="key" listValue="value" /> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + <s:checkbox name="bean.defaultAllowComments" + label="%{getText('websiteSettings.defaultAllowComments')}" /> - <td class="label"><s:text name="websiteSettings.applyCommentDefaults" /></td> - <td class="field"><s:checkbox name="bean.applyCommentDefaults" /></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + <s:checkbox name="bean.applyCommentDefaults" + label="%{getText('websiteSettings.applyCommentDefaults')}" /> <%-- ***** Blogger API setting settings ***** --%> - <td colspan="3"><h2><s:text name="websiteSettings.bloggerApi" /></h2></td> + <h2><s:text name="websiteSettings.bloggerApi" /></h2> - <td class="label"><s:text name="websiteSettings.enableBloggerApi" /></td> - <td class="field"><s:checkbox name="bean.enableBloggerApi" /></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + <s:select name="bean.bloggerCategoryId" label="%{getText('websiteSettings.bloggerApiCategory')}" + list="weblogCategories" size="1" listKey="id" listValue="name" /> - <td class="label"><s:text name="websiteSettings.bloggerApiCategory" /></td> - <td class="field"> - <s:select name="bean.bloggerCategoryId" list="weblogCategories" size="1" listKey="id" listValue="name" /> - </td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + <s:checkbox name="bean.enableBloggerApi" + label="%{getText('websiteSettings.enableBloggerApi')}" /> <%-- ***** Plugins "formatting" settings ***** --%> - <td colspan="3"><h2><s:text name="websiteSettings.formatting" /></h2></td> + <h2><s:text name="websiteSettings.formatting" /></h2> + + <s:if test="!pluginsList.isEmpty"> - <s:if test="!pluginsList.isEmpty"> - <td class="label"><s:text name="websiteSettings.label1" /> <br /><s:text name="websiteSettings.label2" /></td> - <td class="field"> - <s:checkboxlist theme="roller" list="pluginsList" name="bean.defaultPluginsArray" listKey="name" listValue="name" /> - - </td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> - </s:if> - <s:else> - <s:hidden name="defaultPlugins" /> - </s:else> + <s:checkboxlist list="pluginsList" label="%{getText('websiteSettings.label1')}" + name="bean.defaultPluginsArray" listKey="name" listValue="name" /> + </s:if> + <s:else> + <s:hidden name="defaultPlugins" /> + </s:else> <%-- ***** Spam prevention settings ***** --%> - <td colspan="3"><h2><s:text name="websiteSettings.spamPrevention" /></h2></td> - - <td class="label"><s:text name="websiteSettings.ignoreUrls" /></td> - <td class="field"><s:textarea name="bean.blacklist" rows="7" cols="40"/></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> + <h2><s:text name="websiteSettings.spamPrevention" /></h2> + <s:textarea name="bean.blacklist" rows="7" cols="40" + label="%{getText('websiteSettings.analyticsTrackingCode')}" /> <%-- ***** Web analytics settings ***** --%> - <s:if test="getBooleanProp('analytics.code.override.allowed')"> - <td colspan="3"><h2><s:text name="configForm.webAnalytics" /></h2></td> - - <td class="label"><s:text name="websiteSettings.analyticsTrackingCode" /></td> - <td class="field"><s:textarea name="bean.analyticsCode" rows="10" cols="70"/></td> - </s:if> + <s:if test="getBooleanProp('analytics.code.override.allowed')"> + <h2><s:text name="configForm.webAnalytics" /></h2> -</table> + <s:textarea name="bean.analyticsCode" rows="10" cols="70" + label="%{getText('websiteSettings.analyticsTrackingCode')}" /> + </s:if> -<br /> -<div class="control"> - <s:submit value="%{getText('websiteSettings.button.update')}" /> -</div> + <div class="control" style="margin-bottom:5em" > + <s:submit cssClass="btn btn-success" value="%{getText('websiteSettings.button.update')}" /> + </div> -<br /> -<br /> - </s:form> <s:form action="weblogRemove" cssClass="form-horizontal"> <s:hidden name="salt" /> <s:hidden name="weblog" value="%{actionWeblog.handle}" /> - + <h2><s:text name="websiteSettings.removeWebsiteHeading" /></h2> - - <p> - <s:text name="websiteSettings.removeWebsite" /><br/><br/> - <span class="warning"> - <s:text name="websiteSettings.removeWebsiteWarning" /> - </span> - </p> - - <br /> - - <s:submit value="%{getText('websiteSettings.button.remove')}" /> - - <br /> - <br /> - <br /> - + <s:text name="websiteSettings.removeWebsite" /><br/><br/> + <div class="alert alert-danger" role="alert"> + <s:text name="websiteSettings.removeWebsiteWarning" /> + </div> + <s:submit cssClass="btn" value="%{getText('websiteSettings.button.remove')}" /> + </s:form> http://git-wip-us.apache.org/repos/asf/roller/blob/bb92ba2a/app/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp index f197aa0..3dcea04 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp @@ -21,7 +21,7 @@ <s:text name="websiteRemove.subtitle" /> </p> -<p> +<p style="margin-bottom: 3em"> <s:text name="websiteRemove.youSure"> <s:param value="actionWeblog.name" /> </s:text> @@ -32,27 +32,28 @@ </span> </p> -<p> - <s:text name="websiteRemove.websiteId" /> = [<s:property value="actionWeblog.id" />] - <br /> - <s:text name="websiteRemove.websiteName" /> = [<s:property value="actionWeblog.name" />] -</p> +<div class="row"> + <div class="col-md-2"> + <s:form action="weblogRemove!remove" theme="bootstrap" cssClass="form-horizontal"> + <s:hidden name="salt" /> + <s:hidden name="weblog" value="%{actionWeblog.handle}" /> + <s:submit cssClass="btn btn-danger" value="%{getText('generic.yesRemove')}" /> + </s:form> + + </div> + <div class="col-md-2"> + <s:form action="weblogConfig" method="post" theme="bootstrap" cssClass="form-horizontal"> + <s:hidden name="salt" /> + <s:hidden name="weblog" value="%{actionWeblog.handle}" /> + <s:submit cssClass="btn btn-success" value="%{getText('generic.cancel')}" /> + </s:form> + + </div> + <div class="col-md-8"></div> +</div> + + + + + -<table> - <tr> - <td> - <s:form action="weblogRemove!remove"> - <s:hidden name="salt" /> - <s:hidden name="weblog" value="%{actionWeblog.handle}" /> - <s:submit value="%{getText('generic.yes')}" /> - </s:form> - </td> - <td> - <s:form action="weblogConfig" method="post"> - <s:hidden name="salt" /> - <s:hidden name="weblog" value="%{actionWeblog.handle}" /> - <s:submit value="%{getText('generic.no')}" /> - </s:form> - </td> - </tr> -</table>
