r1848 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/obsmer WEB-INF/decorators
Author: bleny Date: 2014-04-07 11:17:13 +0200 (Mon, 07 Apr 2014) New Revision: 1848 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1848 Log: in layout deal with active menu items Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/wao.css trunk/wao-web/src/main/webapp/wao.js 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-06 17:05:20 UTC (rev 1847) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-07 09:17:13 UTC (rev 1848) @@ -57,6 +57,7 @@ </head> <content tag="mainClass">large</content> +<content tag="boatsMenuItemClass">active</content> <div id="boats-filters-list-details-layout"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-04-06 17:05:20 UTC (rev 1847) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-04-07 09:17:13 UTC (rev 1848) @@ -71,6 +71,7 @@ </head> <content tag="mainClass">large</content> +<content tag="contactsMenuItemClass">active</content> <s:form method="GET" id="contacts-filters-form" cssClass="filters-form"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-04-06 17:05:20 UTC (rev 1847) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-04-07 09:17:13 UTC (rev 1848) @@ -21,6 +21,8 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@taglib uri="/struts-tags" prefix="s" %> +<content tag="newsMenuItemClass">active</content> + <html> <head> 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-06 17:05:20 UTC (rev 1847) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-07 09:17:13 UTC (rev 1848) @@ -57,6 +57,7 @@ </head> <content tag="mainClass">large</content> + <content tag="samplingPlanMenuItemClass">active</content> <s:form method="GET" id="sampling-plan-filters-form" cssClass="filters-form"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-06 17:05:20 UTC (rev 1847) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-07 09:17:13 UTC (rev 1848) @@ -55,31 +55,31 @@ <%--<a class="brand" href="#">Wao <s:property value="%{getText(#obsProgram.getI18nKey())}" /></a>--%> <ul class="nav"> - <li> + <li class="<decorator:getProperty property="page.newsMenuItemClass"/>"> <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="news" id="newsUrl" /> <s:a href="%{newsUrl}"> <i class="icon-home"></i> <s:text name="wao.ui.page.Index.title" /> </s:a> </li> - <li class="active"> + <li class="<decorator:getProperty property="page.samplingPlanMenuItemClass"/>"> <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}"> <i class="icon-calendar"></i> <s:text name="wao.ui.page.SamplingPlan.title" /> </s:a> </li> - <li> + <li class="<decorator:getProperty property="page.boatsMenuItemClass"/>"> <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="boats" id="boatsUrl" /> <s:a href="%{boatsUrl}"> <s:text name="wao.ui.page.Boats.title" /> </s:a> </li> - <li> + <li class="<decorator:getProperty property="page.contactsMenuItemClass"/>"> <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="contacts" id="contactsUrl" /> <s:a href="%{contactsUrl}"> <i class="icon-tasks"></i> <s:text name="wao.ui.page.Contacts.title" /> </s:a> </li> - <li> + <li class="<decorator:getProperty property="page.synthesisMenuItemClass"/>"> <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="synthesis" id="synthesisUrl" /> <s:a href="%{synthesisUrl}"> <i class="icon-signal"></i> <s:text name="wao.ui.page.Synthesis.title" /> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-06 17:05:20 UTC (rev 1847) +++ trunk/wao-web/src/main/webapp/wao.css 2014-04-07 09:17:13 UTC (rev 1848) @@ -287,10 +287,15 @@ #boats-filters-list-details-layout { display: flex; justify-content: space-around; - align-items: stretch; - align-items: center; + align-items: flex-start; + flex-wrap: nowrap; } +#boats-filters-list-details-layout > div { + margin-left: 20px; +} + #boats-filters-list-details-layout > div:nth-child(3) { - max-width: 35%; + /*max-width: 35%;*/ + flex: 1; } Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-04-06 17:05:20 UTC (rev 1847) +++ trunk/wao-web/src/main/webapp/wao.js 2014-04-07 09:17:13 UTC (rev 1848) @@ -247,6 +247,7 @@ // $('a[data-toggle="popover"]').popover(); $('span[data-toggle="tooltip"]').tooltip(); + // FIXME brendan 07/04/14 cannot enable select2 because we can't bind blur event without driving the application crazy, see https://github.com/ivaynberg/select2/issues/2193 //$('select').addClass('input-xlarge').select2(); WAO = new Wao();
participants (1)
-
bleny＠users.forge.codelutin.com