Merge branch 'make-tracks-map'

Conflicts: site/www/img/button-return-off.png site/www/img/button-return-on.png
stamen · May 11, 2012 · 133729e · 133729e
2 parents 86c065d + fb7b8ca
commit 133729e
Show file tree

Hide file tree

Showing 2 changed files with 586 additions and 349 deletions.
diff --git a/site/templates/make-step2-geography.html.tpl b/site/templates/make-step2-geography.html.tpl
@@ -11,6 +11,8 @@
             zoom_in_inactive = base_url + '/img/button-zoom-in-off.png',
             zoom_out_active = base_url + '/img/button-zoom-out-on.png',
             zoom_out_inactive = base_url + '/img/button-zoom-out-off.png',
+            zoom_return_active = base_url + "/img/button-return-on.png",
+            zoom_return_inactive = base_url + "/img/button-return-off.png",
             button_remove_row_active = base_url + "/img/button-remove-row-on.png",
             button_remove_row_inactive = base_url + "/img/button-remove-row-off.png",
             button_remove_column_active = base_url + "/img/button-remove-column-on.png",
@@ -60,10 +62,13 @@
             height: 92px;
             position: absolute;
             padding: 8px 0px 0px 20px;
+            line-height: 0;
             z-index: 2;
         }
         
-        #zoom-in, #zoom-out {
+        #zoom-in,
+        #zoom-out,
+        #zoom-return {
             cursor: pointer;
         }
         
@@ -240,17 +245,18 @@
             </form>
             <div id="zoom-container">
                 <span id="zoom-in" style="display: none;">
-                <img src='{$base_dir}/img/button-zoom-in-off.png' id="zoom-in-button"
-                          width="46" height="46">
+                    <img src="{$base_dir}/img/button-zoom-in-off.png" id="zoom-in-button" width="46" height="46">
                 </span>
                 <span id="zoom-out" style="display: none;">
-                    <img src='{$base_dir}/img/button-zoom-out-off.png' id="zoom-out-button"
-                              width="46" height="46">
+                    <img src="{$base_dir}/img/button-zoom-out-off.png" id="zoom-out-button" width="46" height="46">
+                </span>
+                <span id="zoom-return">
+                    <img src="{$base_dir}/img/button-return-off.png" id="zoom-return-button" width="46" height="46">
                 </span>
             </div>
             <div id="map">
                 <div id="canvas"></div>
             </div>
         </div>
     </body>
-</html>
+</html>