From lkaufmann@users.forge.codelutin.com Fri May 16 17:59:16 2014
From: lkaufmann@users.forge.codelutin.com
To: wao-commits@list.forge.codelutin.com
Subject: [Wao-commits] r1954 - in trunk/wao-web/src/main/webapp: .
	WEB-INF/content/obsmer WEB-INF/decorators
Date: Fri, 16 May 2014 17:59:16 +0200
Message-ID: <20140516155916.B0E9D181DAC@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7271722974922677700=="

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

Author: lkaufmann
Date: 2014-05-16 17:59:16 +0200 (Fri, 16 May 2014)
New Revision: 1954

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

Log:
Refs #4997 Display updates

Modified:
   trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.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/decorators/layout.jsp
   trunk/wao-web/src/main/webapp/wao.css

Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.j=
sp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/boat-details.jsp	201=
4-05-16 15:36:38 UTC (rev 1953)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp	201=
4-05-16 15:59:16 UTC (rev 1954)
@@ -243,7 +243,7 @@
     <s:text name=3D"wao.ui.boatDetails.boatContactsCounts.title"/>
 </h3>
=20
-<table id=3D"boat-contacts-counts-table" class=3D"table">
+<table id=3D"boat-contacts-counts-table" class=3D"table no-border-top">
     <thead>
         <tr>
             <td>
@@ -292,10 +292,10 @@
 <table class=3D"table">
     <tbody>
         <tr>
-            <th>
+            <th class=3D"no-border-top">
                 <s:text name=3D"wao.ui.field.Boat.shipOwner"/>
             </th>
-            <td>
+            <td class=3D"no-border-top">
                 <s:property value=3D"boatDetails.boatInfos.boat.shipOwner.fi=
rstName"/>
                 <s:property value=3D"boatDetails.boatInfos.boat.shipOwner.la=
stName"/>
=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-05=
-16 15:36:38 UTC (rev 1953)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp	2014-05=
-16 15:59:16 UTC (rev 1954)
@@ -447,7 +447,7 @@
                         <s:text name=3D"%{observedDataControl.i18nKey}"/>
                     </s:if>
                 </td>
-                <td>
+                <td class=3D"align-center">
                     <s:if test=3D"mammalsObservation">
                         <i class=3D"fa fa-eye"=20
                              title=3D"<s:text name=3D"wao.ui.field.Contact.m=
ammalsObservation"/>"></i>&nbsp;
@@ -476,14 +476,14 @@
                 <td>
                     <s:if test=3D" ! commentCoordinator.empty">
                         <span data-original-title=3D"<s:property value=3D"co=
mmentCoordinator" escapeHtml=3D"false"/>" data-toggle=3D"tooltip" data-placem=
ent=3D"left">
-                            <i class=3D"icon-comment"></i>
+                            <i class=3D"fa fa-comment"></i>
                         </span>
                     </s:if>
                 </td>
                 <td>
                     <s:if test=3D" ! commentAdmin.empty">
                         <span data-original-title=3D"<s:property value=3D"co=
mmentAdmin" escapeHtml=3D"false"/>" data-toggle=3D"tooltip" data-placement=3D=
"left">
-                            <i class=3D"icon-comment"></i>
+                            <i class=3D"fa fa-comment"></i>
                         </span>
                     </s:if>
                 </td>

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-05-16 =
15:36:38 UTC (rev 1953)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp	2014-05-16 =
15:59:16 UTC (rev 1954)
@@ -64,14 +64,14 @@
                     <s:url action=3D"delete-news" id=3D"deleteNewsUrl">
                         <s:param name=3D"newsId" value=3D"topiaId" />
                     </s:url>
-                    <s:a href=3D"%{deleteNewsUrl}" cssClass=3D"btn-delete" t=
itle=3D"%{getText('wao.ui.action.delete')}" >
+                    <s:a href=3D"%{deleteNewsUrl}" cssClass=3D"btn-link" tit=
le=3D"%{getText('wao.ui.action.delete')}" >
                         <i class=3D"fa fa-trash-o"></i>=20
                     </s:a>
                    =20
                     <s:url action=3D"edit-news!input" id=3D"editNewsUrl">
                         <s:param name=3D"newsId" value=3D"topiaId" />
                     </s:url>
-                    <s:a href=3D"%{editNewsUrl}" cssClass=3D"btn-edit" title=
=3D"%{getText('wao.ui.action.edit')}">
+                    <s:a href=3D"%{editNewsUrl}" cssClass=3D"btn-link btn-li=
nk-edit" title=3D"%{getText('wao.ui.action.edit')}">
                         <i class=3D"fa fa-edit"></i>
                     </s:a>
                 </s:if>

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-16 15=
:36:38 UTC (rev 1953)
+++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp	2014-05-16 15=
:59:16 UTC (rev 1954)
@@ -52,7 +52,7 @@
=20
         <div class=3D"navbar">
             <div class=3D"navbar-inner">
-                <a class=3D"brand" href=3D"#">WAO <span><s:text name=3D"%{ob=
sProgram.getI18nKey()}"/></span></a>
+                <a class=3D"brand" href=3D"#"><span>WAO</span> <s:text name=
=3D"%{obsProgram.getI18nKey()}"/></a>
=20
                 <%--<a class=3D"brand" href=3D"#">Wao <s:property value=3D"%=
{getText(#obsProgram.getI18nKey())}" /></a>--%>
                 <ul class=3D"nav">

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 15:36:38 UTC (rev 1953)
+++ trunk/wao-web/src/main/webapp/wao.css	2014-05-16 15:59:16 UTC (rev 1954)
@@ -117,7 +117,16 @@
 .float-right {
     float: right;
 }
+.align-center {
+    text-align: center;
+}
=20
+.btn-link {
+    color: #2f4f4f !important;
+}
+.no-border-top {
+    border-top: 0 !important;
+}
=20
 /***************************************************************************=
***
  * Styles globaux =C3=A0 l'application
@@ -212,6 +221,7 @@
 }
 .navbar .nav > li > a:hover {
     color: #FFF;
+    background-color: #00b2b2;
 }
 .navbar .nav > .active > a,=20
 .navbar .nav > .active > a:hover,=20
@@ -674,7 +684,7 @@
 }
=20
 /* Fix a 1px gap between icons in fontawesome */
-main.home .news a.btn-edit {
+main.home .news a.btn-link-edit {
     padding-top: 1px;
 }
=20
@@ -687,13 +697,9 @@
     float: right;
     margin-left: 10px;
     text-decoration: none;
-    color: #2f4f4f;
     font-weight: bold;
     font-size: 15px;
 }
-main.home .news p.publication > a i.fa {
-    color: #2f4f4f;
-}
=20
 main.home .news p.publication > a:hover,
 main.home .news p.publication > a:hover i.fa {
@@ -710,7 +716,19 @@
     float: right;
 }
=20
+
 /**
+ * Contatcs
+ */
+#edit-contact > fieldset {
+    width: 100%;
+}
+#edit-contact > fieldset legend {
+    padding: 0 2%;
+    width: 96%;
+}
+
+/**
  * Form edition
  */
 main.form > form,


--===============7271722974922677700==--