From lkaufmann@users.forge.codelutin.com Thu May 15 16:33:22 2014 From: lkaufmann@users.forge.codelutin.com To: wao-commits@list.forge.codelutin.com Subject: [Wao-commits] r1943 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/administration WEB-INF/content/obsmer WEB-INF/decorators Date: Thu, 15 May 2014 16:33:22 +0200 Message-ID: <20140515143322.3020E181DA1@goh.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4858539582365096782==" --===============4858539582365096782== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: lkaufmann Date: 2014-05-15 16:33:21 +0200 (Thu, 15 May 2014) New Revision: 1943 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1943 Log: Refs #4997 : Update display on form pages, responsive display for sample plan= filters Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user= .jsp trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-m= anagement.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input= .jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-contacts-input= .jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-sampling-plan-= input.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 Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/compan= ies.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/administration/companies.js= p 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.js= p 2014-05-15 14:33:21 UTC (rev 1943) @@ -25,71 +25,76 @@ =20 <s:text name=3D"wao.ui.page.companies.title" /> + form =20 -

+
+

=20 - - - - - - - +
- - - - - -
- class=3D"inactive"> - - - - + + + + + + class=3D"inactive"> + + + + - - -
- - - - - - - - - - - - - - =20 - - - - - - + + + + + + +
+ + + + + + + + + + + + + =20 - - - - - - + + + + + + =20 - - - - - - -
+ + + + + + =20 - - - - + + + + + + + + + + =20 +
+ + + + +
+ + Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-w= ao-user.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/administration/edit-wao-use= r.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-use= r.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -67,19 +67,20 @@ + form =20 -

- - - - - - -

- =20 +

+ + + + + + +

+ =20
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/refere= ntial-management.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/administration/referential-= management.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-= management.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -25,22 +25,24 @@ =20 <s:text name=3D"wao.ui.page.ReferentialManagement.title" /></= title> + <content tag=3D"mainClass">form</content> </head> =20 - <h1><s:text name=3D"wao.ui.page.ReferentialManagement.title" /></h1> =20 - <div class=3D"alert alert-info"> - <s:text name=3D"wao.ui.import.disclaimer" /> - </div> - <s:form action=3D"import-fishing-zones" method=3D"POST" enctype=3D"multi= part/form-data"> + =20 + <h1><s:text name=3D"wao.ui.page.ReferentialManagement.title" /></h1> =20 + <div class=3D"alert alert-info"> + <s:text name=3D"wao.ui.import.disclaimer" /> + </div> + <fieldset> <legend> <s:text name=3D"wao.import.fishingZones.prompt" /> </legend> =20 - <s:file name=3D"csvFile" /> + <s:file name=3D"csvFile" cssClass=3D"float-left" /> =20 <s:submit type=3D"button"> <i class=3D"icon-upload"></i> Importer @@ -56,7 +58,7 @@ <s:text name=3D"wao.import.terrestrialLocations.prompt" /> </legend> =20 - <s:file name=3D"csvFile" /> + <s:file name=3D"csvFile" cssClass=3D"float-left" /> =20 <s:submit type=3D"button"> <i class=3D"icon-upload"></i> Importer @@ -72,7 +74,7 @@ <s:text name=3D"wao.import.boats.prompt" /> </legend> =20 - <s:file name=3D"csvFile" /> + <s:file name=3D"csvFile" cssClass=3D"float-left"/> =20 <s:submit type=3D"button"> <i class=3D"icon-upload"></i> Importer @@ -89,7 +91,7 @@ <s:text name=3D"wao.import.contactStateMotives.prompt" /> </legend> =20 - <s:file name=3D"csvFile" /> + <s:file name=3D"csvFile" cssClass=3D"float-left" /> =20 <s:submit type=3D"button"> <i class=3D"icon-upload"></i> Importer Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-us= ers.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/administration/wao-users.js= p 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.js= p 2014-05-15 14:33:21 UTC (rev 1943) @@ -26,66 +26,70 @@ <head> =20 <title><s:text name=3D"wao.ui.page.waoUsers.title" /> - + form =20 -

+
+

=20 - - - - - - - - +
- - - - - - - -
- class=3D"inactive"> - - - - - + + + + - -
- - - - - - - - - - - - - - - - =20 - - - - - - - + + + + + + + +
+ + + class=3D"inactive"> + + + + + + + + + + + + + + + + + + + + =20 - - - - - - + + + + + + + + + + =20 +
+ + + + + + +
+
+ Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-inpu= t.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/edit-news-input.jsp = 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp = 2014-05-15 14:33:21 UTC (rev 1943) @@ -37,7 +37,7 @@ }); }); - news + form =20 =20 Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-ro= w-input.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/edit-sample-row-inpu= t.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-inpu= t.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -87,18 +87,11 @@ }); =20 + =20 + form =20 =20 -

- - - - - - -

-
@@ -107,6 +100,14 @@ =20 =20 +

+ + + + + + +

=20
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-contact= s-input.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/import-contacts-inpu= t.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-contacts-inpu= t.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -25,15 +25,16 @@ =20 <s:text name=3D"wao.ui.import.contacts" /> + form =20 -

+ =20 -
- -
+

=20 - +
+ +
=20
@@ -42,9 +43,11 @@ =20 =20 - - - +
+ + + +
=20 Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-samplin= g-plan-input.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/import-sampling-plan= -input.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-sampling-plan= -input.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -25,16 +25,17 @@ =20 <s:text name=3D"wao.ui.import.samplingPlan" /> + form =20 -

+ =20 -
- -
+

=20 - - +
+ +
+ =20
@@ -42,9 +43,11 @@ =20 =20 - - - +
+ + + +
=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-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 20= 14-05-15 14:33:21 UTC (rev 1943) @@ -54,10 +54,23 @@ =20 large active - + =20 + + + +
  • + + + +
    • +     + =20 + =20 +     + =20 =20 -
    +
    =20 =20 -
    +
    =20 =20 @@ -103,7 +116,7 @@ =20
    =20 -
    +
    =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-05-15 13= :42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-05-15 14= :33:21 UTC (rev 1943) @@ -94,6 +94,8 @@
      + + =20
    • 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-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-15 14:33:21 UTC (rev 1943) @@ -111,7 +111,14 @@ color : green; } =20 +.float-left { + float: left; +} +.float-right { + float: right; +} =20 + /***************************************************************************= *** * Styles globaux =C3=A0 l'application ***************************************************************************= **/ @@ -154,7 +161,7 @@ } =20 main.home, -main.news { +main.form { background-color:#efefef; max-width: 100%; } @@ -352,6 +359,11 @@ border-bottom:1px solid #CCC; } =20 + form.filters-form .filters-group { + float: left; + margin-right: 30px; + } + /** * Les boutons */ @@ -632,9 +644,9 @@ } =20 /** - * News edition + * Form edition */ -main.news form { +main.form > form { background-color: #FFF; border-left: 1px solid #BBB; border-right: 1px solid #BBB; @@ -642,15 +654,30 @@ margin: 0 auto; max-width: 968px; padding-top: 40px;=20 + padding-bottom: 10px; } +main.form > table { + background-color: #FFF; + margin: 0 auto; + max-width: 968px; + margin-top: 40px;=20 + border-left: 1px solid #BBB; + border-right: 1px solid #BBB; +} =20 -main.news form .control-group { +main.form form h1 { + padding: 5px 20px; + border-bottom: 2px solid #00B2B2; +} + +main.form form .control-group, +main.form form legend { padding: 0 20px; =20 } =20 -main.news form .form-actions { +main.form form .form-actions { margin: 20px 0 0 0; } -main.news form .form-actions button.btn { +main.form form .form-actions button.btn { float: right; } --===============4858539582365096782==--