Author: echatellier Date: 2014-06-29 20:46:52 +0200 (Sun, 29 Jun 2014) New Revision: 290 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/290 Log: Update bootstrap, select2, angularjs, jquery-ui Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml trunk/pom.xml Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-29 18:21:17 UTC (rev 289) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-29 18:46:52 UTC (rev 290) @@ -90,9 +90,9 @@ <input type="text" id="configurationEmailMaxSizeField" class="form-control" ng-model="configuration.emailMaxSize" /> </div> - <div class="form-group"> - Actions autorisées lorsque la demande n'a pas d'état d'attente et est <strong>invalide</strong> : - <label class="checkbox" ng-repeat="(mailAction,label) in mailActions"> + Actions autorisées lorsque la demande n'a pas d'état d'attente et est <strong>invalide</strong> : + <div class="checkbox" ng-repeat="(mailAction,label) in mailActions"> + <label> <input type="checkbox" ng-checked="configuration.invalidFormDisabledActions.indexOf(mailAction) == -1" ng-click="changeInvalidAction(mailAction)"> {{label}} </label> @@ -169,16 +169,20 @@ <div class="col-md-8" ng-if="selectedEtatAttente"> <h3>Édition de l'état d'attente {{selectedEtatAttente.label}}</h3> Actions autorisées lorsque la demande est <strong>valide</strong> : - <label class="checkbox" ng-repeat="(mailAction,label) in mailActions"> - <input type="checkbox" ng-checked="selectedEtatAttente.validFormDisabledActions.indexOf(mailAction) == -1" - ng-click="changeEtatAttenteValidAction(mailAction)"> {{label}} - </label> + <div class="checkbox" ng-repeat="(mailAction,label) in mailActions"> + <label> + <input type="checkbox" ng-checked="selectedEtatAttente.validFormDisabledActions.indexOf(mailAction) == -1" + ng-click="changeEtatAttenteValidAction(mailAction)"> {{label}} + </label> + </div> Actions autorisées lorsque la demande est <strong>invalide</strong> : - <label class="checkbox" ng-repeat="(mailAction,label) in mailActions"> - <input type="checkbox" ng-checked="selectedEtatAttente.invalidFormDisabledActions.indexOf(mailAction) == -1" - ng-click="changeEtatAttenteInvalidAction(mailAction)"> {{label}} - </label> + <div class="checkbox" ng-repeat="(mailAction,label) in mailActions"> + <label> + <input type="checkbox" ng-checked="selectedEtatAttente.invalidFormDisabledActions.indexOf(mailAction) == -1" + ng-click="changeEtatAttenteInvalidAction(mailAction)"> {{label}} + </label> + </div> </div> <div class="col-md-8" ng-if="!selectedEtatAttente"> <em>Sélectionnez un état d'attente.</em> @@ -207,10 +211,12 @@ <div class="col-md-8" ng-if="selectedDemandType"> <h3>Édition du type de document {{selectedDemandType.label}}</h3> Champs obligatoires pour le type de document : - <label class="checkbox" ng-repeat="(mailField,label) in canBeRequiredMailFields"> - <input type="checkbox" ng-checked="selectedDemandType.fields.indexOf(mailField) != -1" - ng-click="changeDemandTypeField(mailField)"> {{label}} - </label> + <div class="checkbox" ng-repeat="(mailField,label) in canBeRequiredMailFields"> + <label> + <input type="checkbox" ng-checked="selectedDemandType.fields.indexOf(mailField) != -1" + ng-click="changeDemandTypeField(mailField)"> {{label}} + </label> + </div> </div> <div class="col-md-8" ng-if="!selectedDemandType"> <em>Sélectionnez un type de document.</em> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml 2014-06-29 18:21:17 UTC (rev 289) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml 2014-06-29 18:46:52 UTC (rev 290) @@ -24,9 +24,9 @@ <groups xmlns="http://www.isdc.ro/wro"> <group name='webjar-select2' abstract="true"> - <css>classpath:META-INF/resources/webjars/select2/3.4.8/select2.css</css> - <js>classpath:META-INF/resources/webjars/select2/3.4.8/select2.js</js> - <js>classpath:META-INF/resources/webjars/select2/3.4.8/select2_locale_fr.js</js> + <css>classpath:META-INF/resources/webjars/select2/3.5.0/select2.css</css> + <js>classpath:META-INF/resources/webjars/select2/3.5.0/select2.js</js> + <js>classpath:META-INF/resources/webjars/select2/3.5.0/select2_locale_fr.js</js> </group> <group name='webjar-chosen' abstract="true"> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-29 18:21:17 UTC (rev 289) +++ trunk/pom.xml 2014-06-29 18:46:52 UTC (rev 290) @@ -548,7 +548,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-bootstrap</artifactId> - <version>3.1.1-1</version> + <version>3.2.0-1-SNAPSHOT</version> <scope>runtime</scope> </dependency> @@ -575,14 +575,14 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-jquery-ui</artifactId> - <version>1.10.4-1</version> + <version>1.11.0-1-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.webjars</groupId> <artifactId>select2</artifactId> - <version>3.4.8-1</version> + <version>3.5.0</version> <scope>runtime</scope> </dependency> @@ -596,7 +596,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angularjs</artifactId> - <version>1.2.17-1</version> + <version>1.2.18-1-SNAPSHOT</version> <scope>runtime</scope> </dependency>