.text(I18n.t("browse.start_rjs.load_data"))
.prepend($("<span class='icon close'></span>").click(cancel)))
.append(
- $("<div class='inner12'>")
+ $("<div>")
.append(
$("<p class='alert alert-warning clearfix'></p>")
.text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })))
.append(
- $("<input type='submit'>")
+ $("<input type='submit' class='btn btn-primary'>")
.val(I18n.t("browse.start_rjs.load_data"))
.click(add))));
}
var html = "<h2><a class=\"geolink\" href=\"#\">" +
"<span class=\"icon close\"></span></a>" + I18n.t("javascripts.directions.directions") +
- "</h2><p id=\"routing_summary\">" +
+ "</h2><p>" +
I18n.t("javascripts.directions.distance") + ": " + formatDistance(route.distance) + ". " +
I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + ".";
if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") {
I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " +
I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m.";
}
- html += "</p><table id=\"turnbyturn\" />";
+ html += "</p><table id=\"turnbyturn\" class=\"mb-3\"/>";
$("#sidebar_content")
.html(html);
$("#turnbyturn").append(row);
});
- $("#sidebar_content").append("<p id=\"routing_credit\">" +
+ $("#sidebar_content").append("<p class=\"text-center\">" +
I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) +
"</p>");
display: none;
}
+ #sidebar_content {
+ padding: $spacer;
+ }
+
> div {
position: relative;
float: left;
}
h2 {
- padding: $lineheight $lineheight $lineheight/2;
font-size: 1.5rem;
}
margin-left: auto;
margin-right: auto;
}
+
+ > div {
+ padding: $spacer;
+ }
}
#sidebar {
/* Rules for routing */
-#sidebar_content>table {
- padding: 5px 20px 10px 15px;
- width: 100%;
- border-collapse: separate;
- border-spacing: 0;
-}
-
div.direction {
background-image: image-url('routing-sprite.png');
width: 20px;
div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
}
-p#routing_summary {
- padding: 0 $lineheight $lineheight/4;
-}
-
td.instruction, td.distance {
padding-top: $lineheight/5;
padding-bottom: $lineheight/5;
#sidebar_content {
.browse-section {
- padding: $lineheight/2 $lineheight;
+ padding-bottom: $spacer;
+ margin-bottom: $spacer;
border-bottom: 1px solid $grey;
h4:first-child {
margin: 0 0 10px 10px;
}
- .query-intro p {
- padding: $lineheight $lineheight $lineheight/2;
- }
-
.query-results {
display: none;
- padding-bottom: $lineheight/2;
-
- h3 {
- padding: 0 $lineheight;
- }
ul {
li {
/* Rules for export sidebar */
.export_form {
- padding: $lineheight;
-
.export_area_inputs,
.export_button {
text-align: center;
}
}
-/* Rules for the routing sidebar */
-
-#sidebar_content {
- #routing_credit {
- text-align: center;
- padding: 0.5em;
- }
-}
-
/* Rules for edit pages */
.site-edit {
text-align: center;
}
-/* Utility for managing inner content areas */
-
-.inner22 { padding: $lineheight;}
-
-.inner12 { padding: $lineheight/2 $lineheight;}
-
-.inner11 { padding: $lineheight/2;}
-
-.inner20 { padding: $lineheight 0;}
-
-.inner02 { padding: 0 $lineheight;}
-
.buttons {
min-width: 200px;
input[type="submit"],
.overlay-sidebar {
#sidebar {
position: absolute;
- width: 300px;
+ width: 350px;
height: auto;
overflow: hidden;
}
flash[:error] = t "confirmations.confirm_resend.failure", :name => params[:display_name]
else
UserMailer.signup_confirm(user, user.tokens.create).deliver_later
- flash[:notice] = t "confirmations.confirm_resend.success_html", :email => user.email, :sender => Settings.support_email
+ flash[:notice] = t "confirmations.confirm_resend.success_html", :email => user.email, :sender => Settings.email_from
end
redirect_to login_path
<div class="flex-grow-1 text-break">
<h2><%= title %></h2>
</div>
- <div class="px-3 py-3">
+ <div>
<a class="geolink" href="<%= root_path %>">
<span class="icon close"></span>
</a>
<%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
-<div class="browse-section">
+<div>
<p class="font-italic">
<%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
</p>
<%= render "sidebar_header", :title => t("browse.note.new_note") %>
-<div class="note browse-section">
+<div class="note">
<p class="alert alert-info"><%= t("javascripts.notes.new.intro") %></p>
<form action="#">
<input type="hidden" name="lon">
<%= render "sidebar_header", :title => t(".title") %>
-<div class="browse-section">
+<div>
<p><%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>
</div>
<%= render "sidebar_header", :title => t(".#{@note.status}_title", :note_name => @note.id) %>
-<div class="browse-section">
+<div>
<h4><%= t(".description") %></h4>
<div class="note-description">
<%= h(@note_comments.first.body.to_html) %>
<%= render "sidebar_header", :title => t(".title") %>
-<div class="query-intro">
+<div>
<p><%= t(".introduction") %></p>
</div>
<div id="query-nearby" class="query-results">
<h3><%= t(".nearby") %></h3>
<%= image_tag "searching.gif", :class => "loader" %>
- <div>
+ <div class="mx-n3">
<ul class="query-results-list list-group list-group-flush"></ul>
</div>
</div>
<div id="query-isin" class="query-results">
<h3><%= t(".enclosing") %></h3>
<%= image_tag "searching.gif", :class => "loader" %>
- <div>
+ <div class="mx-n3">
<ul class="query-results-list list-group list-group-flush"></ul>
</div>
</div>
<%= render "sidebar_header", :title => t(".title") %>
-<div class="browse-section">
+<div>
<p><%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>
</div>
<%= render "sidebar_header", :title => @heading %>
-<div class="changesets">
+<div class="changesets mx-n3">
<%= image_tag "searching.gif", :class => "loader" %>
</div>
</div>
<% end -%>
<% elsif params[:bbox] %>
- <div class="inner22"><%= t(params[:max_id] ? ".no_more_area" : ".empty_area") %></div>
+ <p><%= t(params[:max_id] ? ".no_more_area" : ".empty_area") %></p>
<% elsif params[:display_name] %>
- <div class="inner22"><%= t(params[:max_id] ? ".no_more_user" : ".empty_user") %></div>
+ <p><%= t(params[:max_id] ? ".no_more_user" : ".empty_user") %></p>
<% else %>
- <div class="inner22"><%= t(params[:max_id] ? ".no_more" : ".empty") %></div>
+ <p><%= t(params[:max_id] ? ".no_more" : ".empty") %></p>
<% end %>
<%= render "sidebar_header", :title => t("site.sidebar.search_results") %>
<% @sources.each do |source| %>
- <h4 class="inner12"><%= t(".title.#{source}_html") %></h4>
- <div class="search_results_entry" data-href="<%= url_for @params.merge(:action => "search_#{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>
<% end %>
</div>
<% unless current_user %>
- <div class="welcome">
+ <div class="welcome p-3">
<%= render "sidebar_header", :title => t("layouts.intro_header") %>
- <div class="px-3 pb-3">
+ <div>
<p><%= t "layouts.intro_text" %></p>
<p><%= t "layouts.hosting_partners_html",
:ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
<div class="form-group d-flex">
<%= submit_tag t(".export_button"), :class => "btn btn-primary mx-auto" %>
</div>
-
- <p><%= t ".too_large.advice" %></p>
</div>
- <dl class="inner12">
+ <p><%= t ".too_large.advice" %></p>
+
+ <dl class="px-3">
<dt><a id="export_overpass" href="https://overpass-api.de/api/map?bbox="><%= t ".too_large.overpass.title" %></a></dt>
<dd><%= t ".too_large.overpass.description" %></dd>
assert_select "div#content" do
assert_select "div#sidebar" do
assert_select "div#sidebar_content" do
- assert_select "div.browse-section" do
+ assert_select "div" do
assert_select "div.notice" do
assert_select "a[href='/login?referer=%2Fchangeset%2F#{changeset.id}']", :text => I18n.t("browse.changeset.join_discussion"), :count => 1
end
assert_select "div#content" do
assert_select "div#sidebar" do
assert_select "div#sidebar_content" do
- assert_select "div.browse-section" do
+ assert_select "div" do
assert_select "form[action='#']" do
assert_select "textarea[name=text]"
end
changeset = create(:changeset)
key = "k"
- (0..255).each do |i|
+ [0, 255].each do |i|
tag = ChangesetTag.new
tag.changeset_id = changeset.id
tag.k = key * i
changeset = create(:changeset)
val = "v"
- (0..255).each do |i|
+ [0, 255].each do |i|
tag = ChangesetTag.new
tag.changeset_id = changeset.id
tag.k = "k"
end
def test_utf8_roundtrip
- (1..255).each do |i|
+ [1, 255].each do |i|
assert_message_ok("c", i)
assert_message_ok(EURO, i)
end
class NodeTagTest < ActiveSupport::TestCase
def test_length_key_valid
tag = create(:node_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.k = "k" * i
assert tag.valid?
end
def test_length_value_valid
tag = create(:node_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.v = "v" * i
assert tag.valid?
end
class OldNodeTagTest < ActiveSupport::TestCase
def test_length_key_valid
tag = create(:old_node_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.k = "k" * i
assert tag.valid?
end
def test_length_value_valid
tag = create(:old_node_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.v = "v" * i
assert tag.valid?
end
class OldRelationTagTest < ActiveSupport::TestCase
def test_length_key_valid
tag = create(:old_relation_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.k = "k" * i
assert tag.valid?
end
def test_length_value_valid
tag = create(:old_relation_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.v = "v" * i
assert tag.valid?
end
class OldWayTagTest < ActiveSupport::TestCase
def test_length_key_valid
tag = create(:old_way_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.k = "k" * i
assert tag.valid?
end
def test_length_value_valid
tag = create(:old_way_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.v = "v" * i
assert tag.valid?
end
class RelationTagTest < ActiveSupport::TestCase
def test_length_key_valid
tag = create(:relation_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.k = "k" * i
assert tag.valid?
end
def test_length_value_valid
tag = create(:relation_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.v = "v" * i
assert tag.valid?
end
def test_check_valid_length
key = "k"
val = "v"
- (1..255).each do |i|
+ [1, 255].each do |i|
up = UserPreference.new
up.user = create(:user)
up.k = key * i
class WayTagTest < ActiveSupport::TestCase
def test_length_key_valid
tag = create(:way_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.k = "k" * i
assert tag.valid?
end
def test_length_value_valid
tag = create(:way_tag)
- (0..255).each do |i|
+ [0, 255].each do |i|
tag.v = "v" * i
assert tag.valid?
end
projects / rails.git / commitdiff