Repository: roller Updated Branches: refs/heads/bootstrap-ui 57a19fd20 -> 84579b4a9
Progress on WeblogConfig page; more work remains. Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/84579b4a Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/84579b4a Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/84579b4a Branch: refs/heads/bootstrap-ui Commit: 84579b4a9eb4638c02268431250f9d6ade8df188 Parents: 57a19fd Author: Dave Johnson <snoopd...@gmail.com> Authored: Sat Jul 28 18:45:40 2018 -0400 Committer: Dave Johnson <snoopd...@gmail.com> Committed: Sat Jul 28 18:45:40 2018 -0400 ---------------------------------------------------------------------- .../webapp/WEB-INF/jsps/editor/WeblogConfig.jsp | 148 +++++-------------- 1 file changed, 41 insertions(+), 107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/84579b4a/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 ff0187d..356c775 100644 --- a/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp @@ -23,194 +23,136 @@ </s:text> </p> -<s:form action="weblogConfig!save"> +<s:form action="weblogConfig!save" theme="bootstrap" cssClass="form-horizontal"> <s:hidden name="salt" /> <s:hidden name="weblog" value="%{actionWeblog.handle}" /> -<table class="formtableNoDesc"> - <%-- ***** General settings ***** --%> - <tr> - <td colspan="3"><h2><s:text name="websiteSettings.generalSettings" /></h2></td> - </tr> - - <tr> - <td class="label"><s:text name="websiteSettings.websiteTitle" /> - <td class="field"><s:textfield name="bean.name" size="40"/></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> - </tr> + <s:text name="websiteSettings.generalSettings" /> + + <s:textfield label="%{getText('websiteSettings.websiteTitle')}" + name="bean.name" size="30" maxlength="40" /> + + <s:textfield label="%{getText('generic.tagline')}" + name="bean.tagline" size="30" maxlength="255" /> + + <s:textfield label="%{getText('websiteSettings.icon')}" + name="bean.icon" size="30" maxlength="40" /> + + <s:textarea label="%{getText('websiteSettings.about')}" + name="bean.about" rows="3" cols="40 "/> + + <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)" /> - <tr> - <td class="label"><s:text name="generic.tagline" /></td> - <td class="field"><s:textfield name="bean.tagline" size="40" maxlength="255"/></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> - </tr> - - <tr> - <td class="label"><s:text name="websiteSettings.icon" /></td> - <td class="field"><s:textfield name="bean.icon" size="40"/></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> - </tr> - - <tr> - <td class="label"><s:text name="websiteSettings.about" /></td> - <td class="field"><s:textarea name="bean.about" rows="3" cols="40"/></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> - </tr> - - <tr> - <td class="label"><s:text name="websiteSettings.emailAddress" /> - <td class="field"><s:textfield name="bean.emailAddress" size="40"/></td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> - </tr> - - <tr> - <td class="label"><s:text name="websiteSettings.editor" /></td> - <td class="field"> - <s:select name="bean.editorPage" size="1" list="editorsList" listKey="id" listValue="getText(name)" /> - </td> - <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td> - </tr> - - <tr> <td class="label"><s:text name="websiteSettings.active" /></td> <td class="field"><s:checkbox name="bean.active" /></td> <td class="description"></td> - </tr> - - <tr> + + <s:textfield label="%{getText('')}" + name="" size="30" maxlength="40" /> + <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> - </tr> - + <s:textfield label="%{getText('')}" + name="" size="30" maxlength="40" /> + + <s:textfield label="%{getText('')}" + name="" size="30" maxlength="40" /> + <%-- ***** Language/i18n settings ***** --%> - - - <tr> + <td colspan="3"><h2><s:text name="websiteSettings.languageSettings" /></h2></td> - </tr> - - <tr> + <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> - </tr> - - <tr> + <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> - </tr> - - <tr> + <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> - </tr> - - <tr> + <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> - </tr> - + <%-- ***** Comment settings ***** --%> - - <tr> <td colspan="3"><h2><s:text name="websiteSettings.commentSettings" /></h2></td> - </tr> - <tr> <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> - </tr> - + <s:if test="!getBooleanProp('users.moderation.required')"> - <tr> <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> - </tr> </s:if> <s:if test="getBooleanProp('users.comments.emailnotify')"> - <tr> <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> - </tr> </s:if> <%-- ***** Default entry comment settings ***** --%> - <tr> <td colspan="3"><h2><s:text name="websiteSettings.defaultCommentSettings" /></h2></td> - </tr> - - <tr> + <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> - </tr> - - <tr> + <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> - </tr> - - <tr> + <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> - </tr> <%-- ***** Blogger API setting settings ***** --%> - <tr> <td colspan="3"><h2><s:text name="websiteSettings.bloggerApi" /></h2></td> - </tr> - <tr> <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> - </tr> - <tr> <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> - </tr> <%-- ***** Plugins "formatting" settings ***** --%> - <tr> <td colspan="3"><h2><s:text name="websiteSettings.formatting" /></h2></td> - </tr> <s:if test="!pluginsList.isEmpty"> - <tr> <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> - </tr> </s:if> <s:else> <s:hidden name="defaultPlugins" /> @@ -219,28 +161,20 @@ <%-- ***** Spam prevention settings ***** --%> - <tr> <td colspan="3"><h2><s:text name="websiteSettings.spamPrevention" /></h2></td> - </tr> - <tr> <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> - </tr> <%-- ***** Web analytics settings ***** --%> <s:if test="getBooleanProp('analytics.code.override.allowed')"> - <tr> <td colspan="3"><h2><s:text name="configForm.webAnalytics" /></h2></td> - </tr> - <tr> <td class="label"><s:text name="websiteSettings.analyticsTrackingCode" /></td> <td class="field"><s:textarea name="bean.analyticsCode" rows="10" cols="70"/></td> - </tr> </s:if> </table> @@ -256,7 +190,7 @@ </s:form> -<s:form action="weblogRemove"> +<s:form action="weblogRemove" cssClass="form-horizontal"> <s:hidden name="salt" /> <s:hidden name="weblog" value="%{actionWeblog.handle}" />
