]> git.openstreetmap.org Git - rails.git/commitdiff
Restore "Where am I?"
authorJohn Firebaugh <john.firebaugh@gmail.com>
Wed, 2 Oct 2013 18:14:31 +0000 (11:14 -0700)
committerJohn Firebaugh <john.firebaugh@gmail.com>
Sun, 13 Oct 2013 21:46:06 +0000 (14:46 -0700)
app/assets/stylesheets/common.css.scss
app/views/layouts/map.html.erb
config/locales/en.yml

index 1fd2733bbb92b955d375181e2acc86537c034588..35a5ced5f2606ebd4a83a58de72ff7568cf861e5 100644 (file)
@@ -241,6 +241,7 @@ table {
   border-bottom: $keyline;
 
   #query_wrapper {
   border-bottom: $keyline;
 
   #query_wrapper {
+    position: relative;
     overflow: hidden;
   }
 
     overflow: hidden;
   }
 
@@ -266,6 +267,14 @@ table {
     min-width: 0;
     border-radius: 0 2px 2px 0;
   }
     min-width: 0;
     border-radius: 0 2px 2px 0;
   }
+
+  #describe_location {
+    position: absolute;
+    top: 6px;
+    right: 6px;
+    font-size: 10px;
+    color: $blue;
+  }
 }
 
 /* Utility for de-emphasizing content */
 }
 
 /* Utility for de-emphasizing content */
index 09c7d0d8e90646335db7661a816fbe8cc06f5223..55953f004e510269fb474a34b414c21f6d9caf6b 100644 (file)
@@ -10,6 +10,9 @@
         <%= text_field_tag :query, params[:query],
                            :placeholder => t('site.search.search'),
                            :autofocus => "autofocus" %>
         <%= text_field_tag :query, params[:query],
                            :placeholder => t('site.search.search'),
                            :autofocus => "autofocus" %>
+        <%= link_to t('site.search.where_am_i'),
+                    { :controller => :geocoder, :action => :description },
+                    { :id => "describe_location", :title => t('site.search.where_am_i_title') } %>
       </div>
     <% end %>
 
       </div>
     <% end %>
 
index af3951edc70ef0f75f55396d29d7399f371c5da2..01139aa4dd0ea35881fb4bcfa5cd19a1b771d20f 100644 (file)
@@ -1410,6 +1410,8 @@ en:
       close: Close
     search:
       search: Search
       close: Close
     search:
       search: Search
+      where_am_i: "Where am I?"
+      where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
     key:
       table:
       submit_text: "Go"
     key:
       table: