Author: ymartel Date: 2014-08-13 11:03:36 +0200 (Wed, 13 Aug 2014) New Revision: 435 Url: http://forge.chorem.org/projects/chorem/repository/revisions/435 Log: fix boostrap css, upgrade nuitonJsWro version Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp trunk/pom.xml Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2014-08-12 15:17:05 UTC (rev 434) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2014-08-13 09:03:36 UTC (rev 435) @@ -43,6 +43,7 @@ <link href="<c:url value='/css/chorem-bi.css'/>" rel="stylesheet" type="text/css"/> <link href="<c:url value='/css/ng-grid.min.css'/>" rel="stylesheet" type="text/css"/> <link href="<c:url value='/css/select2/select2.css'/>" rel="stylesheet" type="text/css"/> + <link href="<c:url value='/nuiton-js/bootstrap.css'/>" rel="stylesheet" type="text/css" /> <script type="text/javascript"> var webContext = "<c:url value='/'/>"; @@ -179,6 +180,9 @@ <a href="<c:url value="/wikitty/Category/search"/>"><span class="glyphicon glyphicon-th-list"></span>Categories</a> <a href="<c:url value="/wikitty/Category/edit/new"/>"><span class="glyphicon glyphicon-plus"></span></a> </li> + <li> + <a href="<c:url value="/financial/expenseAccounts"/>"><span class="glyphicon glyphicon-th-list"></span></a> + </li> <li class="divider"></li> <li>Report</li> <li><a href="<c:url value="/report?report=vat"/>">TVA mensuel</a></li> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp 2014-08-12 15:17:05 UTC (rev 434) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp 2014-08-13 09:03:36 UTC (rev 435) @@ -25,10 +25,10 @@ <%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> <head> + <link data-require="ng-table@*" data-semver="0.3.0" rel="stylesheet" href="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.css'/>" /> + <script data-require="angular-resource@1.2.0-rc.3" data-semver="1.2.0-rc.3" src="<c:url value='http://code.angularjs.org/1.2.0-rc.3/angular-resource.js'/>"></script> <script data-require="ng-table@*" data-semver="0.3.0" src="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.js'/>"></script> - <link data-require="ng-table@*" data-semver="0.3.0" rel="stylesheet" href="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.css'/>" /> - <link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" /> <script type="text/javascript" src="<c:url value='/js/paginationTable.js'/>"></script> <script type="text/javascript" src="<c:url value='/js/financial/expenseAccountListCtrl.js'/>"></script> <script type="text/javascript" src="<c:url value='/js/angular-ui-bootstrap-tpls-0.11.0.js'/>"></script> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-08-12 15:17:05 UTC (rev 434) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-08-13 09:03:36 UTC (rev 435) @@ -29,7 +29,6 @@ <script data-require="angular-resource@1.2.0-rc.3" data-semver="1.2.0-rc.3" src="<c:url value='http://code.angularjs.org/1.2.0-rc.3/angular-resource.js'/>"></script> <script data-require="ng-table@*" data-semver="0.3.0" src="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.js'/>"></script> <link data-require="ng-table@*" data-semver="0.3.0" rel="stylesheet" href="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.css'/>" /> - <link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" /> <script type="text/javascript" src="<c:url value='/js/projectPagination.js'/>"></script> <script> angular.module('Pagination').value('paginationInit', { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-12 15:17:05 UTC (rev 434) +++ trunk/pom.xml 2014-08-13 09:03:36 UTC (rev 435) @@ -104,7 +104,7 @@ <nuitonWebVersion>1.16</nuitonWebVersion> <wikittyVersion>3.11-SNAPSHOT</wikittyVersion> - <nuitonjsWro.version>1.0.2</nuitonjsWro.version> + <nuitonjsWro.version>1.0.3</nuitonjsWro.version> <nuitonjsAngularjs.version>1.2.12-1</nuitonjsAngularjs.version> <nuitonjsJquery.version>2.1.1-1</nuitonjsJquery.version> <nuitonjsJqueryui.version>1.10.4-1</nuitonjsJqueryui.version>