Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
a4966d74
by Tony CHEMIT at 2018-04-05T16:56:16Z
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:
| ... | ... | @@ -46,12 +46,11 @@ |
| 46 | 46 |
<s:hidden name="tripEditAction" label=""/>
|
| 47 | 47 |
</fieldset>
|
| 48 | 48 |
<br/>
|
| 49 |
- <s:submit action="confirmTripDelete!doDelete" key="t3.action.deleteTrips"
|
|
| 50 |
- align="right"/>
|
|
| 51 |
- <s:submit action="confirmTripDelete!doDeleteComputedData"
|
|
| 52 |
- key="t3.action.deleteComputedData" align="right"/>
|
|
| 53 |
- <s:submit action="backToTripList" key="t3.label.admin.backToTripList"
|
|
| 54 |
- align="right"/>
|
|
| 49 |
+ <div class="actions">
|
|
| 50 |
+ <s:submit action="confirmTripDelete!doDelete" key="t3.action.deleteTrips" align="right"/>
|
|
| 51 |
+ <s:submit action="confirmTripDelete!doDeleteComputedData" key="t3.action.deleteComputedData" align="right"/>
|
|
| 52 |
+ <s:submit action="backToTripList" key="t3.label.admin.backToTripList" align="right"/>
|
|
| 53 |
+ </div>
|
|
| 55 | 54 |
</s:form>
|
| 56 | 55 |
|
| 57 | 56 |
|
| ... | ... | @@ -88,9 +88,8 @@ |
| 88 | 88 |
|
| 89 | 89 |
</sjg:grid>
|
| 90 | 90 |
|
| 91 |
- |
|
| 92 |
- |
|
| 91 |
+ <div class="actions">
|
|
| 93 | 92 |
<s:submit id='confirmTripDelete' action="confirmTripDelete" method="input"/>
|
| 94 | 93 |
<s:submit id='tripDetail' action="tripDetail"/>
|
| 95 |
- |
|
| 94 |
+ </div>
|
|
| 96 | 95 |
</s:form>
|
| ... | ... | @@ -116,10 +116,12 @@ |
| 116 | 116 |
<s:checkbox key="user.admin" label="%{getText('t3.common.admin')}"/>
|
| 117 | 117 |
</fieldset>
|
| 118 | 118 |
<br/>
|
| 119 |
+ <div class="actions">
|
|
| 119 | 120 |
<s:submit action="userForm!doCreate" key="t3.action.create" align="right"/>
|
| 120 | 121 |
<s:if test="userIsAdmin">
|
| 121 | 122 |
<s:submit action="userList" key="t3.label.admin.backToUserList" align="right"/>
|
| 122 | 123 |
</s:if>
|
| 124 |
+ </div>
|
|
| 123 | 125 |
</s:form>
|
| 124 | 126 |
</s:if>
|
| 125 | 127 |
<s:elseif test="userEditAction == 'edit'">
|
| ... | ... | @@ -145,10 +147,12 @@ |
| 145 | 147 |
</fieldset>
|
| 146 | 148 |
<p><s:text name="t3.label.info.changePassword"/></p>
|
| 147 | 149 |
<br/>
|
| 150 |
+ <div class="actions">
|
|
| 148 | 151 |
<s:submit action="userForm!doUpdate" key="t3.action.save" align="right"/>
|
| 149 | 152 |
<s:if test="userIsAdmin">
|
| 150 | 153 |
<s:submit action="userList" key="t3.label.admin.backToUserList" align="right"/>
|
| 151 | 154 |
</s:if>
|
| 155 |
+ </div>
|
|
| 152 | 156 |
</s:form>
|
| 153 | 157 |
|
| 154 | 158 |
<br/>
|
| ... | ... | @@ -221,10 +225,12 @@ |
| 221 | 225 |
<s:checkbox value="%{user.admin}" key="t3.common.admin" disabled="true"/>
|
| 222 | 226 |
</fieldset>
|
| 223 | 227 |
<br/>
|
| 228 |
+ <div class="actions">
|
|
| 224 | 229 |
<s:submit action="userForm!doDelete" key="t3.action.delete" align="right"/>
|
| 225 | 230 |
<s:if test="userIsAdmin">
|
| 226 | 231 |
<s:submit action="userList" key="t3.label.admin.backToUserList" align="right"/>
|
| 227 | 232 |
</s:if>
|
| 233 |
+ </div>
|
|
| 228 | 234 |
</s:form>
|
| 229 | 235 |
</s:elseif>
|
| 230 | 236 |
|
| ... | ... | @@ -46,10 +46,10 @@ |
| 46 | 46 |
<jsp:include page="ComputeRF1ConfigResume.jsp"/>
|
| 47 | 47 |
|
| 48 | 48 |
<br/>
|
| 49 |
- <s:submit action="configureComputeRF1"
|
|
| 50 |
- key="t3.action.backToConfiguration" align="right"/>
|
|
| 49 |
+ <div class="actions">
|
|
| 50 |
+ <s:submit action="configureComputeRF1" key="t3.action.backToConfiguration" align="right"/>
|
|
| 51 | 51 |
<s:submit action="run-ComputeRF1" key="t3.action.runAction" align="right"/>
|
| 52 |
- |
|
| 52 |
+ </div>
|
|
| 53 | 53 |
</s:form>
|
| 54 | 54 |
</s:if>
|
| 55 | 55 |
|
| ... | ... | @@ -96,8 +96,7 @@ |
| 96 | 96 |
</fieldset>
|
| 97 | 97 |
|
| 98 | 98 |
<br/>
|
| 99 |
- <s:submit action="validateComputeRF1"
|
|
| 100 |
- key="t3.action.validateConfiguration" align="right"/>
|
|
| 99 |
+ <s:submit action="validateComputeRF1" key="t3.action.validateConfiguration" align="right"/>
|
|
| 101 | 100 |
</s:form>
|
| 102 | 101 |
|
| 103 | 102 |
</s:else>
|
| ... | ... | @@ -47,10 +47,10 @@ |
| 47 | 47 |
<jsp:include page="ComputeRF2ConfigResume.jsp"/>
|
| 48 | 48 |
|
| 49 | 49 |
<br/>
|
| 50 |
- <s:submit action="configureComputeRF2" key="t3.action.backToConfiguration"
|
|
| 51 |
- align="right"/>
|
|
| 50 |
+ <div class="actions">
|
|
| 51 |
+ <s:submit action="configureComputeRF2" key="t3.action.backToConfiguration" align="right"/>
|
|
| 52 | 52 |
<s:submit action="run-ComputeRF2" key="t3.action.runAction" align="right"/>
|
| 53 |
- |
|
| 53 |
+ </div>
|
|
| 54 | 54 |
</s:form>
|
| 55 | 55 |
</s:if>
|
| 56 | 56 |
<s:else>
|
| ... | ... | @@ -91,8 +91,7 @@ |
| 91 | 91 |
|
| 92 | 92 |
</fieldset>
|
| 93 | 93 |
<br/>
|
| 94 |
- <s:submit action="validateComputeRF2" key="t3.action.validateConfiguration"
|
|
| 95 |
- align="right"/>
|
|
| 94 |
+ <s:submit action="validateComputeRF2" key="t3.action.validateConfiguration" align="right"/>
|
|
| 96 | 95 |
</s:form>
|
| 97 | 96 |
|
| 98 | 97 |
<script type="text/javascript">
|
| ... | ... | @@ -43,11 +43,12 @@ |
| 43 | 43 |
<jsp:include page="ComputeSetDurationAndPositiveSetCountConfigResume.jsp"/>
|
| 44 | 44 |
|
| 45 | 45 |
<br/>
|
| 46 |
+ <div class="actions">
|
|
| 46 | 47 |
<s:submit action="configureComputeSetDurationAndPositiveSetCount"
|
| 47 | 48 |
key="t3.action.backToConfiguration" align="right"/>
|
| 48 | 49 |
<s:submit action="run-ComputeSetDurationAndPositiveSetCount"
|
| 49 | 50 |
key="t3.action.runAction" align="right"/>
|
| 50 |
- |
|
| 51 |
+ </div>
|
|
| 51 | 52 |
</s:form>
|
| 52 | 53 |
</s:if>
|
| 53 | 54 |
|
| ... | ... | @@ -43,11 +43,10 @@ |
| 43 | 43 |
<jsp:include page="ComputeTripEffortsConfigResume.jsp"/>
|
| 44 | 44 |
|
| 45 | 45 |
<br/>
|
| 46 |
- <s:submit action="configureComputeTripEfforts"
|
|
| 47 |
- key="t3.action.backToConfiguration" align="right"/>
|
|
| 48 |
- <s:submit action="run-ComputeTripEfforts" key="t3.action.runAction"
|
|
| 49 |
- align="right"/>
|
|
| 50 |
- |
|
| 46 |
+ <div class="actions">
|
|
| 47 |
+ <s:submit action="configureComputeTripEfforts" key="t3.action.backToConfiguration" align="right"/>
|
|
| 48 |
+ <s:submit action="run-ComputeTripEfforts" key="t3.action.runAction" align="right"/>
|
|
| 49 |
+ </div>
|
|
| 51 | 50 |
</s:form>
|
| 52 | 51 |
</s:if>
|
| 53 | 52 |
|
| ... | ... | @@ -43,11 +43,10 @@ |
| 43 | 43 |
<jsp:include page="ComputeWellPlanWeightCategoriesProportionsConfigResume.jsp"/>
|
| 44 | 44 |
|
| 45 | 45 |
<br/>
|
| 46 |
- <s:submit action="configureComputeWellPlanWeightCategoriesProportions"
|
|
| 47 |
- key="t3.action.backToConfiguration" align="right"/>
|
|
| 48 |
- <s:submit action="run-ComputeWellPlanWeightCategoriesProportions" key="t3.action.runAction"
|
|
| 49 |
- align="right"/>
|
|
| 50 |
- |
|
| 46 |
+ <div class="actions">
|
|
| 47 |
+ <s:submit action="configureComputeWellPlanWeightCategoriesProportions" key="t3.action.backToConfiguration" align="right"/>
|
|
| 48 |
+ <s:submit action="run-ComputeWellPlanWeightCategoriesProportions" key="t3.action.runAction" align="right"/>
|
|
| 49 |
+ </div>
|
|
| 51 | 50 |
</s:form>
|
| 52 | 51 |
</s:if>
|
| 53 | 52 |
|
| ... | ... | @@ -43,11 +43,10 @@ |
| 43 | 43 |
<jsp:include page="ConvertCatchesWeightCategoriesConfigResume.jsp"/>
|
| 44 | 44 |
|
| 45 | 45 |
<br/>
|
| 46 |
- <s:submit action="configureConvertCatchesWeightCategories"
|
|
| 47 |
- key="t3.action.backToConfiguration" align="right"/>
|
|
| 48 |
- <s:submit action="run-ConvertCatchesWeightCategories"
|
|
| 49 |
- key="t3.action.runAction" align="right"/>
|
|
| 50 |
- |
|
| 46 |
+ <div class="actions">
|
|
| 47 |
+ <s:submit action="configureConvertCatchesWeightCategories" key="t3.action.backToConfiguration" align="right"/>
|
|
| 48 |
+ <s:submit action="run-ConvertCatchesWeightCategories" key="t3.action.runAction" align="right"/>
|
|
| 49 |
+ </div>
|
|
| 51 | 50 |
</s:form>
|
| 52 | 51 |
</s:if>
|
| 53 | 52 |
|
| ... | ... | @@ -108,19 +108,16 @@ |
| 108 | 108 |
|
| 109 | 109 |
</fieldset>
|
| 110 | 110 |
<br/>
|
| 111 |
+ <div class="actions">
|
|
| 111 | 112 |
<s:if test="configurationInSession">
|
| 112 | 113 |
|
| 113 | 114 |
<%--Can remove configuration--%>
|
| 114 |
- <s:submit action="removeLevel1Configuration"
|
|
| 115 |
- key="t3.action.remove.configuration"
|
|
| 116 |
- align="right"/>
|
|
| 115 |
+ <s:submit action="removeLevel1Configuration" key="t3.action.remove.configuration" align="right"/>
|
|
| 117 | 116 |
</s:if>
|
| 118 | 117 |
|
| 119 | 118 |
<%--validate + save configuration--%>
|
| 120 |
- <s:submit action="validateLevel1Configuration"
|
|
| 121 |
- key="t3.action.save.configuration"
|
|
| 122 |
- align="right"/>
|
|
| 123 |
- |
|
| 119 |
+ <s:submit action="validateLevel1Configuration" key="t3.action.save.configuration" align="right"/>
|
|
| 120 |
+ </div>
|
|
| 124 | 121 |
</s:form>
|
| 125 | 122 |
|
| 126 | 123 |
<s:if test="confirm && configurationInSession">
|
| ... | ... | @@ -73,7 +73,7 @@ |
| 73 | 73 |
|
| 74 | 74 |
</fieldset>
|
| 75 | 75 |
<br/>
|
| 76 |
- |
|
| 76 |
+ <div class="actions">
|
|
| 77 | 77 |
<%-- back to step 1 --%>
|
| 78 | 78 |
<s:submit action="configureLevel2Step1!input" key="t3.action.back.to.configuration.step1" align="right"/>
|
| 79 | 79 |
|
| ... | ... | @@ -82,5 +82,5 @@ |
| 82 | 82 |
<%--validate + go to resume --%>
|
| 83 | 83 |
<s:submit action="configureLevel2Step2" key="t3.action.validate.configuration" align="right"/>
|
| 84 | 84 |
</s:if>
|
| 85 |
- |
|
| 85 |
+ </div>
|
|
| 86 | 86 |
</s:form>
|
| ... | ... | @@ -35,7 +35,7 @@ |
| 35 | 35 |
<jsp:include page="level2ConfigurationResume.jsp"/>
|
| 36 | 36 |
|
| 37 | 37 |
<br/>
|
| 38 |
- |
|
| 38 |
+ <div class="actions">
|
|
| 39 | 39 |
<%-- back to step 1 --%>
|
| 40 | 40 |
<s:submit action="configureLevel2Step1!input" key="t3.action.back.to.configuration.step1" align="right"/>
|
| 41 | 41 |
|
| ... | ... | @@ -44,5 +44,5 @@ |
| 44 | 44 |
|
| 45 | 45 |
<%-- launch action --%>
|
| 46 | 46 |
<s:submit action="configureLevel2Resume" key="t3.action.runAction" align="right"/>
|
| 47 |
- |
|
| 47 |
+ </div>
|
|
| 48 | 48 |
</s:form>
|
| ... | ... | @@ -100,10 +100,14 @@ |
| 100 | 100 |
<s:if test="!missingData">
|
| 101 | 101 |
|
| 102 | 102 |
<br/>
|
| 103 |
+ <div class="actions">
|
|
| 104 |
+ |
|
| 103 | 105 |
<%-- back to step 1 --%>
|
| 104 | 106 |
<s:submit action="configureLevel3Step1!input" key="t3.action.back.to.configuration.step1" align="right"/>
|
| 105 | 107 |
|
| 106 | 108 |
<%--validate + go to resume --%>
|
| 107 | 109 |
<s:submit action="configureLevel3Step2" key="t3.action.validate.configuration" align="right"/>
|
| 110 |
+ |
|
| 111 |
+ </div>
|
|
| 108 | 112 |
</s:if>
|
| 109 | 113 |
</s:form>
|
| ... | ... | @@ -35,6 +35,7 @@ |
| 35 | 35 |
<jsp:include page="level3ConfigurationResume.jsp"/>
|
| 36 | 36 |
|
| 37 | 37 |
<br/>
|
| 38 |
+ <div class="actions">
|
|
| 38 | 39 |
<%-- back to step 1 --%>
|
| 39 | 40 |
<s:submit action="configureLevel3Step1!input" key="t3.action.back.to.configuration.step1" align="right"/>
|
| 40 | 41 |
|
| ... | ... | @@ -43,5 +44,5 @@ |
| 43 | 44 |
|
| 44 | 45 |
<%-- launch action --%>
|
| 45 | 46 |
<s:submit action="configureLevel3Resume" key="t3.action.runAction" align="right"/>
|
| 46 |
- |
|
| 47 |
+ </div>
|
|
| 47 | 48 |
</s:form>
|
| ... | ... | @@ -66,7 +66,6 @@ |
| 66 | 66 |
<s:if test="loadedSource==null">
|
| 67 | 67 |
<s:hidden name="useWells" value="%{useWells}"/>
|
| 68 | 68 |
<s:file name="sourceToLoad" requiredLabel="true" label='%{getText("t3.common.sourceToUpload")} (*)'/>
|
| 69 |
- <s:submit action="configureImportData!doAddSource" key="t3.action.importData.addSource" align="right"/>
|
|
| 70 | 69 |
<br/>
|
| 71 | 70 |
|
| 72 | 71 |
<div class="cleanBoth">
|
| ... | ... | @@ -74,6 +73,9 @@ |
| 74 | 73 |
<s:param value="%{maxSize}"/>
|
| 75 | 74 |
</s:text>
|
| 76 | 75 |
</div>
|
| 76 |
+ <div class="actions">
|
|
| 77 |
+ <s:submit action="configureImportData!doAddSource" key="t3.action.importData.addSource" align="right"/>
|
|
| 78 |
+ </div>
|
|
| 77 | 79 |
</s:if>
|
| 78 | 80 |
<s:else>
|
| 79 | 81 |
<s:hidden key="loadedSource" label=''/>
|
| ... | ... | @@ -84,8 +86,10 @@ |
| 84 | 86 |
<s:checkbox key="canCreateVirtualActivity" label='%{getText("t3.common.canCreateVirtualActivity")}'/>
|
| 85 | 87 |
<s:checkbox key="canCreateVessel" label='%{getText("t3.common.canCreateVessel")}'/>
|
| 86 | 88 |
<s:checkbox key="createVirtualVessel" label='%{getText("t3.common.createVirtualVessel")}'/>
|
| 89 |
+ <div class="actions">
|
|
| 87 | 90 |
<s:submit action="configureImportData!doDeleteSource" key="t3.action.importData.deleteSource" align="right"/>
|
| 88 | 91 |
<s:submit action="configureImportData!doPrepareAnalyze" key="t3.action.importData.analyze" align="right"/>
|
| 92 |
+ </div>
|
|
| 89 | 93 |
</s:else>
|
| 90 | 94 |
|
| 91 | 95 |
</s:form>
|
| ... | ... | @@ -31,9 +31,8 @@ |
| 31 | 31 |
|
| 32 | 32 |
<jsp:include page="exportConfigResume.jsp"/>
|
| 33 | 33 |
|
| 34 |
- <s:submit action="configureExport!input" align="right"
|
|
| 35 |
- key="t3.action.backToConfiguration"/>
|
|
| 36 |
- |
|
| 34 |
+ <div class="actions">
|
|
| 35 |
+ <s:submit action="configureExport!input" align="right" key="t3.action.backToConfiguration"/>
|
|
| 37 | 36 |
<s:submit action="runExport" key="t3.action.launch.export" align="right"/>
|
| 38 |
- |
|
| 37 |
+ </div>
|
|
| 39 | 38 |
</s:form>
|
| ... | ... | @@ -117,6 +117,13 @@ fieldset, hr , .cleanBoth{ |
| 117 | 117 |
padding-top: 0.3em;
|
| 118 | 118 |
}
|
| 119 | 119 |
|
| 120 |
+ |
|
| 121 |
+.wwgrp{
|
|
| 122 |
+ float: left;
|
|
| 123 |
+ clear: both;
|
|
| 124 |
+ margin-bottom: 10px;
|
|
| 125 |
+}
|
|
| 126 |
+ |
|
| 120 | 127 |
.wwlbl {
|
| 121 | 128 |
float: left;
|
| 122 | 129 |
clear: both;
|
| ... | ... | @@ -136,6 +143,16 @@ div.errorMessage{ |
| 136 | 143 |
clear: both;
|
| 137 | 144 |
float: left;
|
| 138 | 145 |
}
|
| 146 |
+ |
|
| 147 |
+.actions input[type=submit] {
|
|
| 148 |
+ margin-left:5px;
|
|
| 149 |
+}
|
|
| 150 |
+.actions {
|
|
| 151 |
+ clear: both;
|
|
| 152 |
+ display: flex;
|
|
| 153 |
+ flex-flow: row;
|
|
| 154 |
+ justify-content: flex-end;
|
|
| 155 |
+}
|
|
| 139 | 156 |
.errorMessage {
|
| 140 | 157 |
background: url("../images/exclamation.png") no-repeat ;
|
| 141 | 158 |
list-style: none;
|