From b6277bda2028d7cd54299cecb69b9efa3ab3c671 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Feb 2021 09:39:43 +0000 Subject: [PATCH 1/6] Use bootstrap form styles for update home checkbox This slipped through the refactoring last week. --- app/views/users/account.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb index 43171d834c..bb30581f93 100644 --- a/app/views/users/account.html.erb +++ b/app/views/users/account.html.erb @@ -100,9 +100,9 @@ <%= f.text_field :home_lon, :wrapper_class => "col-sm-4", :id => "home_lon" %> -
- checked="checked" <% end %> id="updatehome" /> - +
+ checked="checked" <% end %> id="updatehome" /> +
<%= tag.div "", :id => "map", :class => "content_map set_location" %> From fd6273cfb8a6c3fa4b46a4c31a8aef5cd0150c7a Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Feb 2021 09:47:52 +0000 Subject: [PATCH 2/6] Refactor user_blocks revoke form to use bootstrap --- app/views/user_blocks/revoke.html.erb | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index 0b6e217887..1899e51451 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -11,23 +11,23 @@ <% end %> <% if @user_block.ends_at > Time.now %> -

- <%= t(".time_future", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %> -

+

+ <%= t(".time_future", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %> +

-<%= form_for :revoke, :url => { :action => "revoke" }, :html => { :class => "standard-form" } do |f| %> - <%= f.error_messages %> -

- <%= check_box_tag "confirm", "yes" %> - <%= label_tag "confirm", t(".confirm") %> -

-

- <%= submit_tag t(".revoke") %> -

-<% end %> + <%= bootstrap_form_for :revoke, :url => { :action => "revoke" } do |f| %> +
+
+ <%= check_box_tag "confirm", "yes", false, { :class => "form-check-input" } %> + <%= label_tag "confirm", t(".confirm"), { :class => "form-check-label" } %> +
+
+ + <%= f.primary t(".revoke") %> + <% end %> <% else %> -

- <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :'datetime.distance_in_words_ago')) %> -

+

+ <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :'datetime.distance_in_words_ago')) %> +

<% end %> From e6dcf94577ae67a15259618c32c93db4df8e6f58 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Feb 2021 10:21:48 +0000 Subject: [PATCH 3/6] Use small bootstrap buttons for message inbox and outbox actions --- app/views/messages/_message_summary.html.erb | 8 ++++---- app/views/messages/_sent_message_summary.html.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/messages/_message_summary.html.erb b/app/views/messages/_message_summary.html.erb index 1d9630f715..1a4445eae9 100644 --- a/app/views/messages/_message_summary.html.erb +++ b/app/views/messages/_message_summary.html.erb @@ -1,8 +1,8 @@ -"> +"> <%= link_to message_summary.sender.display_name, user_path(message_summary.sender) %> <%= link_to message_summary.title, message_path(message_summary) %> <%= l message_summary.sent_on, :format => :friendly %> - <%= button_to t(".unread_button"), message_mark_path(message_summary, :mark => "unread"), :remote => true %> - <%= button_to t(".read_button"), message_mark_path(message_summary, :mark => "read"), :remote => true %> - <%= button_to t(".destroy_button"), message_path(message_summary, :referer => request.fullpath), :method => :delete, :remote => true %> + <%= button_to t(".unread_button"), message_mark_path(message_summary, :mark => "unread"), :remote => true, :class => "btn btn-sm btn-primary" %> + <%= button_to t(".read_button"), message_mark_path(message_summary, :mark => "read"), :remote => true, :class => "btn btn-sm btn-primary" %> + <%= button_to t(".destroy_button"), message_path(message_summary, :referer => request.fullpath), :method => :delete, :remote => true, :class => "btn btn-sm btn-danger" %> diff --git a/app/views/messages/_sent_message_summary.html.erb b/app/views/messages/_sent_message_summary.html.erb index ba18ca875c..4d1b361b18 100644 --- a/app/views/messages/_sent_message_summary.html.erb +++ b/app/views/messages/_sent_message_summary.html.erb @@ -2,5 +2,5 @@ <%= link_to sent_message_summary.recipient.display_name, user_path(sent_message_summary.recipient) %> <%= link_to sent_message_summary.title, message_path(sent_message_summary) %> <%= l sent_message_summary.sent_on, :format => :friendly %> - <%= button_to t(".destroy_button"), message_path(sent_message_summary, :referer => request.fullpath), :method => :delete, :remote => true %> + <%= button_to t(".destroy_button"), message_path(sent_message_summary, :referer => request.fullpath), :method => :delete, :remote => true, :class => "btn btn-sm btn-danger" %> From f173895b00fc50f8a2d62a74e2fcd0fed2c6ea16 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Feb 2021 10:22:05 +0000 Subject: [PATCH 4/6] Use small bootstrap buttons for oauth client actions --- app/views/oauth_clients/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb index f35537953a..8e940e341f 100644 --- a/app/views/oauth_clients/index.html.erb +++ b/app/views/oauth_clients/index.html.erb @@ -18,9 +18,9 @@ <%= link_to token.client_application.name, token.client_application.url %> <%= token.authorized_at %> - <%= form_tag({ :controller => "oauth", :action => "revoke" }, { :class => "standard-form" }) do %> + <%= form_tag({ :controller => "oauth", :action => "revoke" }) do %> <%= hidden_field_tag "token", token.token %> - <%= submit_tag t(".revoke") %> + <%= submit_tag t(".revoke"), :class => "btn btn-sm btn-primary" %> <% end %> From 05dd681abf576760e4161be1d781be6d45d59fef Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Feb 2021 11:49:27 +0000 Subject: [PATCH 5/6] Refactor the export form to use bootstrap form controls 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. --- app/assets/stylesheets/common.scss | 10 ++-------- app/views/site/export.html.erb | 18 +++++++++--------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index e3c8ff202b..3a8b97fbc9 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1005,9 +1005,8 @@ tr.turn:hover { .export_area_inputs { margin-bottom: $lineheight/2; input[type="text"] { - width: 80px; + width: 100px; text-align: center; - margin-bottom: 5px; } } @@ -1025,18 +1024,13 @@ tr.turn:hover { float: right; /* no-r2 */ margin-right: -1px; } - #minlat { margin-bottom: 0; } + #minlat { margin-bottom: -1px; } } .export_bound { margin: $lineheight/4; } - .export_button { - margin-top: $lineheight; - margin-bottom: $lineheight; - } - dl { padding-left: $lineheight/2; dd { diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index 934b56a024..d6db3908b7 100644 --- a/app/views/site/export.html.erb +++ b/app/views/site/export.html.erb @@ -2,17 +2,17 @@ <%= 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" %>
- <%= text_field_tag("maxlat", nil, :size => 10, :class => "export_bound") %> -
- <%= text_field_tag("minlon", nil, :size => 10, :class => "export_bound") %> - <%= text_field_tag("maxlon", nil, :size => 10, :class => "export_bound") %> -

- <%= text_field_tag("minlat", nil, :size => 10, :class => "export_bound") %> + <%= text_field_tag("maxlat", nil, :size => 10, :class => "export_bound form-control mx-auto") %> +
+ <%= text_field_tag("minlon", nil, :size => 10, :class => "export_bound form-control") %> + <%= text_field_tag("maxlon", nil, :size => 10, :class => "export_bound form-control") %> +
+ <%= text_field_tag("minlat", nil, :size => 10, :class => "export_bound form-control mx-auto") %>
<%= t ".manually_select" %>
@@ -27,8 +27,8 @@
-
- <%= submit_tag t(".export_button") %> +
+ <%= submit_tag t(".export_button"), :class => "btn btn-primary mx-auto" %>

<%= t ".too_large.advice" %>

From 1dc1c0322508ee9ab9f576d25531471d61441890 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Feb 2021 13:34:59 +0000 Subject: [PATCH 6/6] Rework welcome message to use bootstrap buttons I also reworked the layout to use flex utilities and avoid using a white button border as a spacing hack. In future this will be better done with start/end utilities, avoiding the need to be fancy with negative margins. --- app/assets/stylesheets/common.scss | 15 --------------- app/views/layouts/map.html.erb | 24 +++++++++++++++--------- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 3a8b97fbc9..c010691c65 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -448,26 +448,11 @@ body.compact-nav { .welcome { display: none; - padding-bottom: 5px; p { - padding: $lineheight/2 $lineheight $lineheight; font-size: 110%; font-weight: 300; } - - .button { - width: 50%; - float: left; - margin: 0; - border-radius: 0; - font-weight: normal; - padding: .6em; - - &.learn-more { - border-right: 1px solid #fff; - } - } } #banner { diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 33737ae238..0403bc8896 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -41,15 +41,21 @@ <% unless current_user %>
<%= render "sidebar_header", :title => t("layouts.intro_header") %> -

<%= t "layouts.intro_text" %>

-

<%= t "layouts.hosting_partners_html", - :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"), - :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"), - :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %> -

-
- <%= t("layouts.learn_more") %> - +
+

<%= t "layouts.intro_text" %>

+

<%= t "layouts.hosting_partners_html", + :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"), + :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"), + :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %> +

+
+
+ <%= t("layouts.learn_more") %> +
+
+ <%= t("layouts.start_mapping") %> +
+
<% end %>