cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Query options presentation

Browse source
This commit is contained in:
Richard Fairhurst 2014-01-21 20:57:55 +00:00
parent c6e8775dba
commit ad01a61b6d
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/index.js
View file

@ -349,15 +349,15 @@ $(document).ready(function () {
$(".get_directions").on("click",function(e) { $(".get_directions").on("click",function(e) {
e.preventDefault(); e.preventDefault();
$(".query_wrapper.search").hide(); $(".search").hide();
$(".query_wrapper.routing").show(); $(".routing").show();
$(".query_wrapper.routing [name=route_from]").focus(); $(".query_wrapper.routing [name=route_from]").focus();
}); });
$(".close_directions").on("click",function(e) { $(".close_directions").on("click",function(e) {
e.preventDefault(); e.preventDefault();
$(".query_wrapper.search").show(); $(".search").show();
$(".query_wrapper.routing").hide(); $(".routing").hide();
$(".query_wrapper.search [name=query]").focus(); $(".query_wrapper.search [name=query]").focus();
}); });

9
app/assets/stylesheets/common.css.scss
View file

@ -916,6 +916,7 @@ header .search_form {
.search_form { .search_form {
position: relative; position: relative;
padding: $lineheight/2; padding: $lineheight/2;
padding-top: 1px;
background-color: $lightgrey; background-color: $lightgrey;
.query_wrapper { .query_wrapper {
@ -946,15 +947,13 @@ header .search_form {
border-radius: 0 2px 2px 0; border-radius: 0 2px 2px 0;
} }
.describe_location { .query_options {
position: absolute; text-align: right;
top: 6px;
right: 6px;
font-size: 10px; font-size: 10px;
color: $blue; color: $blue;
} }
.query_wrapper.routing { .routing {
display: none; display: none;
} }
} }

19
app/views/layouts/_search.html.erb
View file

@ -1,22 +1,23 @@
<%= form_tag search_path, :class => "search_form" do %> <%= form_tag search_path, :class => "search_form" do %>
<div class='query_options search'>
<%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
&middot;
<%= link_to t('site.search.get_directions'), '#', { :class => "get_directions", :title => t('site.search.get_directions_title') } %>
</div>
<div class='query_options routing'>
<%= link_to t('site.search.close_directions'), '#', { :class => "close_directions", :title => t('site.search.close_directions_title') } %>
</div>
<%= submit_tag t('site.search.submit_text') %> <%= submit_tag t('site.search.submit_text') %>
<div class='query_wrapper search'> <div class='query_wrapper search'>
<%= 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 %>
<div class='query_options'>
<%= link_to t('site.search.get_directions'), '#', { :class => "get_directions", :title => t('site.search.get_directions_title') } %>
&middot;
<%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
</div>
</div> </div>
<div class='query_wrapper routing'> <div class='query_wrapper routing'>
<%= text_field_tag "route_from", params[:from], :placeholder => "From", :onchange=>"OSM.routing.geocode('route_from',event)" %> <%= text_field_tag "route_from", params[:from], :placeholder => "From", :onchange=>"OSM.routing.geocode('route_from',event)" %>
<%= text_field_tag "route_to" , params[:to] , :placeholder => "To" , :onchange=>"OSM.routing.geocode('route_to' ,event)" %> <%= text_field_tag "route_to" , params[:to] , :placeholder => "To" , :onchange=>"OSM.routing.geocode('route_to' ,event)" %>
<div class='query_options'> <select class='routing_engines'></select>
<select class='routing_engines'></select>
<%= link_to t('site.search.close_directions'), '#', { :class => "close_directions", :title => t('site.search.close_directions_title') } %>
</div>
</div> </div>
<% end %> <% end %>