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

Match the other sidebar better

Browse source
This commit is contained in:
John Firebaugh 2013-07-09 11:33:32 -07:00
parent e900d870bf
commit 5c0aeb1558
6 changed files with 50 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/leaflet.key.js
View file

@ -14,18 +14,19 @@ L.OSM.key = function (options) {
.appendTo($container); .appendTo($container);
var $ui = $('<div>') var $ui = $('<div>')
.attr('class', 'layers-ui'); .attr('class', 'key-ui');
$('<section>') $('<header>')
.attr('class', 'sidebar_heading')
.appendTo($ui) .appendTo($ui)
.append( .append(
$('<a>') $('<a>')
.html('&raquo;') .text(I18n.t('javascripts.close'))
.attr('class', 'close-button') .attr('class', 'sidebar_close')
.attr('href', '#') .attr('href', '#')
.bind('click', toggle)) .bind('click', toggle))
.append( .append(
$('<h2>') $('<h4>')
.text(I18n.t('javascripts.key.title'))); .text(I18n.t('javascripts.key.title')));
var $section = $('<section>') var $section = $('<section>')

9
app/assets/javascripts/leaflet.layers.js
View file

@ -18,16 +18,17 @@ L.OSM.layers = function(options) {
var $ui = $('<div>') var $ui = $('<div>')
.attr('class', 'layers-ui'); .attr('class', 'layers-ui');
$('<section>') $('<header>')
.attr('class', 'sidebar_heading')
.appendTo($ui) .appendTo($ui)
.append( .append(
$('<a>') $('<a>')
.html('&raquo;') .text(I18n.t('javascripts.close'))
.attr('class', 'close-button') .attr('class', 'sidebar_close')
.attr('href', '#') .attr('href', '#')
.bind('click', toggle)) .bind('click', toggle))
.append( .append(
$('<h2>') $('<h4>')
.text(I18n.t('javascripts.map.layers.header'))); .text(I18n.t('javascripts.map.layers.header')));
var baseSection = $('<section>') var baseSection = $('<section>')

13
app/assets/javascripts/leaflet.share.js
View file

@ -16,22 +16,23 @@ L.OSM.share = function (options) {
var $ui = $('<div>') var $ui = $('<div>')
.attr('class', 'share-ui'); .attr('class', 'share-ui');
$('<section>') $('<header>')
.attr('class', 'sidebar_heading')
.appendTo($ui) .appendTo($ui)
.append( .append(
$('<a>') $('<a>')
.html('&raquo;') .text(I18n.t('javascripts.close'))
.attr('class', 'close-button') .attr('class', 'sidebar_close')
.attr('href', '#') .attr('href', '#')
.bind('click', toggle)) .bind('click', toggle))
.append( .append(
$('<h2>') $('<h4>')
.text(I18n.t('javascripts.share.title'))); .text(I18n.t('javascripts.share.title')));
var $share_link = $('<section></section>') var $share_link = $('<section>')
.appendTo($ui); .appendTo($ui);
var $title = $('<h3></h3>') var $title = $('<h4>')
.text(I18n.t('javascripts.share.link')) .text(I18n.t('javascripts.share.link'))
.appendTo($share_link); .appendTo($share_link);

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

@ -575,28 +575,21 @@ a.donate {
width: 250px; width: 250px;
height: 100%; height: 100%;
background: white; background: white;
border-left: 1px solid #CCC;
overflow: auto; overflow: auto;
} }
#map-ui { #map-ui {
section { section {
border-top: 1px solid #868e85; border-bottom: 1px solid #DDD;
padding: 15px; padding: 15px;
} }
section:first-child {
border-top:0;
}
h2 {
margin:0;
}
a.close-button { a.close-button {
float: right; float: right;
padding:5px; padding:5px;
font-size:20px; font-size:20px;
line-height:15px; line-height:10px;
color:#222; color:#222;
border:1px solid #ddd; border:1px solid #ddd;
} }
@ -704,16 +697,6 @@ a.donate {
left: 0px; left: 0px;
border-right: 1px solid $keyline; border-right: 1px solid $keyline;
width: 33.3333%; width: 33.3333%;
.sidebar_heading {
position: relative;
padding: $lineheight/2 $lineheight;
z-index: 9999;
background: $offwhite;
border-bottom: 1px solid #ccc;
}
h4 {
margin: 0;
}
ul { ul {
margin-bottom: 0; margin-bottom: 0;
&:last-child { &:last-child {
@ -728,7 +711,18 @@ a.donate {
} }
} }
#sidebar_close { .sidebar_heading {
position: relative;
padding: $lineheight/2 $lineheight;
z-index: 9999;
background: $offwhite;
border-bottom: 1px solid #ccc;
h4 {
margin: 0;
}
}
.sidebar_close {
position: absolute; position: absolute;
height: $lineheight; height: $lineheight;
top: 0px; top: 0px;

2
app/views/site/_sidebar.html.erb
View file

@ -1,7 +1,7 @@
<div id="sidebar"> <div id="sidebar">
<div class="sidebar_heading"> <div class="sidebar_heading">
<h4 id="sidebar_title"><% t 'site.sidebar.search_results' %></h4> <h4 id="sidebar_title"><% t 'site.sidebar.search_results' %></h4>
<div id="sidebar_close"><a class="sidebar_close" href="#"><%= t 'site.sidebar.close' %></a></div> <a class="sidebar_close" href="#"><%= t 'site.sidebar.close' %></a>
</div> </div>
<div id="sidebar_content"> <div id="sidebar_content">
</div> </div>

3
config/locales/en.yml
View file

@ -2037,6 +2037,7 @@ en:
last_changed: "Last changed" last_changed: "Last changed"
ago_html: "%{when} ago" ago_html: "%{when} ago"
javascripts: javascripts:
close: Close
share: share:
title: "Share" title: "Share"
cancel: "Cancel" cancel: "Cancel"
@ -2044,7 +2045,7 @@ en:
short_url: "Short URL" short_url: "Short URL"
key: key:
title: "Map Key" title: "Map Key"
tooltip: "Key for the map" tooltip: "Map Key"
map: map:
zoom: zoom:
in: Zoom In in: Zoom In