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

Reuse styles for map-ui panel

Browse source
This commit is contained in:
Tom MacWright 2013-06-13 12:15:43 -04:00 • committed by John Firebaugh
parent 9172695f7f
commit e96a64ca9c
6 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/application.js
View file

@ -123,6 +123,7 @@ function getShortUrl(map) {
function getUrl(map) { function getUrl(map) {
var center = map.getCenter(), var center = map.getCenter(),
zoom = map.getZoom(); zoom = map.getZoom();
return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ? return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
'http://openstreetmap.org/?' : '/?') + 'http://openstreetmap.org/?' : '/?') +
querystring.stringify({ querystring.stringify({

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

@ -16,9 +16,11 @@ L.OSM.key = function (options) {
var $ui = $('<div>') var $ui = $('<div>')
.attr('class', 'layers-ui'); .attr('class', 'layers-ui');
$('<h2>') $('<section>')
.text(I18n.t('javascripts.key.title')) .appendTo($ui)
.appendTo($ui); .append(
$('<h2>')
.text(I18n.t('javascripts.key.title')));
var $section = $('<section>') var $section = $('<section>')
.appendTo($ui); .appendTo($ui);

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

@ -18,9 +18,11 @@ L.OSM.layers = function(options) {
var $ui = $('<div>') var $ui = $('<div>')
.attr('class', 'layers-ui'); .attr('class', 'layers-ui');
$('<h2>') $('<section>')
.text(I18n.t('javascripts.map.layers.header')) .appendTo($ui)
.appendTo($ui); .append(
$('<h2>')
.text(I18n.t('javascripts.map.layers.header')));
if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') { if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
var overlaySection = $('<section>') var overlaySection = $('<section>')

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

@ -16,11 +16,13 @@ L.OSM.share = function (options) {
var $ui = $('<div>') var $ui = $('<div>')
.attr('class', 'share-ui'); .attr('class', 'share-ui');
$('<h2>') $('<section>')
.text(I18n.t('javascripts.share.title')) .appendTo($ui)
.appendTo($ui); .append(
$('<h2>')
.text(I18n.t('javascripts.share.title')));
var $share_link = $('<div></div>') var $share_link = $('<section></section>')
.appendTo($ui); .appendTo($ui);
var $title = $('<h3></h3>') var $title = $('<h3></h3>')

2
app/assets/javascripts/leaflet.sidebar.js
View file

@ -22,7 +22,7 @@ L.OSM.sidebar = function(selector) {
current = $(); current = $();
} else { } else {
$(sidebar).show(); $(sidebar).show();
controlContainer.css({paddingRight: '200px'}); controlContainer.css({paddingRight: '250px'});
current = pane; current = pane;
} }

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

@ -584,17 +584,26 @@ a.donate {
position: absolute; position: absolute;
display: none; display: none;
right: 0; right: 0;
width: 200px; width: 250px;
height: 100%; height: 100%;
background: white; background: white;
overflow: auto;
} }
.layers-ui { #map-ui {
section { section {
border-top: 1px solid #868e85; border-top: 1px solid #868e85;
padding: 15px; padding: 15px;
} }
section:first-child {
border-top:0;
}
h2 {
margin:0;
}
li { li {
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
@ -764,7 +773,6 @@ a.donate {
/* Rules for the map key which appears in the popout sidebar */ /* Rules for the map key which appears in the popout sidebar */
#mapkey { #mapkey {
padding: $lineheight $lineheight 0 $lineheight;
.mapkey-table-key img { .mapkey-table-key img {
display: block; display: block;
margin-left: auto; margin-left: auto;