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

Replace spinners in html.erb templates

Browse source
This commit is contained in:
Anton Khorev 2022-10-29 17:33:09 +03:00
parent 8b9d0ff560
commit 28060080e8
8 changed files with 42 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -681,21 +681,6 @@ body.small-nav {
}
}
#sidebar {
#sidebar_loader,
.search_more {
width: 100%;
margin: $lineheight auto;
}
.loader {
text-align: center;
margin: auto;
width: 40px;
display: block;
}
}
/* Temporary label size override until we remove site-wide font customisation */
form {
@ -753,7 +738,6 @@ header .search_forms,
.search_more .loader {
display: none;
width: 100%;
}
}
@ -1336,14 +1320,6 @@ tr.turn:hover {
.directions_form {
background-color: $lightgrey;
.loader_copy {
display: none;
img {
vertical-align: middle;
}
}
}
/* Rules for user images */

12
app/views/browse/query.html.erb
View file

@ -8,7 +8,11 @@
<div id="query-nearby" class="query-results">
<h3><%= t(".nearby") %></h3>
<%= image_tag "searching.gif", :class => "loader" %>
<div class="text-center loader">
<div class="spinner-border" role="status">
<span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
</div>
</div>
<div class="mx-n3">
<ul class="query-results-list list-group list-group-flush"></ul>
</div>
@ -16,7 +20,11 @@
<div id="query-isin" class="query-results">
<h3><%= t(".enclosing") %></h3>
<%= image_tag "searching.gif", :class => "loader" %>
<div class="text-center loader">
<div class="spinner-border" role="status">
<span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
</div>
</div>
<div class="mx-n3">
<ul class="query-results-list list-group list-group-flush"></ul>
</div>

6
app/views/changesets/history.html.erb
View file

@ -14,5 +14,9 @@
<%= render "sidebar_header", :title => @heading %>
<div class="changesets mx-n3">
<%= image_tag "searching.gif", :class => "loader" %>
<div class="text-center loader">
<div class="spinner-border" role="status">
<span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
</div>
</div>
</div>

6
app/views/changesets/index.html.erb
View file

@ -5,7 +5,11 @@
<% if @changesets.size == 20 -%>
<div class="changeset_more mt-3 text-center">
<%= link_to t(".load_more"), url_for(@params.merge(:max_id => @changesets.last.id - 1)), :class => "btn btn-primary" %>
<div class="loader"><%= image_tag "searching.gif" %></div>
<div class="text-center loader">
<div class="spinner-border" role="status">
<span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
</div>
</div>
</div>
<% end -%>
<% elsif params[:bbox] %>

8
app/views/geocoder/results.html.erb
View file

@ -11,9 +11,13 @@
<% end %>
</ul>
<% if @more_params %>
<div class="search_more text-center">
<div class="search_more text-center my-3">
<%= link_to t(".more_results"), url_for(@more_params), :class => "btn btn-primary" %>
<div class="loader"><%= image_tag "searching.gif" %></div>
<div class="text-center loader">
<div class="spinner-border" role="status">
<span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
</div>
</div>
</div>
<% end %>
<% end %>

6
app/views/geocoder/search.html.erb
View file

@ -5,6 +5,10 @@
<% @sources.each do |source| %>
<h4><%= t(".title.#{source}_html") %></h4>
<div class="search_results_entry mx-n3" data-href="<%= url_for @params.merge(:action => "search_#{source}") %>">
<%= image_tag "searching.gif", :class => "loader" %>
<div class="text-center loader">
<div class="spinner-border" role="status">
<span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
</div>
</div>
</div>
<% end %>

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

@ -51,6 +51,12 @@
</div>
</div>
<div class="loader_copy"><div class="loader"><%= image_tag "searching.gif" %></div></div>
<div class="loader_copy d-none">
<div class="text-center loader">
<div class="spinner-border" role="status">
<span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
</div>
</div>
</div>
</form>
</div>

6
app/views/layouts/map.html.erb
View file

@ -30,8 +30,10 @@
<div id="browse_status"></div>
<div id="sidebar_loader">
<img alt="<%= t("browse.start_rjs.loading") %>" class="loader" src="<%= image_path("searching.gif") %>">
<div id="sidebar_loader" class="my-3 text-center loader">
<div class="spinner-border" role="status">
<span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
</div>
</div>
<div id="sidebar_content">