From bleny@users.forge.codelutin.com Mon Apr 7 11:17:13 2014 From: bleny@users.forge.codelutin.com To: wao-commits@list.forge.codelutin.com Subject: [Wao-commits] r1848 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/obsmer WEB-INF/decorators Date: Mon, 07 Apr 2014 11:17:13 +0200 Message-ID: <20140407091713.A42C518148C@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3116678591391510750==" --===============3116678591391510750== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 large +active =20
=20 Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 large +active =20 =20 Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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=3D"java" contentType=3D"text/html; charset=3Dutf-8" pageEn= coding=3D"utf-8"%> <%@taglib uri=3D"/struts-tags" prefix=3D"s" %> =20 +active + =20 Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.= jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 20= 14-04-06 17:05:20 UTC (rev 1847) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 20= 14-04-07 09:17:13 UTC (rev 1848) @@ -57,6 +57,7 @@ =20 large + active =20 =20 Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 <%--Wao --%>
    -
  • +
  • ">
    • -
  • +
  • ">
    • -
  • +
  • ">
    • -
  • +
  • ">
    • -
  • +
  • "> Modified: trunk/wao-web/src/main/webapp/wao.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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; } =20 +#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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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=3D"popover"]').popover(); $('span[data-toggle=3D"tooltip"]').tooltip(); =20 + // FIXME brendan 07/04/14 cannot enable select2 because we can't bind bl= ur event without driving the application crazy, see https://github.com/ivaynb= erg/select2/issues/2193 //$('select').addClass('input-xlarge').select2(); =20 WAO =3D new Wao(); --===============3116678591391510750==--