Author: bpoussin Date: 2012-05-25 12:40:37 +0200 (Fri, 25 May 2012) New Revision: 158 Url: http://chorem.org/repositories/revision/chorem/158 Log: - mise en place des dashboard sur les menus Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-05-25 10:35:08 UTC (rev 157) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-05-25 10:40:37 UTC (rev 158) @@ -66,7 +66,7 @@ </li> <li class="dropdown nav-group"> <!-- around projects --> - <a href="<c:url value="/wikitty/search?extension=Quotation&extension=ProjectOrder&extension=Task"/>">Project</a> + <a href="<c:url value="/project"/>">Project</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> <b class="caret"></b> </a> @@ -94,7 +94,7 @@ </li> <li class="dropdown nav-group"> <!-- around financial --> - <a href="<c:url value="/wikitty/search?extension=Invoice&extension=Quotation&extension=Invoiceable"/>">Financial</a> + <a href="<c:url value="/financial"/>">Financial</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> <b class="caret"></b> </a> @@ -119,6 +119,10 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> + <li>Vacation</li> + <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> </ul> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp 2012-05-25 10:35:08 UTC (rev 157) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial.jsp 2012-05-25 10:40:37 UTC (rev 158) @@ -7,4 +7,4 @@ <input type="submit"/> </form> -<jsp:include page="/fragment/dashboard/invoice"/> +<jsp:include page="/fragment/dashboard/invoice?query=${query}"/> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp 2012-05-25 10:35:08 UTC (rev 157) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp 2012-05-25 10:40:37 UTC (rev 158) @@ -7,5 +7,5 @@ <input type="submit"/> </form> -<jsp:include page="/fragment/dashboard/vacationAsked"/> -<jsp:include page="/fragment/dashboard/vacation"/> +<jsp:include page="/fragment/dashboard/vacationAsked?query=${query}"/> +<jsp:include page="/fragment/dashboard/vacation?query=${query}"/>