r296 - in trunk/chorem-webmotion: . src/main/java/org/chorem/webmotion/injector src/main/webapp/WEB-INF src/main/webapp/WEB-INF/jsp src/main/webapp/js
Author: bpoussin Date: 2013-01-15 20:05:07 +0100 (Tue, 15 Jan 2013) New Revision: 296 Url: http://chorem.org/projects/chorem/repository/revisions/296 Log: - passage en webmotion 2.3.3 - correction bug sur la selection d'entite dans les formulaires (du au changement de version jquery-ui) - ajout d'un theme jquery-ui Modified: trunk/chorem-webmotion/pom.xml trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml trunk/chorem-webmotion/src/main/webapp/js/chorem.js Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2013-01-12 14:03:56 UTC (rev 295) +++ trunk/chorem-webmotion/pom.xml 2013-01-15 19:05:07 UTC (rev 296) @@ -52,11 +52,6 @@ </dependency> <dependency> - <groupId>org.debux.webmotion</groupId> - <artifactId>webmotion</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-api</artifactId> </dependency> @@ -175,6 +170,21 @@ <artifactId>nuiton-js-bootstrap</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery-tokeninput</artifactId> + </dependency> + + <dependency> + <groupId>org.debux.webmotion</groupId> + <artifactId>webmotion</artifactId> + </dependency> + + <dependency> + <groupId>org.debux.webmotion</groupId> + <artifactId>webmotion-extra-sitemesh</artifactId> + </dependency> + </dependencies> <build> Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2013-01-12 14:03:56 UTC (rev 295) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2013-01-15 19:05:07 UTC (rev 296) @@ -45,7 +45,7 @@ public class InjectorListener implements WebMotionServerListener { @Override - public void onStart(ServerContext context) { + public void onStart(Mapping mpng, ServerContext context) { // Declare injector context.addInjector(new Injector() { Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-01-12 14:03:56 UTC (rev 295) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-01-15 19:05:07 UTC (rev 296) @@ -36,7 +36,7 @@ <link rel="stylesheet/less" href="<c:url value='/css/chorem.less '/>"> <%-- import via nuiton-js to add js or css show WEB-INF/wro.xml --%> <link href="<c:url value='/nuiton-js/chorem.css'/>" rel="stylesheet" type="text/css"/> - <script type="text/javascript" src="<c:url value='/nuiton-js/chorem.js'/>"></script> + <script type="text/javascript" src="<c:url value='/nuiton-js/chorem.js?minimize=false'/>"></script> </head> <body> <div class="navbar navbar-fixed-top"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-01-12 14:03:56 UTC (rev 295) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-01-15 19:05:07 UTC (rev 296) @@ -4,6 +4,7 @@ <group-ref>jquery</group-ref> <group-ref>bootstrap-responsive</group-ref> <group-ref>jquery-ui</group-ref> + <group-ref>jquery-ui-cupertino</group-ref> <group-ref>jqplot</group-ref> <!-- plugin jqplot --> <group-ref>jqplot.dateAxisRenderer</group-ref> @@ -14,15 +15,11 @@ <group-ref>jqplot.highlighter</group-ref> <group-ref>jqplot.barRenderer</group-ref> - <css>/css/token-input.css/</css> - <css>/css/token-input-mac.css</css> - <css>/css/token-input-facebook.css</css> - <js>/js/jquery.ui.datepicker-fr.js</js> <js>/js/jquery-ui-timepicker-addon.js</js> <js>/js/jquery-ui-timepicker-fr.js</js> - <js>/js/jquery.tokeninput.js</js> +<!-- <js>/js/jquery.tokeninput.js</js> --> <js>/js/less-1.2.1.min.js</js> <js>/js/chorem.js</js> </group> Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-01-12 14:03:56 UTC (rev 295) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-01-15 19:05:07 UTC (rev 296) @@ -73,7 +73,7 @@ ul.append( "<li class='ui-autocomplete-category'>" + item.extension + "</li>" ); currentExtension = item.extension; } - self._renderItem( ul, item ); + self._renderItemData( ul, item ); }); } });
participants (1)
-
bpoussin＠users.chorem.org