r193 - in trunk/chorem-webmotion: . src/main/webapp/WEB-INF/jsp
Author: ymartel Date: 2012-06-25 20:58:11 +0200 (Mon, 25 Jun 2012) New Revision: 193 Url: http://chorem.org/repositories/revision/chorem/193 Log: fix path to static ressources with jstl Modified: trunk/chorem-webmotion/pom.xml trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2012-06-25 10:48:00 UTC (rev 192) +++ trunk/chorem-webmotion/pom.xml 2012-06-25 18:58:11 UTC (rev 193) @@ -219,7 +219,7 @@ <configuration> <stopKey>A</stopKey> <stopPort>1269</stopPort> - <contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml> + <!--<contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml>--> <webAppConfig> <contextPath>/chorem</contextPath> </webAppConfig> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-06-25 10:48:00 UTC (rev 192) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-06-25 18:58:11 UTC (rev 193) @@ -34,21 +34,22 @@ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script> <script type="text/javascript" src="http://jquery-ui.googlecode.com/svn/trunk/ui/i18n/jquery.ui.datepicker-fr.js"></script> - <script type="text/javascript" src="/js/jquery-ui-timepicker-addon.js"></script> - <script type="text/javascript" src="/js/jquery-ui-timepicker-fr.js"></script> + <script type="text/javascript" src="<c:url value="/js/jquery-ui-timepicker-addon.js "/>"></script> + <script type="text/javascript" src="<c:url value="/js/jquery-ui-timepicker-fr.js "/>"></script> <%-- Bootstrap --%> - <link rel="stylesheet" href="/css/bootstrap.min.css"> - <link rel="stylesheet" href="/css/bootstrap-responsive.min.css"> - <script src="/js/bootstrap.min.js"></script> + <link rel="stylesheet" href="<c:url value="/css/bootstrap.min.css"/>"> + <link rel="stylesheet" href="<c:url value="/css/bootstrap-responsive.min.css"/>"> + <script src="<c:url value="/js/bootstrap.min.js"/>"></script> <%-- multi selection ajax --%> - <script type="text/javascript" src="/js/jquery.tokeninput.js"></script> - <link rel="stylesheet" type="text/css" href="/css/token-input.css" /> - <link rel="stylesheet" type="text/css" href="/css/token-input-mac.css" /> - <link rel="stylesheet" type="text/css" href="/css/token-input-facebook.css" /> + <script type="text/javascript" src="<c:url value="/js/jquery.tokeninput.js"/>"></script> + <link rel="stylesheet" type="text/css" href="<c:url value="/css/token-input.css"/>" /> + <link rel="stylesheet" type="text/css" href="<c:url value="/css/token-input-mac.css"/>" /> + <link rel="stylesheet" type="text/css" href="<c:url value="/css/token-input-facebook.css"/>" /> + <link rel="stylesheet" type="text/css" href="<c:url value="/css/token-input-facebook.css"/>" /> <%-- Specific chorem --%> - <link rel="stylesheet/less" href="/css/chorem.less"> - <script src="/js/less-1.2.1.min.js"></script> - <script src="/js/chorem.js"></script> + <link rel="stylesheet/less" href="<c:url value="/css/chorem.less "/>"> + <script src="<c:url value="/js/less-1.2.1.min.js "/>"></script> + <script src="<c:url value="/js/chorem.js "/>"></script> </head> <body> <div class="navbar navbar-fixed-top"> @@ -61,7 +62,7 @@ <span class="icon-bar"></span> </a> - <a class="brand" href="/">Chorem</a> + <a class="brand" href="<c:url value="/"/>">Chorem</a> <!-- Everything you want hidden at 940px or less, place within here --> <div class="nav-collapse"> @@ -136,7 +137,7 @@ <li><a href="<c:url value="/wikitty/Category/edit/new"/>"><i class="icon-plus icon-black"></i> Add category</a></li> <li class="divider"></li> <li>Other</li> - <li><a href="/wikitty/search?query=extension=Accounting">Accounting</a></li> + <li><a href="<c:url value="wikitty/search?query=extension=Accounting"/>">Accounting</a></li> </ul> </li> <li class="dropdown nav-group"> @@ -151,8 +152,8 @@ <li><a href="<c:url value="/wikitty/Vacation/search"/>"><i class="icon-th-list icon-black"></i> All vacations</a></li> <li><a href="<c:url value="/wikitty/Vacation/edit/new"/>"><i class="icon-plus icon-black"></i> Add vacation</a></li> <li class="divider"></li> - <li><a href="/wikitty/search?query=extension=Employee">Employee</a></li> - <li><a href="/wikitty/search?query=extension=Interview">Annual interview</a></li> + <li><a href="<c:url value="/wikitty/search?query=extension=Employee"/>">Employee</a></li> + <li><a href="<c:url value="/wikitty/search?query=extension=Interview"/>">Annual interview</a></li> </ul> </li> <li class="dropdown nav-group"> @@ -167,7 +168,7 @@ <li><a href="<c:url value="/wikitty/WikittyUser/search"/>"><i class="icon-th-list icon-black"></i> All users</a></li> <li><a href="<c:url value="/wikitty/WikittyUser/edit/new"/>"><i class="icon-plus icon-black"></i> Add user</a></li> <li class="divider"></li> - <li><a href="/admin/variables">Variables</a></li> + <li><a href="<c:url value="/admin/variables"/>">Variables</a></li> </ul> </li> </ul>
participants (1)
-
ymartel＠users.chorem.org