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

Refactor the export form to use bootstrap form controls

Browse source 
I started refatoring the export inputs to use a flex grid instead of
floats, but this is perhaps the one place on the whole site where left/right
makes sense since even in rtl we want min_lon on the left.
This commit is contained in:
Andy Allan 2021-02-03 11:49:27 +00:00
parent f173895b00
commit 05dd681abf
2 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/common.scss
View file

@ -1005,9 +1005,8 @@ tr.turn:hover {
.export_area_inputs { .export_area_inputs {
margin-bottom: $lineheight/2; margin-bottom: $lineheight/2;
input[type="text"] { input[type="text"] {
width: 80px; width: 100px;
text-align: center; text-align: center;
margin-bottom: 5px;
} }
} }
@ -1025,18 +1024,13 @@ tr.turn:hover {
float: right; float: right;
/* no-r2 */ margin-right: -1px; /* no-r2 */ margin-right: -1px;
} }
#minlat { margin-bottom: 0; } #minlat { margin-bottom: -1px; }
} }
.export_bound { .export_bound {
margin: $lineheight/4; margin: $lineheight/4;
} }
.export_button {
margin-top: $lineheight;
margin-bottom: $lineheight;
}
dl { dl {
padding-left: $lineheight/2; padding-left: $lineheight/2;
dd { dd {

18
app/views/site/export.html.erb
View file

@ -2,17 +2,17 @@
<%= render "sidebar_header", :title => t(".title") %> <%= render "sidebar_header", :title => t(".title") %>
<%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form standard-form" }) do %> <%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form" }) do %>
<%= hidden_field_tag "format", "osm" %> <%= hidden_field_tag "format", "osm" %>
<div class='export_area_inputs'> <div class='export_area_inputs'>
<div class='export_boxy'> <div class='export_boxy'>
<%= text_field_tag("maxlat", nil, :size => 10, :class => "export_bound") %> <%= text_field_tag("maxlat", nil, :size => 10, :class => "export_bound form-control mx-auto") %>
<br /> <div class="clearfix">
<%= text_field_tag("minlon", nil, :size => 10, :class => "export_bound") %> <%= text_field_tag("minlon", nil, :size => 10, :class => "export_bound form-control") %>
<%= text_field_tag("maxlon", nil, :size => 10, :class => "export_bound") %> <%= text_field_tag("maxlon", nil, :size => 10, :class => "export_bound form-control") %>
<br /><br /> </div>
<%= text_field_tag("minlat", nil, :size => 10, :class => "export_bound") %> <%= text_field_tag("minlat", nil, :size => 10, :class => "export_bound form-control mx-auto") %>
</div> </div>
<a id='drag_box' href="#"><%= t ".manually_select" %></a> <a id='drag_box' href="#"><%= t ".manually_select" %></a>
</div> </div>
@ -27,8 +27,8 @@
</div> </div>
<div id="export_commit"> <div id="export_commit">
<div class="export_button"> <div class="form-group d-flex">
<%= submit_tag t(".export_button") %> <%= submit_tag t(".export_button"), :class => "btn btn-primary mx-auto" %>
</div> </div>
<p><%= t ".too_large.advice" %></p> <p><%= t ".too_large.advice" %></p>