Remove some search/directions custom css
This commit is contained in:
parent
574231cf95
commit
62ba143c3c
6 changed files with 13 additions and 21 deletions
|
@ -244,7 +244,7 @@ OSM.Directions = function (map) {
|
||||||
map.removeLayer(polyline);
|
map.removeLayer(polyline);
|
||||||
|
|
||||||
if (reportErrors) {
|
if (reportErrors) {
|
||||||
$("#sidebar_content").html("<p class=\"search_results_error\">" + I18n.t("javascripts.directions.errors.no_route") + "</p>");
|
$("#sidebar_content").html("<div class=\"alert alert-danger\">" + I18n.t("javascripts.directions.errors.no_route") + "</div>");
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -307,7 +307,7 @@ OSM.Directions = function (map) {
|
||||||
var row = $("<tr class='turn'/>");
|
var row = $("<tr class='turn'/>");
|
||||||
row.append("<td class='border-0'><div class='direction i" + direction + "'/></td> ");
|
row.append("<td class='border-0'><div class='direction i" + direction + "'/></td> ");
|
||||||
row.append("<td>" + instruction);
|
row.append("<td>" + instruction);
|
||||||
row.append("<td class='distance'>" + dist);
|
row.append("<td class='distance text-muted text-end'>" + dist);
|
||||||
|
|
||||||
row.on("click", function () {
|
row.on("click", function () {
|
||||||
popup
|
popup
|
||||||
|
|
|
@ -638,9 +638,8 @@ header .search_forms,
|
||||||
/* Rules for search sidebar */
|
/* Rules for search sidebar */
|
||||||
|
|
||||||
#sidebar .search_results_entry {
|
#sidebar .search_results_entry {
|
||||||
ul li {
|
ul li.selected {
|
||||||
cursor: pointer;
|
background: $list-highlight;
|
||||||
&.selected { background: $list-highlight; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.search_more .loader {
|
.search_more .loader {
|
||||||
|
@ -648,11 +647,6 @@ header .search_forms,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.search_results_error {
|
|
||||||
color: #f00;
|
|
||||||
padding: 10px 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Rules for routing */
|
/* Rules for routing */
|
||||||
|
|
||||||
div.direction {
|
div.direction {
|
||||||
|
@ -666,8 +660,6 @@ div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
|
||||||
}
|
}
|
||||||
|
|
||||||
td.distance {
|
td.distance {
|
||||||
color: $darkgrey;
|
|
||||||
text-align: right;
|
|
||||||
font-size: x-small;
|
font-size: x-small;
|
||||||
}
|
}
|
||||||
tr.turn {
|
tr.turn {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
module GeocoderHelper
|
module GeocoderHelper
|
||||||
def result_to_html(result)
|
def result_to_html(result)
|
||||||
html_options = { :class => "set_position", :data => {} }
|
html_options = { :class => "set_position stretched-link", :data => {} }
|
||||||
|
|
||||||
url = if result[:type] && result[:id]
|
url = if result[:type] && result[:id]
|
||||||
url_for(:controller => :browse, :action => result[:type], :id => result[:id])
|
url_for(:controller => :browse, :action => result[:type], :id => result[:id])
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
<p class="search_results_error"><%= h(@error) %></p>
|
<div class="alert alert-danger mx-2 px-2"><%= h(@error) %></div>
|
||||||
|
|
|
@ -415,6 +415,6 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_template :error
|
assert_template :error
|
||||||
assert_template :layout => nil
|
assert_template :layout => nil
|
||||||
assert_select "p.search_results_error", error
|
assert_select ".alert.alert-danger", error
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,21 +3,21 @@ require "test_helper"
|
||||||
class GeocoderHelperTest < ActionView::TestCase
|
class GeocoderHelperTest < ActionView::TestCase
|
||||||
def test_result_to_html
|
def test_result_to_html
|
||||||
html = result_to_html(:lat => 1.23, :lon => 4.56, :zoom => 16, :name => "Name")
|
html = result_to_html(:lat => 1.23, :lon => 4.56, :zoom => 16, :name => "Name")
|
||||||
assert_dom_equal '<a class="set_position" data-lat="1.23" data-lon="4.56" data-zoom="16" data-name="Name" href="/#map=16/1.23/4.56">Name</a>', html
|
assert_dom_equal '<a class="set_position stretched-link" data-lat="1.23" data-lon="4.56" data-zoom="16" data-name="Name" href="/#map=16/1.23/4.56">Name</a>', html
|
||||||
|
|
||||||
html = result_to_html(:lat => 1.23, :lon => 4.56, :zoom => 16, :prefix => "Prefix", :name => "Name")
|
html = result_to_html(:lat => 1.23, :lon => 4.56, :zoom => 16, :prefix => "Prefix", :name => "Name")
|
||||||
assert_dom_equal 'Prefix <a class="set_position" data-lat="1.23" data-lon="4.56" data-zoom="16" data-prefix="Prefix" data-name="Name" href="/#map=16/1.23/4.56">Name</a>', html
|
assert_dom_equal 'Prefix <a class="set_position stretched-link" data-lat="1.23" data-lon="4.56" data-zoom="16" data-prefix="Prefix" data-name="Name" href="/#map=16/1.23/4.56">Name</a>', html
|
||||||
|
|
||||||
html = result_to_html(:lat => 1.23, :lon => 4.56, :zoom => 16, :name => "Name", :suffix => "Suffix")
|
html = result_to_html(:lat => 1.23, :lon => 4.56, :zoom => 16, :name => "Name", :suffix => "Suffix")
|
||||||
assert_dom_equal '<a class="set_position" data-lat="1.23" data-lon="4.56" data-zoom="16" data-name="Name" data-suffix="Suffix" href="/#map=16/1.23/4.56">Name</a> Suffix', html
|
assert_dom_equal '<a class="set_position stretched-link" data-lat="1.23" data-lon="4.56" data-zoom="16" data-name="Name" data-suffix="Suffix" href="/#map=16/1.23/4.56">Name</a> Suffix', html
|
||||||
|
|
||||||
html = result_to_html(:lat => 1.23, :lon => 4.56, :zoom => 16, :prefix => "Prefix", :name => "Name", :suffix => "Suffix")
|
html = result_to_html(:lat => 1.23, :lon => 4.56, :zoom => 16, :prefix => "Prefix", :name => "Name", :suffix => "Suffix")
|
||||||
assert_dom_equal 'Prefix <a class="set_position" data-lat="1.23" data-lon="4.56" data-zoom="16" data-prefix="Prefix" data-name="Name" data-suffix="Suffix" href="/#map=16/1.23/4.56">Name</a> Suffix', html
|
assert_dom_equal 'Prefix <a class="set_position stretched-link" data-lat="1.23" data-lon="4.56" data-zoom="16" data-prefix="Prefix" data-name="Name" data-suffix="Suffix" href="/#map=16/1.23/4.56">Name</a> Suffix', html
|
||||||
|
|
||||||
html = result_to_html(:type => "node", :id => 123456, :name => "Name")
|
html = result_to_html(:type => "node", :id => 123456, :name => "Name")
|
||||||
assert_dom_equal '<a class="set_position" data-type="node" data-id="123456" data-name="Name" href="/node/123456">Name</a>', html
|
assert_dom_equal '<a class="set_position stretched-link" data-type="node" data-id="123456" data-name="Name" href="/node/123456">Name</a>', html
|
||||||
|
|
||||||
html = result_to_html(:min_lat => 1.23, :max_lat => 4.56, :min_lon => -1.23, :max_lon => 2.34, :name => "Name")
|
html = result_to_html(:min_lat => 1.23, :max_lat => 4.56, :min_lon => -1.23, :max_lon => 2.34, :name => "Name")
|
||||||
assert_dom_equal '<a class="set_position" data-min-lat="1.23" data-max-lat="4.56" data-min-lon="-1.23" data-max-lon="2.34" data-name="Name" href="/?bbox=-1.23,1.23,2.34,4.56">Name</a', html
|
assert_dom_equal '<a class="set_position stretched-link" data-min-lat="1.23" data-max-lat="4.56" data-min-lon="-1.23" data-max-lon="2.34" data-name="Name" href="/?bbox=-1.23,1.23,2.34,4.56">Name</a', html
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue