From lkaufmann@users.forge.codelutin.com Fri May 16 16:12:50 2014
From: lkaufmann@users.forge.codelutin.com
To: wao-commits@list.forge.codelutin.com
Subject: [Wao-commits] r1951 - in trunk/wao-web/src/main/webapp: .
	WEB-INF/content/administration
Date: Fri, 16 May 2014 16:12:49 +0200
Message-ID: <20140516141249.DABAA181DA9@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8992059559383372320=="

--===============8992059559383372320==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: lkaufmann
Date: 2014-05-16 16:12:49 +0200 (Fri, 16 May 2014)
New Revision: 1951

Url: http://forge.codelutin.com/projects/wao/repository/revisions/1951

Log:
Refs 4997 Update screens layout

Modified:
   trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp
   trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.=
jsp
   trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.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-16 13:31:04 UTC (rev 1950)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.js=
p	2014-05-16 14:12:49 UTC (rev 1951)
@@ -28,7 +28,7 @@
         <content tag=3D"mainClass">form</content>
     </head>
=20
-    <form>
+    <div class=3D"form-wrapper">
         <h1><s:text name=3D"wao.ui.page.companies.title" /></h1>
=20
         <table class=3D"table table-bordered">
@@ -95,6 +95,6 @@
                 <i class=3D"icon-plus"></i> <s:text name=3D"wao.ui.action.cr=
eateCompany" />
             </s:a>
         </div>
-    </form>
+    </div>
=20
 </html>

Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-c=
ompany.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-company=
.jsp	2014-05-16 13:31:04 UTC (rev 1950)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company=
.jsp	2014-05-16 14:12:49 UTC (rev 1951)
@@ -31,19 +31,20 @@
                 <s:property value=3D"%{t('wao.ui.form.Company.title.edition'=
, company.name)}" />
             </s:else>
         </title>
+        <content tag=3D"mainClass">form</content>
     </head>
=20
-    <h1>
-        <s:if test=3D"companyId =3D=3D null">
-            <s:text name=3D"wao.ui.form.Company.title.creation" />
-        </s:if>
-        <s:else>
-            <s:property value=3D"%{t('wao.ui.form.Company.title.edition', co=
mpany.name)}" />
-        </s:else>
-    </h1>
-
     <s:form>
=20
+        <h1>
+            <s:if test=3D"companyId =3D=3D null">
+                <s:text name=3D"wao.ui.form.Company.title.creation" />
+            </s:if>
+            <s:else>
+                <s:property value=3D"%{t('wao.ui.form.Company.title.edition'=
, company.name)}" />
+            </s:else>
+        </h1>
+
         <s:hidden name=3D"companyId" value=3D"%{companyId}" />
=20
         <s:textfield name=3D"company.name" label=3D"%{getText('wao.ui.field.=
Company.name')}" requiredLabel=3D"true" cssClass=3D"input-xlarge" />

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-16 13:31:04 UTC (rev 1950)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.js=
p	2014-05-16 14:12:49 UTC (rev 1951)
@@ -29,7 +29,7 @@
         <content tag=3D"mainClass">form</content>
     </head>
=20
-    <form>
+    <div class=3D"form-wrapper">
         <h1><s:text name=3D"wao.ui.page.waoUsers.title" /></h1>
=20
         <table class=3D"table table-bordered">
@@ -90,6 +90,6 @@
                 <i class=3D"icon-plus"></i> <s:text name=3D"wao.ui.action.cr=
eateWaoUser" />
             </s:a>
         </div>
-    </form>
+    </div>
=20
 </html>

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-16 13:31:04 UTC (rev 1950)
+++ trunk/wao-web/src/main/webapp/wao.css	2014-05-16 14:12:49 UTC (rev 1951)
@@ -538,6 +538,10 @@
     width: 30px;
 }
=20
+#boats-list tbody {
+    background-color: #EAEAEA;
+}
+
 /** La colonne pour le nom de navire peut =C3=AAtre plus large ques les autr=
es */
 #boats-list th:nth-child(2), #boats-list td:nth-child(2) {
     text-align: left;
@@ -571,17 +575,17 @@
=20
 #boats-filters-list-details-layout > div:nth-child(1) {
     padding-top: 60px;
-    background: #DEDEDE;
+    background: #E6E6E6;
 }
=20
 #boats-filters-list-details-layout > div:nth-child(2) {
-    background: #E6E6E6;
+    background: #EEE;
 }
=20
 #boats-filters-list-details-layout > div:nth-child(3) {
     /*max-width: 35%;*/
     flex: 1;
-    background: #EEEEEE;
+    background: #FFF;
     border-right: 0;
 }
=20


--===============8992059559383372320==--