From bleny@users.labs.libre-entreprise.org Mon Jun 15 01:51:15 2026
From: bleny@users.labs.libre-entreprise.org
To: wao-commits@list.forge.codelutin.com
Subject: [Suiviobsmer-commits] r775 - in trunk/wao-ui/src/main/webapp: . css
Date: Fri, 12 Nov 2010 21:19:45 +0100
Message-ID: <20101112201945.2387E2F227@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0107977899015658254=="

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

Author: bleny
Date: 2010-11-12 20:19:44 +0000 (Fri, 12 Nov 2010)
New Revision: 775

Log:
making map page look better

Modified:
   trunk/wao-ui/src/main/webapp/Cartography.tml
   trunk/wao-ui/src/main/webapp/css/cartography.css

Modified: trunk/wao-ui/src/main/webapp/Cartography.tml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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-ui/src/main/webapp/Cartography.tml	2010-11-12 19:57:23 UTC (rev=
 774)
+++ trunk/wao-ui/src/main/webapp/Cartography.tml	2010-11-12 20:19:44 UTC (rev=
 775)
@@ -43,16 +43,9 @@
             <div id=3D"so-cartography-border" class=3D"fleft">
=20
                 <div id=3D"so-cartography-icons">
-                    <span>
-                        <a t:type=3D"pagelink" t:page=3D"index" title=3D"Pag=
e d'accueil">
-                            <img src=3D"${asset:context:img/logo-wao-48px.pn=
g}" alt=3D"WAO logo" title=3D"Retourner sur l'application Wao"/>
-                        </a>&nbsp;
-                    </span>
-                    <span>
-                        <a href=3D"mailto:obsmer at ifremer.fr" title=3D"Con=
tacter un responsable Obsmer">
-                            <img src=3D"${asset:context:img/MiniLogo.jpg}" a=
lt=3D"Obsmer logo"/>
-                        </a>
-                    </span>
+                    <a t:type=3D"pagelink" t:page=3D"index" title=3D"Page d'=
accueil">
+                        <img src=3D"${asset:context:img/logo-wao-48px.png}" =
alt=3D"WAO logo" title=3D"Retourner sur l'application Wao"/>
+                    </a>&nbsp;
                 </div>
=20
                 <h1>${pageTitle}</h1>
@@ -100,10 +93,15 @@
                         </p>
                     </form>
                 </div>
-               =20
+
+                <div class=3D"acenter mtop30">
+                    <a href=3D"mailto:obsmer at ifremer.fr" title=3D"Contact=
er un responsable Obsmer">
+                        <img style=3D"height: 22px;" src=3D"${asset:context:=
img/MiniLogo.jpg}" alt=3D"Obsmer logo"/>
+                    </a>
+                </div>
             </div>
=20
-            <div id=3D"so-cartography-map" class=3D"fleft"></div>
+            <div id=3D"so-cartography-map" class=3D"fleft" style=3D"margin: =
10px;"/>
         </div>
=20
         <t:footer />

Modified: trunk/wao-ui/src/main/webapp/css/cartography.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-ui/src/main/webapp/css/cartography.css	2010-11-12 19:57:23 UTC =
(rev 774)
+++ trunk/wao-ui/src/main/webapp/css/cartography.css	2010-11-12 20:19:44 UTC =
(rev 775)
@@ -34,9 +34,10 @@
=20
 #so-cartography-border {
     width: 300px;
-    background-color:#f1f1f1;
-    padding:10px;
-    color:#007CC2;
+    background-color: #f1f1f1;
+    padding: 10px;
+    color: #007CC2;
+    margin: 10px;
 }
=20
 #so-cartography-border h1 {
@@ -51,8 +52,6 @@
 #so-cartography-icons {
     text-align: center;
     margin: 20px;
-    background-color: white;
-    border: 1px solid black;
 }
=20
 #so-cartography-filters {
@@ -62,8 +61,9 @@
 }
=20
 #so-cartography-map {
-    width: 700px;
-    height: 700px;
+    width: 800px;
+    height: 600px;
+    margin: 10px !important;
 }
=20
 #so-cartography-map h3 {


--===============0107977899015658254==--