Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: a4966d74 by Tony CHEMIT at 2018-04-05T16:56:16Z Mise en page de certains écrans de configuration (Closes #306) - - - - - 17 changed files: - t3-web/src/main/webapp/WEB-INF/jsp/admin/deleteTripConfirm.jsp - t3-web/src/main/webapp/WEB-INF/jsp/admin/tripListGrid.jsp - t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF2Config.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeSetDurationAndPositiveSetCountConfig.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeTripEffortsConfig.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeWellPlanWeightCategoriesProportionsConfig.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ConvertCatchesWeightCategoriesConfig.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level1/level1Configuration.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2ConfigurationStep2.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2Start.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp - t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3Start.jsp - t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp - t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportValidate.jsp - t3-web/src/main/webapp/css/screen.css Changes: ===================================== t3-web/src/main/webapp/WEB-INF/jsp/admin/deleteTripConfirm.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/admin/deleteTripConfirm.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/admin/deleteTripConfirm.jsp @@ -46,12 +46,11 @@ <s:hidden name="tripEditAction" label=""/> </fieldset> <br/> - <s:submit action="confirmTripDelete!doDelete" key="t3.action.deleteTrips" - align="right"/> - <s:submit action="confirmTripDelete!doDeleteComputedData" - key="t3.action.deleteComputedData" align="right"/> - <s:submit action="backToTripList" key="t3.label.admin.backToTripList" - align="right"/> + <div class="actions"> + <s:submit action="confirmTripDelete!doDelete" key="t3.action.deleteTrips" align="right"/> + <s:submit action="confirmTripDelete!doDeleteComputedData" key="t3.action.deleteComputedData" align="right"/> + <s:submit action="backToTripList" key="t3.label.admin.backToTripList" align="right"/> + </div> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/admin/tripListGrid.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/admin/tripListGrid.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/admin/tripListGrid.jsp @@ -88,9 +88,8 @@ </sjg:grid> - - + <div class="actions"> <s:submit id='confirmTripDelete' action="confirmTripDelete" method="input"/> <s:submit id='tripDetail' action="tripDetail"/> - + </div> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp @@ -116,10 +116,12 @@ <s:checkbox key="user.admin" label="%{getText('t3.common.admin')}"/> </fieldset> <br/> + <div class="actions"> <s:submit action="userForm!doCreate" key="t3.action.create" align="right"/> <s:if test="userIsAdmin"> <s:submit action="userList" key="t3.label.admin.backToUserList" align="right"/> </s:if> + </div> </s:form> </s:if> <s:elseif test="userEditAction == 'edit'"> @@ -145,10 +147,12 @@ </fieldset> <p><s:text name="t3.label.info.changePassword"/></p> <br/> + <div class="actions"> <s:submit action="userForm!doUpdate" key="t3.action.save" align="right"/> <s:if test="userIsAdmin"> <s:submit action="userList" key="t3.label.admin.backToUserList" align="right"/> </s:if> + </div> </s:form> <br/> @@ -221,10 +225,12 @@ <s:checkbox value="%{user.admin}" key="t3.common.admin" disabled="true"/> </fieldset> <br/> + <div class="actions"> <s:submit action="userForm!doDelete" key="t3.action.delete" align="right"/> <s:if test="userIsAdmin"> <s:submit action="userList" key="t3.label.admin.backToUserList" align="right"/> </s:if> + </div> </s:form> </s:elseif> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF1Config.jsp @@ -46,10 +46,10 @@ <jsp:include page="ComputeRF1ConfigResume.jsp"/> <br/> - <s:submit action="configureComputeRF1" - key="t3.action.backToConfiguration" align="right"/> + <div class="actions"> + <s:submit action="configureComputeRF1" key="t3.action.backToConfiguration" align="right"/> <s:submit action="run-ComputeRF1" key="t3.action.runAction" align="right"/> - + </div> </s:form> </s:if> @@ -96,8 +96,7 @@ </fieldset> <br/> - <s:submit action="validateComputeRF1" - key="t3.action.validateConfiguration" align="right"/> + <s:submit action="validateComputeRF1" key="t3.action.validateConfiguration" align="right"/> </s:form> </s:else> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF2Config.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF2Config.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeRF2Config.jsp @@ -47,10 +47,10 @@ <jsp:include page="ComputeRF2ConfigResume.jsp"/> <br/> - <s:submit action="configureComputeRF2" key="t3.action.backToConfiguration" - align="right"/> + <div class="actions"> + <s:submit action="configureComputeRF2" key="t3.action.backToConfiguration" align="right"/> <s:submit action="run-ComputeRF2" key="t3.action.runAction" align="right"/> - + </div> </s:form> </s:if> <s:else> @@ -91,8 +91,7 @@ </fieldset> <br/> - <s:submit action="validateComputeRF2" key="t3.action.validateConfiguration" - align="right"/> + <s:submit action="validateComputeRF2" key="t3.action.validateConfiguration" align="right"/> </s:form> <script type="text/javascript"> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeSetDurationAndPositiveSetCountConfig.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeSetDurationAndPositiveSetCountConfig.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeSetDurationAndPositiveSetCountConfig.jsp @@ -43,11 +43,12 @@ <jsp:include page="ComputeSetDurationAndPositiveSetCountConfigResume.jsp"/> <br/> + <div class="actions"> <s:submit action="configureComputeSetDurationAndPositiveSetCount" key="t3.action.backToConfiguration" align="right"/> <s:submit action="run-ComputeSetDurationAndPositiveSetCount" key="t3.action.runAction" align="right"/> - + </div> </s:form> </s:if> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeTripEffortsConfig.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeTripEffortsConfig.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeTripEffortsConfig.jsp @@ -43,11 +43,10 @@ <jsp:include page="ComputeTripEffortsConfigResume.jsp"/> <br/> - <s:submit action="configureComputeTripEfforts" - key="t3.action.backToConfiguration" align="right"/> - <s:submit action="run-ComputeTripEfforts" key="t3.action.runAction" - align="right"/> - + <div class="actions"> + <s:submit action="configureComputeTripEfforts" key="t3.action.backToConfiguration" align="right"/> + <s:submit action="run-ComputeTripEfforts" key="t3.action.runAction" align="right"/> + </div> </s:form> </s:if> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeWellPlanWeightCategoriesProportionsConfig.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeWellPlanWeightCategoriesProportionsConfig.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ComputeWellPlanWeightCategoriesProportionsConfig.jsp @@ -43,11 +43,10 @@ <jsp:include page="ComputeWellPlanWeightCategoriesProportionsConfigResume.jsp"/> <br/> - <s:submit action="configureComputeWellPlanWeightCategoriesProportions" - key="t3.action.backToConfiguration" align="right"/> - <s:submit action="run-ComputeWellPlanWeightCategoriesProportions" key="t3.action.runAction" - align="right"/> - + <div class="actions"> + <s:submit action="configureComputeWellPlanWeightCategoriesProportions" key="t3.action.backToConfiguration" align="right"/> + <s:submit action="run-ComputeWellPlanWeightCategoriesProportions" key="t3.action.runAction" align="right"/> + </div> </s:form> </s:if> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ConvertCatchesWeightCategoriesConfig.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ConvertCatchesWeightCategoriesConfig.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level0/ConvertCatchesWeightCategoriesConfig.jsp @@ -43,11 +43,10 @@ <jsp:include page="ConvertCatchesWeightCategoriesConfigResume.jsp"/> <br/> - <s:submit action="configureConvertCatchesWeightCategories" - key="t3.action.backToConfiguration" align="right"/> - <s:submit action="run-ConvertCatchesWeightCategories" - key="t3.action.runAction" align="right"/> - + <div class="actions"> + <s:submit action="configureConvertCatchesWeightCategories" key="t3.action.backToConfiguration" align="right"/> + <s:submit action="run-ConvertCatchesWeightCategories" key="t3.action.runAction" align="right"/> + </div> </s:form> </s:if> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level1/level1Configuration.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level1/level1Configuration.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level1/level1Configuration.jsp @@ -108,19 +108,16 @@ </fieldset> <br/> + <div class="actions"> <s:if test="configurationInSession"> <%--Can remove configuration--%> - <s:submit action="removeLevel1Configuration" - key="t3.action.remove.configuration" - align="right"/> + <s:submit action="removeLevel1Configuration" key="t3.action.remove.configuration" align="right"/> </s:if> <%--validate + save configuration--%> - <s:submit action="validateLevel1Configuration" - key="t3.action.save.configuration" - align="right"/> - + <s:submit action="validateLevel1Configuration" key="t3.action.save.configuration" align="right"/> + </div> </s:form> <s:if test="confirm && configurationInSession"> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2ConfigurationStep2.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2ConfigurationStep2.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2ConfigurationStep2.jsp @@ -73,7 +73,7 @@ </fieldset> <br/> - + <div class="actions"> <%-- back to step 1 --%> <s:submit action="configureLevel2Step1!input" key="t3.action.back.to.configuration.step1" align="right"/> @@ -82,5 +82,5 @@ <%--validate + go to resume --%> <s:submit action="configureLevel2Step2" key="t3.action.validate.configuration" align="right"/> </s:if> - + </div> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2Start.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2Start.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level2/level2Start.jsp @@ -35,7 +35,7 @@ <jsp:include page="level2ConfigurationResume.jsp"/> <br/> - + <div class="actions"> <%-- back to step 1 --%> <s:submit action="configureLevel2Step1!input" key="t3.action.back.to.configuration.step1" align="right"/> @@ -44,5 +44,5 @@ <%-- launch action --%> <s:submit action="configureLevel2Resume" key="t3.action.runAction" align="right"/> - + </div> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3ConfigurationStep2.jsp @@ -100,10 +100,14 @@ <s:if test="!missingData"> <br/> + <div class="actions"> + <%-- back to step 1 --%> <s:submit action="configureLevel3Step1!input" key="t3.action.back.to.configuration.step1" align="right"/> <%--validate + go to resume --%> <s:submit action="configureLevel3Step2" key="t3.action.validate.configuration" align="right"/> + + </div> </s:if> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3Start.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3Start.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/data/level3/level3Start.jsp @@ -35,6 +35,7 @@ <jsp:include page="level3ConfigurationResume.jsp"/> <br/> + <div class="actions"> <%-- back to step 1 --%> <s:submit action="configureLevel3Step1!input" key="t3.action.back.to.configuration.step1" align="right"/> @@ -43,5 +44,5 @@ <%-- launch action --%> <s:submit action="configureLevel3Resume" key="t3.action.runAction" align="right"/> - + </div> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/io/input/configureImportData.jsp @@ -66,7 +66,6 @@ <s:if test="loadedSource==null"> <s:hidden name="useWells" value="%{useWells}"/> <s:file name="sourceToLoad" requiredLabel="true" label='%{getText("t3.common.sourceToUpload")} (*)'/> - <s:submit action="configureImportData!doAddSource" key="t3.action.importData.addSource" align="right"/> <br/> <div class="cleanBoth"> @@ -74,6 +73,9 @@ <s:param value="%{maxSize}"/> </s:text> </div> + <div class="actions"> + <s:submit action="configureImportData!doAddSource" key="t3.action.importData.addSource" align="right"/> + </div> </s:if> <s:else> <s:hidden key="loadedSource" label=''/> @@ -84,8 +86,10 @@ <s:checkbox key="canCreateVirtualActivity" label='%{getText("t3.common.canCreateVirtualActivity")}'/> <s:checkbox key="canCreateVessel" label='%{getText("t3.common.canCreateVessel")}'/> <s:checkbox key="createVirtualVessel" label='%{getText("t3.common.createVirtualVessel")}'/> + <div class="actions"> <s:submit action="configureImportData!doDeleteSource" key="t3.action.importData.deleteSource" align="right"/> <s:submit action="configureImportData!doPrepareAnalyze" key="t3.action.importData.analyze" align="right"/> + </div> </s:else> </s:form> ===================================== t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportValidate.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportValidate.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/io/output/exportValidate.jsp @@ -31,9 +31,8 @@ <jsp:include page="exportConfigResume.jsp"/> - <s:submit action="configureExport!input" align="right" - key="t3.action.backToConfiguration"/> - + <div class="actions"> + <s:submit action="configureExport!input" align="right" key="t3.action.backToConfiguration"/> <s:submit action="runExport" key="t3.action.launch.export" align="right"/> - + </div> </s:form> ===================================== t3-web/src/main/webapp/css/screen.css ===================================== --- a/t3-web/src/main/webapp/css/screen.css +++ b/t3-web/src/main/webapp/css/screen.css @@ -117,6 +117,13 @@ fieldset, hr , .cleanBoth{ padding-top: 0.3em; } + +.wwgrp{ + float: left; + clear: both; + margin-bottom: 10px; +} + .wwlbl { float: left; clear: both; @@ -136,6 +143,16 @@ div.errorMessage{ clear: both; float: left; } + +.actions input[type=submit] { + margin-left:5px; +} +.actions { + clear: both; + display: flex; + flex-flow: row; + justify-content: flex-end; +} .errorMessage { background: url("../images/exclamation.png") no-repeat ; list-style: none; View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a4966d7401c0dddd0fae94ac912ed9542... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a4966d7401c0dddd0fae94ac912ed9542... You're receiving this email because of your account on gitlab.com.