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

Improve styling of feature list

Browse source
This commit is contained in:
Tom Hughes 2014-03-09 12:29:28 +00:00
parent 479b22ca77
commit e329bf37c0
3 changed files with 37 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/index/query.js
View file

@ -1,3 +1,5 @@
//= require jquery.simulate
OSM.Query = function(map) { OSM.Query = function(map) {
var queryButton = $(".control-query .control-button"), var queryButton = $(".control-query .control-button"),
uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'], uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'],
@ -27,6 +29,11 @@ OSM.Query = function(map) {
var geometry = $(this).data("geometry") var geometry = $(this).data("geometry")
if (geometry) map.removeLayer(geometry); if (geometry) map.removeLayer(geometry);
$(this).removeClass("selected"); $(this).removeClass("selected");
})
.on("click", ".query-results li", function (e) {
if (!$(e.target).is('a')) {
$(this).find("a").simulate("click", e);
}
}); });
function interestingFeature(feature, origin) { function interestingFeature(feature, origin) {
@ -159,7 +166,6 @@ OSM.Query = function(map) {
.data("geometry", featureGeometry(element, nodes)) .data("geometry", featureGeometry(element, nodes))
.appendTo($ul); .appendTo($ul);
var $p = $("<p>") var $p = $("<p>")
.addClass("inner12 search_results_entry clearfix")
.text(featurePrefix(element) + " ") .text(featurePrefix(element) + " ")
.appendTo($li); .appendTo($li);

25
app/assets/stylesheets/common.css.scss
View file

@ -1124,11 +1124,32 @@ header .search_form {
margin: 0 0 10px 10px; margin: 0 0 10px 10px;
} }
.query-intro p {
padding: $lineheight $lineheight $lineheight/2;
}
.query-results { .query-results {
display: none; display: none;
ul.results-list li.selected { h3 {
background: #FFFFE6; padding: $lineheight $lineheight $lineheight/2;
margin: 0;
}
ul {
li {
padding: 15px 20px;
border-bottom: 1px solid #ddd;
cursor: pointer;
&.selected {
background: #FFFFE6;
}
a {
color: #000;
}
}
} }
} }
} }

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

@ -5,18 +5,18 @@
<%= t "browse.query.title" %> <%= t "browse.query.title" %>
</h2> </h2>
<div class="browse-section query-intro"> <div class="query-intro">
<p><%= t("browse.query.introduction") %></p> <p><%= t("browse.query.introduction") %></p>
</div> </div>
<div id="query-nearby" class="browse-section query-results"> <div id="query-nearby" class="query-results">
<h4><%= t("browse.query.nearby") %></h4> <h3><%= t("browse.query.nearby") %></h3>
<%= image_tag "searching.gif", :class => "loader" %> <%= image_tag "searching.gif", :class => "loader" %>
<ul class="results-list"></ul> <ul class="query-results-list"></ul>
</div> </div>
<div id="query-isin" class="browse-section query-results"> <div id="query-isin" class="query-results">
<h4><%= t("browse.query.enclosing") %></h4> <h3><%= t("browse.query.enclosing") %></h3>
<%= image_tag "searching.gif", :class => "loader" %> <%= image_tag "searching.gif", :class => "loader" %>
<ul class="results-list"></ul> <ul class="query-results-list"></ul>
</div> </div>