6 files changed, 52 insertions, 36 deletions
diff --git a/chimere/static/edit_route_map.js b/chimere/static/edit_route_map.js
index 52d7ffd..a2d8bf1 100644
--- a/chimere/static/edit_route_map.js
+++ b/chimere/static/edit_route_map.js
@@ -129,18 +129,13 @@ function init(){
 function toggleDrawOn() {
     currentControl.activate();
     document.getElementById('draw-toggle-off').style.display = 'None';
-    document.getElementById('draw-toggle-on').style.display = 'block';
+    document.getElementById('draw-or').style.display = 'None';
+    document.getElementById('upload').style.display = 'None';
     if (currentFeature){
         pathModify.selectControl.select(currentFeature);
     }
 }
 
-function toggleDrawOff() {
-    currentControl.deactivate();
-    document.getElementById('draw-toggle-on').style.display = 'None';
-    document.getElementById('draw-toggle-off').style.display = 'block';
-}
-
 function checkFields(){
     if (!jQuery("#id_name").val() ||
         !jQuery("#id_categories").val()){
diff --git a/chimere/static/forms.css b/chimere/static/forms.css
index c8e4939..dea37f0 100644
--- a/chimere/static/forms.css
+++ b/chimere/static/forms.css
@@ -1,3 +1,11 @@
+/* colors definition */
+
+.toggle-button{
+color: #5b80b2;
+}
+
+/**/
+
 #map_edit{
 border: 1px solid black;
 width:700px;
@@ -11,21 +19,31 @@ float:left;
 }
 
 .toggle-button{
-float:left;
-padding:4px;
--moz-border-radius: 4px;
--webkit-border-radius: 4px;
-border-radius: 4px;
-border:1px solid grey;
+margin:4px 0;
+padding:2px 0;
+}
+
+#upload, #draw-label{
+vertical-align:center;
+background-repeat:no-repeat;
+font-size:20px;
+padding:30px 0;
+padding-left:80px;
+}
+
+#upload{
+background-image:url('img/upload.png');
 }
 
-#draw-toggle-off{
-color:black;
+#draw-label{
+background-image:url('img/drawing.png');
 }
 
-#draw-toggle-on{
-background-color:lightgrey;
-display:None;
+#draw-or{
+padding:0;
+padding-left:80px;
+margin:0;
+font-size:16px;
 }
 
 .help-route{
diff --git a/chimere/static/img/drawing.png b/chimere/static/img/drawing.png
new file mode 100644
index 0000000..a2d3a30
--- /dev/null
+++ b/chimere/static/img/drawing.png
diff --git a/chimere/static/img/upload_images.licence b/chimere/static/img/images_licences
index cf7408c..6dc68fd 100644
--- a/chimere/static/img/upload_images.licence
+++ b/chimere/static/img/images_licences
@@ -1,16 +1,25 @@
-Upload image credit
 
-* Farm-Fresh layer gps.png in Farm-Fresh Web Icons
+* Upload image credit
+
+    * Farm-Fresh layer gps.png in Farm-Fresh Web Icons
 Author: FatCow Web Hosting
 Licence: Creative Commons Attribution 3.0 United States license
 Url: http://commons.wikimedia.org/wiki/File:Farm-Fresh_layer_gps.png
 
-* Image from the Nuvola icon theme for KDE 3.x by David Vignoni
+    * Image from the Nuvola icon theme for KDE 3.x by David Vignoni
 Author: David Vignoni
 Licence: GNU Lesser General Public License version 2.1 or any later version
 Url: http://commons.wikimedia.org/wiki/File:Nuvola_apps_download_manager2.svg
 
-* Icon from the Tango! project set.
+    * Icon from the Tango! project set.
 Author: The Tango! Desktop Project
 Licence: Public domain
 Url: http://commons.wikimedia.org/wiki/File:Internet-web-browser.svg
+
+* Drawing image credit
+
+    * Icons from the Tango! project set.
+Author: The Tango! Desktop Project
+Licence: Public domain
+Url: http://commons.wikimedia.org/wiki/File:Edit-find-replace.svg
+Url 2: http://commons.wikimedia.org/wiki/File:Internet-web-browser.svg
diff --git a/chimere/static/img/upload.png b/chimere/static/img/upload.png
index 53d7636..367c2d9 100644
--- a/chimere/static/img/upload.png
+++ b/chimere/static/img/upload.png
diff --git a/chimere/static/styles.css b/chimere/static/styles.css
index 5b02d92..b56b2ab 100644
--- a/chimere/static/styles.css
+++ b/chimere/static/styles.css
@@ -1,3 +1,11 @@
+/* colors definition */
+
+a, a:link, a:visited, legend{
+color: #5b80b2;
+}
+
+/**/
+
 body{
 background-color:#b488ff;
 font-family:arial;
@@ -17,11 +25,6 @@ margin:4px 8px;
 
 legend{
 font-weight:bold;
-color:#b400Ff;
-}
-
-a{
-color:#b400Ff;
 }
 
 h2{
@@ -512,15 +515,6 @@ color:#b488ff;
 
 .simple .cloud img{display:None;}
 
-.upload{
-vertical-align:center;
-background-image:url('img/upload.png');
-background-repeat:no-repeat;
-padding:40px;
-padding-left:80px;
-font-size:20px;;
-}
-
 .window{
 background-color:#FFF;
 }