From aec3d44979d35d41b774ff09579b8f81e84276f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@camptocamp.com>
Date: Tue, 29 Mar 2011 09:39:42 +0000
Subject: [PATCH] new icons for the navigation toolbar, p=jorix,
 r=me,marcjansen (closes #2946)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@11738 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 examples/editingtoolbar-outside.html   |  11 ++-
 examples/navtoolbar-alwaysZoom.html    |   2 +-
 examples/navtoolbar-outsidemap.html    |   9 --
 examples/snap-split.html               |   4 +-
 examples/snapping.html                 |   4 +-
 theme/default/img/editing_tool_bar.png | Bin 2481 -> 2222 bytes
 theme/default/style.css                | 132 ++++++++++++-------------
 7 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/examples/editingtoolbar-outside.html b/examples/editingtoolbar-outside.html
index a375df86c5..97079d27f9 100644
--- a/examples/editingtoolbar-outside.html
+++ b/examples/editingtoolbar-outside.html
@@ -9,11 +9,16 @@
     <style type="text/css">
         .olControlEditingToolbar  {
             float:left;
-            right: 0px;
-            height: 30px; 
-            width: 150px;
+            width: auto;
         }
     </style>
+    <!--[if lte IE 6]>
+        <style type="text/css">
+            .olControlEditingToolbar {
+                width: 150px;
+            }
+        </style>
+    <![endif]-->
     <script src="../lib/Firebug/firebug.js"></script>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
diff --git a/examples/navtoolbar-alwaysZoom.html b/examples/navtoolbar-alwaysZoom.html
index add85b59f3..72ae2c5f4f 100644
--- a/examples/navtoolbar-alwaysZoom.html
+++ b/examples/navtoolbar-alwaysZoom.html
@@ -7,7 +7,7 @@
 	    <link rel="stylesheet" href="style.css" type="text/css" />
 		<!-- Override the position of the toolbar to make it fit in a small map -->
 		<style type='text/css'>     
-			.olControlNavToolbar div { 
+			.olControlNavToolbar {
 			  top: 150px;
 			}
     	</style>  
diff --git a/examples/navtoolbar-outsidemap.html b/examples/navtoolbar-outsidemap.html
index 437c3deb42..5edcd41299 100644
--- a/examples/navtoolbar-outsidemap.html
+++ b/examples/navtoolbar-outsidemap.html
@@ -5,15 +5,6 @@
     <title>OpenLayers: Custom Navigation Toolbar</title>
     <link rel="stylesheet" href="../theme/default/style.css" type="text/css" />
     <link rel="stylesheet" href="style.css" type="text/css" />
-    <style type="text/css">
-        #paneldiv {
-            height: 80px;
-        }
-        #paneldiv div { 
-            top: 10px; 
-        }
-        
-    </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
         var lon = 5;
diff --git a/examples/snap-split.html b/examples/snap-split.html
index 27c03e5827..536b1fb8f7 100644
--- a/examples/snap-split.html
+++ b/examples/snap-split.html
@@ -7,10 +7,10 @@
     <link rel="stylesheet" href="style.css" type="text/css" />
     <style type="text/css">
         .olControlEditingToolbar .olControlModifyFeatureItemInactive { 
-            background-position: -1px 0px ;                                                                   
+            background-position: -1px -1px;
         }
         .olControlEditingToolbar .olControlModifyFeatureItemActive { 
-            background-position: -1px -23px ;                                                                   
+            background-position: -1px -24px;
         }
         label.head {
             font-weight: bold;
diff --git a/examples/snapping.html b/examples/snapping.html
index c454b99dc2..9c46317c4f 100644
--- a/examples/snapping.html
+++ b/examples/snapping.html
@@ -7,10 +7,10 @@
     <link rel="stylesheet" href="style.css" type="text/css" />
     <style type="text/css">
         .olControlEditingToolbar .olControlModifyFeatureItemInactive { 
-            background-position: -1px 0px ;                                                                   
+            background-position: -1px -1px;
         }
         .olControlEditingToolbar .olControlModifyFeatureItemActive { 
-            background-position: -1px -23px ;                                                                   
+            background-position: -1px -24px;
         }
         table {
             padding: 1em 0 1em;
diff --git a/theme/default/img/editing_tool_bar.png b/theme/default/img/editing_tool_bar.png
index c653eb045f9452717864d317b89c612e5363e68b..5977856cf7cd3ee88f8c98fd4722a166636eba6d 100644
GIT binary patch
literal 2222
zcmc&#`8U)J7ymLLyAlzJCuD6*lF=iwW*NqoEhmhnFsL!Mq$gXwBciNNwup&rgC-*k
zdS>u6mhjk@p)q3}W3r8ko~iTx^8N+yJ?Gwg&gb59?mg%8x#waW?5~Lmoe}~7K-AjG
z+=-j>xeh)G;zqTRtvPN2MVMN<96fq;dI3HU06ZBEFc*s-KYkp1=WKpI{Jy`jyT{qz
z+hlMKx4*2h*^Kd>Ll%p*!aCU8m|tC^udghutt>K@mPo8a`XZH1o1iVs;@1yp3!moZ
z<~FI-RO&$W%E9zxZz26)cl6HqC~0J<bFjaCsV{n<ue)G`Lnd#2?Crw$az6GD)_Pof
zx{2w7oNf}nqhocdGnCm0WfH+GqQ)`~x72!}y|reD5HN<f!@sTg=Pi7o(X|0rN5OeE
z;$GI)VC!lMODZXEDzV8`n^mt1u-JkQ?Dg#Oj>@t}<z=~BsgEm4Q<F;Ar6n0fMbERc
zX!&_*K`)rOxoP3q?Cj^sT}eqhXjJsm-t@FT>Yga1B*zpd=_V#b)BOD6??>!;OAYz@
zx<@Ws#g0sRc-lwMqau(N(L-2&|4|p`VJD}EkdUCDpx_{cX6UkV2+I%QVd^$u>e{d7
zMfLJ@f;!K^VB>Dr9nRWLCmI<6fq=EOnE@2~0{|cpZ7G!@b#-<4$&*r2{Sp!sSy@?-
z@SxO*;{eci<OrXoo@g4EsT8!6y)&1Z|APVlJJZX+-GaN2;2kTE2mlb;{OLTVH5Y%1
z>kQh$9qk+*h>rF}1ps!weyH%!0RJFgMav*mKy)}NBtj92zdanoZI%AnYK98%MF)k4
zDY^uO1^_y`V2C~#0$C_#o&^BD32So`7x$F@Job$dOPQYfF!#&Cr+F^phND*fhp)dH
z(uk@{3@Pd^B{+^nUXHx1I~&NOZXw`GFrJ~%QL$7?K=mZJZP2XbQVF9SPF)n-Q<(*M
zCLd@|m3l62{$(OxCICaSV=T34F|XtVNJ_^Z5`2`sytOX8G}uUR>`?Srx7-`n9!%A5
zZAf2zBw#guNyM&6uz;t?U0J4~H5fcyH*oJY!Ca?$w$Y&}REuJ4KLOK{{B9#~-tP%5
zdw{lcmS>eLmWd3~Q>>{OYYfQRws{rG*KgR6wbuIWTkG06@-;06RLs5Gy953@Sg**v
z<f+d?GV(=#?!A!>4WfI2h+grrMw2gcsT0gud__x31%7t=6r_hI5Opw>eM7HG0+{3B
zRSs-ERqKRdyv(<=qQgz!^=^)R48};p*Q;l*WmTCycFM|#D$UobqqpPZ=P`Hn`TUa~
z3D5Iw5p!`&=?b#p2~BBh#1oO7-aCUD$OKGny`6$RlUX4Kud7`nCwB8%f!)$~Ma_62
zvWLY9BFCE~F~db-+P)32oJ=XzTp3pU#W@fnJkQCmXLt8$dPVM>214w?P^z7y5Wq2!
z6+eRL(=4jHP|r)~(U3dcYTl^a^1K(HHK{<z{ubdE*VfJ0ZO8|a<P{&aVTsblPCK7z
zAOvw7sgx&5Dt@+ToFQnfjD6f)yHI@x!Lpa%Aw4aQc}$Y`azy9>IGOi8U2TNC6SkS_
zO{5+(v%eS6@3uLR{E31PKR;yPI(@3ZMAdR7`)1lOyo{V3%U50m6M@uj$6Ru&+&y)5
zoh49}9k=z`N&N5w;%i(DJmk$u0qZI8*uUx8)z2vjv3&l%dIpAt3MB(lsX3$L4|G*`
zC-v*Y6h238jmBGO;kF7eafR2dVA{&A*7dIBHdVFblo=1%!Nwpd+p)d&->+(A?X&5#
z&ext6zW?^cXi^>q>lHm8=&>TS!w8T`b!UicmVgHu|9lsRl44=LGV2Gu+hPu<<53$k
zSPcesPYD8n+FaX47|oZPXrj&fDB8-oD=s!Flt$^B&5IhwF|Da3XN=;%ZZ5D2mNsUm
z9nbN%q1X1RT1SR3J6Addndrb<x3*f=mr0}}dLmk`Or6@*55dO4Ia7@GbMPoazHcux
z=PZ>iY7JQakV{ML??)3Iv=(1CeW$n-e!%SEgLhU(>FKp;NbC!y;pEKS<}0^_&$$_-
z?<T$ct*i3=X>>+Qs}2plX!%UvS$r%iiUDs*M>OB{${CQ^!0Ph*EIK!fxFm|qARiPb
zB*|Nf1-2k|aHyic#0BpDM?t6ItBS5mURWgUAyk<+Gwc8%lh2^v6OnlQ5BLqcAGB@|
z<r@7l_IG{<j2zXpd?qZ%u_<)s)-<R*PFNm&)mcz2v~0BO=Zz8AqR&tvE$ifF)Tchl
zEm{F**=Ro@Pcnb<`1T4+Qs$};0*GrEG$bnVe!lT3t>7U?TAKEQWVWV%YbMwx1&FB!
z6d}i`5+>|g5t7gS5txX#jdJ%a8Zl#cR`s)-YRM}OKNpvCfZb~eek%?@;lL+bl73{a
z8j%MgLp=cz=(tS|oDp0m!MK7)OoRVWJ{O?!tA_ipxC37RSHVpf#_^b<1Vr$C5JHEj
z1W_R#z#$9d8lpME<`*P-0b+A&8<G8@GShuN1zdrlP4g-8)8wQ_sDANNF6~e#ZEig^
z&+8_sxzqN!uo`i{KYt>YyFo+eK)CA0T~{RtJ~RI$^+?xXLx2Re4g?uVW{2uPl=KN)
z^nM~4CQJ3a(vrGop2D`18Zq9lxREt{6e5(j#J1yoV`$}nzxBM^zKT4R|C_gZ^%*7A
z4QPWQ6Zvr3_Rsv-u8eTU>KJzVlZ09!V)oQ*e+Q3fsnTb1bIET7Y)(`zW+f^U8(X0O
zA}RUKcQ<PyUrn?}sv9OysJ|E%VJyi)dwmyu#^Ne*YRJoDqZhef0I;^OH?K4GN&FY0
CK%i>?

literal 2481
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

diff --git a/theme/default/style.css b/theme/default/style.css
index 40b9eb6e7c..3bc805d86c 100644
--- a/theme/default/style.css
+++ b/theme/default/style.css
@@ -137,18 +137,6 @@ div.olControlMousePosition {
     padding:5px;
     overflow: auto;
 }    
-.olControlNavToolbar { 
-    width:0px;
-    height:0px;
-}    
-.olControlNavToolbar div { 
-  display:block;
-  width:  28px;
-  height: 28px;
-  top: 300px;
-  left: 6px;
-  position: relative;
-}
 
 .olControlNavigationHistory {
    background-image: url("img/navigation_history.png");
@@ -170,61 +158,6 @@ div.olControlMousePosition {
    background-position: -24px -24px;
 }
 
-.olControlNavToolbar .olControlNavigationItemActive { 
-  background-image: url("img/panning-hand-on.png");
-  background-repeat: no-repeat;
-}
-.olControlNavToolbar .olControlNavigationItemInactive { 
-  background-image: url("img/panning-hand-off.png");
-  background-repeat: no-repeat;
-}
-.olControlNavToolbar .olControlZoomBoxItemActive { 
-  background-image: url("img/drag-rectangle-on.png");
-  background-color: orange;
-  background-repeat: no-repeat;
-}
-.olControlNavToolbar .olControlZoomBoxItemInactive { 
-  background-image: url("img/drag-rectangle-off.png");
-  background-repeat: no-repeat;
-}
-.olControlEditingToolbar  {
-    top: 0px;
-    right: 0px;
-    height: 30px; 
-    width: 200px;
-}
-.olControlEditingToolbar div { 
-  background-image: url("img/editing_tool_bar.png");
-  background-repeat: no-repeat;
-  float:right;
-  width:  24px;
-  height: 24px;
-  margin: 5px;
-}
-.olControlEditingToolbar .olControlNavigationItemActive { 
-  background-position: -103px -23px; 
-}
-.olControlEditingToolbar .olControlNavigationItemInactive { 
-  background-position: -103px -0px; 
-}
-.olControlEditingToolbar .olControlDrawFeaturePointItemActive { 
-  background-position: -77px -23px; 
-}
-.olControlEditingToolbar .olControlDrawFeaturePointItemInactive { 
-  background-position: -77px -0px; 
-}
-.olControlEditingToolbar .olControlDrawFeaturePathItemInactive { 
-  background-position: -51px 0px; 
-}
-.olControlEditingToolbar .olControlDrawFeaturePathItemActive { 
-  background-position: -51px -23px; 
-}
-.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive { 
-  background-position: -26px 0px; 
-}
-.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive { 
-  background-position: -26px -23px ;                                                                   
-}
 div.olControlSaveFeaturesItemActive { 
     background-image: url(img/save_features_on.png);
     background-repeat: no-repeat;
@@ -421,3 +354,68 @@ div.olControlSaveFeaturesItemInactive {
 .olBingAttribution.road {
     color: #333;
 }
+
+/**
+ * Editing and navigation icons.
+ * (using the editing_tool_bar.png sprint image)
+ */
+.olControlNavToolbar ,
+.olControlEditingToolbar {
+    margin: 5px 5px 0px 0px;
+}
+.olControlNavToolbar div,
+.olControlEditingToolbar div {
+    background-image: url("img/editing_tool_bar.png");
+    background-repeat: no-repeat;
+    margin: 0px 0px 5px 5px;
+    width: 24px;
+    height: 22px;
+    cursor: pointer
+}
+/* positions */
+.olControlEditingToolbar {
+    right: 0px;
+    top: 0px;
+    width: 200px; /* Only for IE6 or IE without DOCTYPE */
+}
+.olControlNavToolbar {
+    top: 295px;
+    left: 9px;
+}
+/* layouts */
+.olControlEditingToolbar div {
+    float: right;
+}
+/* individual controls */
+.olControlNavToolbar .olControlNavigationItemInactive,
+.olControlEditingToolbar .olControlNavigationItemInactive {
+    background-position: -103px -1px;
+}
+.olControlNavToolbar .olControlNavigationItemActive ,
+.olControlEditingToolbar .olControlNavigationItemActive  {
+    background-position: -103px -24px;
+}
+.olControlNavToolbar .olControlZoomBoxItemInactive {
+    background-position: -128px -1px;
+}
+.olControlNavToolbar .olControlZoomBoxItemActive  {
+    background-position: -128px -24px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePointItemInactive {
+    background-position: -77px -1px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePointItemActive {
+    background-position: -77px -24px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePathItemInactive {
+    background-position: -51px -1px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePathItemActive {
+    background-position: -51px -24px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive{
+    background-position: -26px -1px;
+}
+.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive {
+    background-position: -26px -24px;
+}