Author: tchemit Date: 2014-04-02 11:54:55 +0200 (Wed, 02 Apr 2014) New Revision: 1800 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1800 Log: comment resources filtering + add js endpoints file Added: trunk/wao-web/src/main/webapp/enpoints-js.jsp Modified: trunk/wao-web/pom.xml trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-04-02 09:24:15 UTC (rev 1799) +++ trunk/wao-web/pom.xml 2014-04-02 09:54:55 UTC (rev 1800) @@ -162,7 +162,8 @@ <build> <finalName>wao-${project.version}</finalName> - <resources> + <!--FIXME--> + <!--resources> <resource> <directory>src/main/resources</directory> <filtering>false</filtering> @@ -177,7 +178,7 @@ <include>struts.xml</include> </includes> </resource> - </resources> + </resources--> <pluginManagement> <plugins> <plugin> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-02 09:24:15 UTC (rev 1799) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-02 09:54:55 UTC (rev 1800) @@ -30,11 +30,9 @@ <script> - var BOATS_FILTER_VALUES_JSON_URL = '<s:url action="boats-filter-values-json" />'; - $(document).ready(function () { - var boatsFilterController = new FilterController(BOATS_FILTER_VALUES_JSON_URL, $('#boats-filters-form')); + var boatsFilterController = new FilterController(WAO.BOATS_FILTER_VALUES_JSON_URL, $('#boats-filters-form')); boatsFilterController.init(); }); Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-02 09:24:15 UTC (rev 1799) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-02 09:54:55 UTC (rev 1800) @@ -30,11 +30,9 @@ <script> - var SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url action="sample-rows-filter-values-json" />'; - $(document).ready(function () { - var sampleRowsFilterController = new FilterController(SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); + var sampleRowsFilterController = new FilterController(WAO.SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); sampleRowsFilterController.init(); $('#switch-estimated-real').click(function () { Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-04-02 09:24:15 UTC (rev 1799) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-04-02 09:54:55 UTC (rev 1800) @@ -30,9 +30,10 @@ <title><decorator:title default="Wao"/> - Wao</title> <sj:head locale="fr" jqueryui="true" loadAtOnce="true" jquerytheme="start" /> <sb:head /> - <script type="text/javascript" src="<s:url value='/wao.js' />"></script> - <link rel="stylesheet" type="text/css" href="<s:url value='/wao.css' />" media="all" /> - <link rel="stylesheet" type="text/css" href="<s:url value='/wao-screen.css' />" media="screen"> + <script type="text/javascript" src="<s:url value='/wao.js'/>"></script> + <script type="text/javascript" src="<s:url value='/enpoints-js.jsp'/>"></script> + <link rel="stylesheet" type="text/css" href="<s:url value='/wao.css'/>" media="all" /> + <link rel="stylesheet" type="text/css" href="<s:url value='/wao-screen.css'/>" media="screen"> <decorator:head /> </head> Added: trunk/wao-web/src/main/webapp/enpoints-js.jsp =================================================================== --- trunk/wao-web/src/main/webapp/enpoints-js.jsp (rev 0) +++ trunk/wao-web/src/main/webapp/enpoints-js.jsp 2014-04-02 09:54:55 UTC (rev 1800) @@ -0,0 +1,13 @@ +<%@ page language="java" contentType="text/javascript; charset=utf-8" pageEncoding="utf-8"%><%@ taglib uri="/struts-tags" prefix="s" %> +<% + // allow this page to be cached by browser + response.setDateHeader("Expires", System.currentTimeMillis() + 3600000L); // 1 hour in future. +%> + +$(document).ready(function () { + + WAO.SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url action="sample-rows-filter-values-json"/>'; + WAO.BOATS_FILTER_VALUES_JSON_URL = '<s:url action="boats-filter-values-json"/>'; +}); + + Property changes on: trunk/wao-web/src/main/webapp/enpoints-js.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native