Author: echatellier Date: 2014-06-08 12:56:31 +0200 (Sun, 08 Jun 2014) New Revision: 147 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/147 Log: Update wro config. Removed: trunk/faxtomail-ui-web/src/main/resources/shiro.ini trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/version.jsp Modified: trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml trunk/pom.xml Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-06-06 16:26:07 UTC (rev 146) +++ trunk/faxtomail-ui-web/pom.xml 2014-06-08 10:56:31 UTC (rev 147) @@ -149,21 +149,11 @@ <artifactId>struts2-convention-plugin</artifactId> </dependency> - <!-- <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-json-plugin</artifactId> - </dependency> --> - <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-sitemesh-plugin</artifactId> </dependency> - <!-- <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - </dependency> --> - <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> @@ -218,25 +208,35 @@ <artifactId>nuiton-js-wro</artifactId> </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>bootstrap</artifactId> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery</artifactId> </dependency> + + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery-ui</artifactId> + </dependency> <dependency> - <groupId>org.webjars</groupId> - <artifactId>jquery</artifactId> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-bootstrap</artifactId> </dependency> <dependency> <groupId>org.webjars</groupId> <artifactId>select2</artifactId> + <exclusions> + <exclusion> + <artifactId>jquery</artifactId> + <groupId>org.webjars</groupId> + </exclusion> + </exclusions> </dependency> <dependency> + <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angularjs</artifactId> - <groupId>org.nuiton.js</groupId> </dependency> <dependency> @@ -245,14 +245,41 @@ </dependency> <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-font-awesome</artifactId> + </dependency> + + <dependency> <groupId>org.webjars</groupId> <artifactId>angular-ui-bootstrap</artifactId> + <exclusions> + <exclusion> + <artifactId>bootstrap</artifactId> + <groupId>org.webjars</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.webjars</groupId> <artifactId>angular-ui-sortable</artifactId> + <exclusions> + <exclusion> + <artifactId>jquery-ui</artifactId> + <groupId>org.webjars</groupId> + </exclusion> + </exclusions> </dependency> + + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-html5shiv</artifactId> + </dependency> + + <dependency> + <groupId>org.webjars</groupId> + <artifactId>respond</artifactId> + </dependency> </dependencies> <build> Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java 2014-06-06 16:26:07 UTC (rev 146) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java 2014-06-08 10:56:31 UTC (rev 147) @@ -34,8 +34,6 @@ import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailEntityEnum; -import com.franciaflex.faxtomail.persistence.entities.MailFilter; -import com.franciaflex.faxtomail.persistence.entities.MailFilterAbstract; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.MailFolderAbstract; import com.franciaflex.faxtomail.web.json.HibernateProxyTypeAdapter; @@ -50,7 +48,7 @@ import com.opensymphony.xwork2.ActionSupport; @Results({ - @Result(name="login", type="redirectAction", params = { "actionName", "login!input", "namespace", "/authentication"}) + @Result(name="login", type="redirectAction", params = { "actionName", "login-input", "namespace", "/authentication"}) }) public class FaxToMailActionSupport extends ActionSupport { @@ -62,7 +60,7 @@ protected FaxToMailConfiguration applicationConfig; - private FaxToMailSession session; + protected FaxToMailSession session; protected Gson gson; @@ -86,14 +84,6 @@ return true; } - /*public String translateEnum(Class cl, String name) { - return t(cl.getName() + "." + name); - } - - public String translateEnum(Enum en) { - return translateEnum(en.getClass(), en.name()); - }*/ - public String getId(TopiaEntity entity) { String id = ""; @@ -105,10 +95,6 @@ } - public String getInstanceDisclaimer() { - return applicationConfig.getInstanceDisclaimer(); - } - public void setSession(FaxToMailSession session) { this.session = session; } Modified: trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties 2014-06-06 16:26:07 UTC (rev 146) +++ trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties 2014-06-08 10:56:31 UTC (rev 147) @@ -2,9 +2,11 @@ # dev disableCache=true minimize=false -#preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender -#postProcessors=cssVariables +preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender +postProcessors=cssVariables # prod #disableCache=false #minimize=true +#preProcessors=cssUrlRewriting,cssImport,semicolonAppender,cssMinJawr +#postProcessors=cssVariables,jsMin Deleted: trunk/faxtomail-ui-web/src/main/resources/shiro.ini =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/shiro.ini 2014-06-06 16:26:07 UTC (rev 146) +++ trunk/faxtomail-ui-web/src/main/resources/shiro.ini 2014-06-08 10:56:31 UTC (rev 147) @@ -1,37 +0,0 @@ -[main] -# URL vers laquelle il faut rediriger si l'utilisateur n'est pas authentifié -authc.loginUrl = /authentication/login!input.action - -# dans le formulaire d'authentifaction, le champs contenant le username s'appelle "email" -authc.usernameParam = email -# authc.passwordParam = password - -# on utilise un cache dans notre implémentation du Realm, il faut le configurer -cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager -securityManager.cacheManager = $cacheManager - -# on indique notre implémentation du realm -# extranetEncAhiRealm = fr.gouv.social.encahi.extranet.web.ExtranetEncAhiRealm - -# on l'indique comme seul realm à utiliser -# securityManager.realms = $extranetEncAhiRealm - -[urls] - -# on doit pouvoir accéder à ces pages sans être authentifié -/authentication/login* = anon -/authentication/forgotten-password-* = anon -/authentication/registration* = anon - -# on donne accès aux ressource statiques -/css/** = anon -/data/** = anon -/font/** = anon -/img/** = anon -/js/** = anon -/struts/js/** = anon -/struts/themes/** = anon -/struts/bootstrap/** = anon - -# pour tout le reste, il faut être authentifié -#/** = authc 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-06 16:26:07 UTC (rev 146) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-08 10:56:31 UTC (rev 147) @@ -476,7 +476,7 @@ <div id="collapse3" class="panel-collapse collapse"> <div class="panel-body"> <label> - <input type="checkbox" ng-model="selectedMailFolder.useCurrentLevelEtatAttente" ng-value="false" /> + <input type="checkbox" ng-model="selectedMailFolder.useCurrentLevelEtatAttente" ng-value="true" /> Redéfinir les états d'attente à ce niveau. </label> Dans le cas contraires, les états d'attentes des dossiers parents seront pris en compte. @@ -507,67 +507,56 @@ <tr> <th>Utilisateur ou groupe</th> <th>Droits</th> - <th>Action</th> </tr> </thead> <tbody> <tr ng-repeat="user in parentsWriteRightUsers"> <td> - <span class="glyphicon glyphicon-arrow-up"></span> <em>{{user.firstName}} {{user.lastName}}</em> + <span class="fa fa-user"></span> <em>{{user.firstName}} {{user.lastName}}</em> </td> <td> <label><input type="checkbox"> Lecture</label> <label><input type="checkbox"> Écriture</label> <label><input type="checkbox"> Déplacement</label> </td> - <td> - - </td> </tr> <tr ng-repeat="group in parentsWriteRightGroups"> <td> - <span class="glyphicon glyphicon-arrow-up"></span> <em>{{group.fullPath}}</em> + <span class="fa fa-users"></span> <em>{{group.fullPath}}</em> </td> <td> <label><input type="checkbox"> Lecture</label> <label><input type="checkbox"> Écriture</label> <label><input type="checkbox"> Déplacement</label> </td> - <td> - - </td> </tr> </tbody> <tbody> <tr ng-repeat="user in selectedMailFolder.writeRightUsers"> <td> - <span class="glyphicon glyphicon-user"></span> {{user.firstName}} {{user.lastName}} + <span class="fa fa-user"></span> {{user.firstName}} {{user.lastName}} + <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeWriteRightUser($index)"> + <span class="glyphicon glyphicon-remove"></span> + </a> </td> <td> <label><input type="checkbox"> Lecture</label> <label><input type="checkbox"> Écriture</label> <label><input type="checkbox"> Déplacement</label> </td> + </tr> + <tr ng-repeat="group in selectedMailFolder.writeRightGroups"> <td> - <a class="pull-right btn btn-danger btn-xs" ng-click="removeWriteRightUser($index)"> + <span class="fa fa-users"></span> {{group.fullPath}} + <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeWriteRightGroup($index)"> <span class="glyphicon glyphicon-remove"></span> </a> </td> - </tr> - <tr ng-repeat="group in selectedMailFolder.writeRightGroups"> <td> - <span class="glyphicon glyphicon-folder-open"></span> {{group.fullPath}} - </td> - <td> <label><input type="checkbox"> Lecture</label> <label><input type="checkbox"> Écriture</label> <label><input type="checkbox"> Déplacement</label> </td> - <td> - <a class="pull-right btn btn-danger btn-xs" ng-click="removeWriteRightGroup($index)"> - <span class="glyphicon glyphicon-remove"></span> - </a> - </td> </tr> </tbody> </table> @@ -576,7 +565,7 @@ Nouveau utilisateur : <select ng-model="newWriteRightUser" ng-options="user as user.firstName + ' ' + user.lastName for user in users"></select> <a class="btn btn-success btn-xs" ng-click="addWriteRightUser()" ng-disabled="!newWriteRightUser"> - <span class="glyphicon glyphicon-ok"></span> + <span class="glyphicon glyphicon-plus"></span> </a> </div> @@ -586,7 +575,7 @@ <option></option> </select> <a class="btn btn-success btn-xs" ng-click="addWriteRightGroup()" ng-disabled="!newWriteRightGroup"> - <span class="glyphicon glyphicon-ok"></span> + <span class="glyphicon glyphicon-plus"></span> </a> </div> </div> @@ -623,27 +612,33 @@ </div> <div id="collapse6" class="panel-collapse collapse"> <div class="panel-body"> + + <label> + <input type="checkbox" ng-model="selectedMailFolder.useCurrentLevelTableColumns" ng-value="true" /> Définir un ordre + différent du dossier parent à ce niveau.</label> + <hr /> + <div class="control-group"> <label class="control-label" for="tableColumns">Champs à afficher dans le tableau (l'ordre peut être changé en faisant un glisser/déposer sur les champs)</label> <div class="controls"> <input type="hidden" ui-select2-sortable ng-model="folderTableColumns" - simple-query="getObjectsData" multiple sortable> + simple-query="getObjectsData" multiple sortable ng-disabled="!selectedMailFolder.useCurrentLevelTableColumns"> </div> - - <div> - <table id='table-snapshot' class="table table-bordered"> - <caption>Aperçu</caption> - <thead> - <tr> - <th ng-repeat="etatAttenteField in folderTableColumns">{{mailFields[etatAttenteField.id]}}</th> - </tr> - </thead> - </table> </div> + + <div> + <table id='table-snapshot' class="table table-bordered"> + <caption>Aperçu</caption> + <thead> + <tr> + <th ng-repeat="etatAttenteField in folderTableColumns">{{mailFields[etatAttenteField.id]}}</th> + </tr> + </thead> + </table> + </div> </div> </div> - </div> </div> </div> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-06 16:26:07 UTC (rev 146) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-08 10:56:31 UTC (rev 147) @@ -24,17 +24,20 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <!DOCTYPE html> <%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sb" uri="/struts-bootstrap-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <%@ taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> <html> <head> + <meta charset="utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> <title>FaxToMail : <decorator:title default="FaxToMail"/></title> - <sj:head locale="fr" jqueryui="true" loadAtOnce='true' jquerytheme="start" /> - <sb:head /> <link rel="stylesheet" type="text/css" href="<s:url value='/nuiton-js/faxtomail.css' />" /> <script type="text/javascript" src="<s:url value='/nuiton-js/faxtomail.js' />"></script> + <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> + <!--[if lt IE 9]> + <script type="text/javascript" src="<s:url value='/nuiton-js/faxtomail-ie8.js' />"></script> + <![endif]--> <decorator:head/> </head> @@ -71,14 +74,5 @@ </div> </div> </div> - - <s:if test="%{instanceDisclaimer != null}"> - <div id="instance-disclaimer"> - <div> - <s:property value="instanceDisclaimer" /> - </div> - </div> - </s:if> - </body> </html> Deleted: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/version.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/version.jsp 2014-06-06 16:26:07 UTC (rev 146) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/version.jsp 2014-06-08 10:56:31 UTC (rev 147) @@ -1,25 +0,0 @@ -<%-- - #%L - FaxToMail :: Web - $Id$ - $HeadURL$ - %% - Copyright (C) 2014 Franciaflex, Code Lutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --%> -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -${project.version} 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-06 16:26:07 UTC (rev 146) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml 2014-06-08 10:56:31 UTC (rev 147) @@ -7,43 +7,54 @@ </group> <group name='webjar-angular-ui-sortable' abstract="true"> - <group-ref>angular</group-ref> <js>classpath:META-INF/resources/webjars/angular-ui-sortable/0.12.2/sortable.min.js</js> </group> <group name='webjar-angular-ui-bootstrap' abstract="true"> - <!-- do not include bootstrap here : done by struts --> + <group-ref>bootstrap</group-ref> <group-ref>angular</group-ref> <js>classpath:META-INF/resources/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap.js</js> <js>classpath:META-INF/resources/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap-tpls.js</js> </group> <group name='select2sortable' abstract="true"> - <group-ref>angular</group-ref> <group-ref>webjar-select2</group-ref> <js>/js/select2sortable.js</js> </group> - + <group name='webjar-respond' abstract="true"> + <js>classpath:META-INF/resources/webjars/respond/1.4.2/src/respond.js</js> + </group> - + <group name='faxtomail'> + <group-ref>jquery</group-ref> + <group-ref>jquery-ui</group-ref> + <group-ref>bootstrap</group-ref> <group-ref>angular</group-ref> <group-ref>webjar-angular-ui-bootstrap</group-ref> + <group-ref>angular-ui-tree</group-ref> + <group-ref>font-awesome</group-ref> <js>/js/faxtomail.js</js> </group> + <group name='faxtomail-ie8'> + <group-ref>html5shiv</group-ref> + <group-ref>webjar-respond</group-ref> + </group> + <group name='faxtomail-configuration'> <group-ref>select2sortable</group-ref> <group-ref>webjar-angular-ui-sortable</group-ref> - <group-ref>angular-ui-tree</group-ref> + <group-ref>font-awesome</group-ref> <js>/js/configuration.js</js> <css>/css/faxtomail.css</css> </group> <group name='faxtomail-user-folder'> <group-ref>select2sortable</group-ref> + <group-ref>font-awesome</group-ref> <js>/js/user-folder.js</js> <css>/css/faxtomail.css</css> </group> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-06 16:26:07 UTC (rev 146) +++ trunk/pom.xml 2014-06-08 10:56:31 UTC (rev 147) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.8</version> + <version>5.0.9</version> </parent> <groupId>com.franciaflex</groupId> @@ -528,21 +528,22 @@ <version>1.7.5</version> <scope>runtime</scope> </dependency> - + <dependency> - <groupId>org.webjars</groupId> - <artifactId>angular-ui-utils</artifactId> - <version>0.1.1</version> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery</artifactId> + <version>1.11.1-1</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>angularjs</artifactId> - <groupId>org.webjars</groupId> - </exclusion> - </exclusions> </dependency> - + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-bootstrap</artifactId> + <version>3.1.1-2-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.webjars</groupId> <artifactId>angular-ui-sortable</artifactId> <version>0.12.2</version> @@ -563,44 +564,52 @@ </dependency> <dependency> - <groupId>org.webjars</groupId> - <artifactId>bootstrap</artifactId> - <version>3.1.1-1</version> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery-ui</artifactId> + <version>1.10.4-1</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.webjars</groupId> - <artifactId>jquery</artifactId> - <version>1.11.1</version> + <artifactId>select2</artifactId> + <version>3.4.8-1</version> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-angularjs</artifactId> + <version>1.2.17-1-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> <dependency> - <groupId>org.webjars</groupId> - <artifactId>select2</artifactId> - <version>3.4.8-1</version> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-font-awesome</artifactId> + <version>4.1.0-1-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> - <artifactId>nuiton-js-angularjs</artifactId> <groupId>org.nuiton.js</groupId> - <version>1.2.16-1</version> + <artifactId>nuiton-js-html5shiv</artifactId> + <version>3.7.2-1-SNAPSHOT</version> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>org.webjars</groupId> + <artifactId>respond</artifactId> + <version>1.4.2</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular-ui-tree</artifactId> <version>2.1.4-1</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>nuiton-js-angularjs</artifactId> - <groupId>org.nuiton.js</groupId> - </exclusion> - </exclusions> </dependency> <dependency>