Repository: roller Updated Branches: refs/heads/bootstrap-ui 37277bbf5 -> ff31349e5
Convert setup page to Bootstrap Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/ff31349e Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/ff31349e Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/ff31349e Branch: refs/heads/bootstrap-ui Commit: ff31349e52f205cfc454af5b84963822b7afda50 Parents: 37277bb Author: Dave Johnson <[email protected]> Authored: Sun Feb 25 17:09:39 2018 -0500 Committer: Dave Johnson <[email protected]> Committed: Sun Feb 25 17:09:39 2018 -0500 ---------------------------------------------------------------------- app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp | 96 ++++++++------------ 1 file changed, 40 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/ff31349e/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp ---------------------------------------------------------------------- diff --git a/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp b/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp index 104fa72..929a353 100644 --- a/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp @@ -17,7 +17,7 @@ --%> <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> -<s:text name="index.prompt" /><br /><br /> +<s:text name="index.prompt"/><br/><br/> <div style="width:75%"> <ul> <%-- @@ -26,84 +26,68 @@ --%> <%-- STEP 1: Create a user if you don't already have one --%> - <li><b><s:text name="index.createUser" /> + <li> + <b> + <s:text name="index.createUser"/> <s:if test="userCount > 0"> - <s:text name="index.createUserDone"> - <s:param value="userCount" /> + <s:param value="userCount"/> </s:text> </s:if> - </b><br /><br /> - <s:text name="index.createUserHelp" /><br /><br /> + </b> + <s:text name="index.createUserHelp"/><br/><br/> <s:if test="userCount == 0"> - <s:text name="index.createUserBy" /> + <s:text name="index.createUserBy"/> <a id="a_createUser" href='<s:url action="register"/>'> - <s:text name="index.createUserPage" /></a>. - <br /><br /> + <s:text name="index.createUserPage"/></a>. </s:if> - <br /> </li> <%-- STEP 2: Create a weblog if you don't already have one --%> - <li><b><s:text name="index.createWeblog" /> + <li> + <b> + <s:text name="index.createWeblog"/> <s:if test="blogCount > 0"> - <s:text name="index.createWeblogDone"> - <s:param value="blogCount" /> + <s:param value="blogCount"/> </s:text> </s:if> - </b><br /><br /> - <s:text name="index.createWeblogHelp" /><br /><br /> + </b> + <s:text name="index.createWeblogHelp"/><br/><br/> <s:if test="userCount > 0 && blogCount == 0"> - <s:text name="index.createWeblogBy" /> + <s:text name="index.createWeblogBy"/> <a id="a_createBlog" href='<s:url action="createWeblog"/>'> - <s:text name="index.createWeblogPage" /></a>. - <br /><br /> + <s:text name="index.createWeblogPage"/></a>. </s:if> - <br /> </li> <%-- STEP 3: Designate a weblog to be the frontpage weblog --%> - <li><b><s:text name="index.setFrontpage" /></b><br /> - <br /> - <s:text name="index.setFrontpageHelp" /><br /> - <br /> + <li> + <b> + <s:text name="index.setFrontpage"/> + </b> + <p><s:text name="index.setFrontpageHelp"/></p> - <s:if test="blogCount > 0"> - <s:form action="setup!save"> - <s:hidden name="salt" /> + <s:if test="blogCount > 0"> - <table style="margin-left:2em;width:70%"> - <tr> - <td class="label"> - <s:text name="frontpageConfig.frontpageBlogName" /> - </td> - <td class="field"> - <s:select list="weblogs" - listKey="handle" - listValue="name" - name="frontpageBlog" - value="frontpageBlog" /> - </td> - </tr> - <tr> - <td class="label"> - <s:text name="frontpageConfig.frontpageAggregated" /> - <br /><br /> - </td> - <td class="field"> - <s:checkbox name="aggregated" value="aggregated" /> - </td> - </tr> - <tr> - <td colspan="2" class="label"> - <div class="control"> - <s:submit value="%{getText('generic.save')}" /> - </div> - </td> - </tr> - </table> + <s:form action="setup!save" theme="bootstrap" cssClass="form-horizontal"> + <s:hidden name="salt"/> - </s:form> - </s:if> + <s:select list="weblogs" + listKey="handle" + listValue="name" + label="%{getText('frontpageConfig.frontpageBlogName')}" + name="frontpageBlog" + value="frontpageBlog"/> + + <s:checkbox name="aggregated" value="aggregated" + label="%{getText('frontpageConfig.frontpageAggregated')}"/> + + <s:submit value="%{getText('generic.save')}" cssClass="btn btn-default"/> + + </s:form> + + </s:if> </li>
