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

Use buttons for switching to/from directions.

Browse source 
Previously, used a small text link which wasn't very usable. Now
it uses larger buttons which are (hopefully) more usable. Also
this sorts out the weird right-hanging text boxes for the to/from
in the directions sidebar - now they look like proper text input
boxes.

However, the "back to search" button and the directions submit
buttons are weirdly large and I don't quite understand why.
Hopefully an easy fix for someone who knows the arcana of CSS
better than I.
This commit is contained in:
Matt Amos 2014-11-10 19:17:21 +00:00
parent 0cb475cc1a
commit 3a9db4cf30
4 changed files with 44 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,32 +1,26 @@
<div class="search_forms">
<form method="GET" action="<%= search_path %>" class="search_form">
<div class='query_options'>
<%= 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'), directions_path, { :class => "geolink", :title => t('site.search.get_directions_title') } %>
</div>
<%= submit_tag t('site.search.submit_text') %>
<%= link_to image_tag('directions.png', :class => 'button'), directions_path, { :class => "button switch_link", :title => t('site.search.get_directions_title') } %>
<%= submit_tag t('site.search.submit_text'), :class => 'float' %>
<div class='query_wrapper'>
<%= 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, :class => 'overflow' %>
<%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
</div>
</form>
<form method="GET" action="<%= directions_path %>" class="directions_form">
<div class='query_options'>
<%= link_to t('site.search.close_directions'), root_path, { :class => "geolink", :title => t('site.search.close_directions_title') } %>
</div>
<div width="100%" align="right"><%= link_to image_tag('search.png', :class => 'button'), root_path, { :class => "button", :title => t('site.search.close_directions_title') } %></div>
<%= submit_tag t('site.search.submit_text') %>
<div class='query_wrapper'>
<div width="100%">
<%= image_tag "marker-green.png", :class => 'routing_marker', :id => 'marker_from', :draggable => 'true' %>
<%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %>
<%= image_tag "marker-red.png" , :class => 'routing_marker', :id => 'marker_to' , :draggable => 'true' %>
<%= text_field_tag "route_to" , params[:to] , :placeholder => t('site.search.to') %>
<select class='routing_engines' name='routing_engines'></select>
<%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %>
<span class="force_width"><%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %></span>
</div>
<div width="100%">
<%= image_tag "marker-red.png" , :class => 'routing_marker', :id => 'marker_to' , :draggable => 'true' %>
<span class="force_width"><%= text_field_tag "route_to" , params[:to] , :placeholder => t('site.search.to') %></span>
</div>
<select class='routing_engines' name='routing_engines'></select>
<div width="100%" align="right"><%= submit_tag t('site.search.submit_text') %></div>
<%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %>
</form>
</div>