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

Use full page width when editing with iD

Browse source
This commit is contained in:
John Firebaugh 2013-07-31 11:46:32 -07:00 • committed by Tom Hughes
parent 78e97ade45
commit 452eabc941
5 changed files with 42 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -250,6 +250,10 @@ table {
#small-title { #small-title {
display: none; display: none;
img {
vertical-align: text-bottom;
}
} }
/* Rules for the introductory text displayed in the left sidebar to new users */ /* Rules for the introductory text displayed in the left sidebar to new users */
@ -444,6 +448,7 @@ a.donate {
.site-index #top-bar, .site-index #top-bar,
.site-export #top-bar { .site-export #top-bar {
position: fixed; position: fixed;
top: 0;
left: 0; left: 0;
right: 0; right: 0;
} }
@ -1013,10 +1018,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
text-align: left; text-align: left;
} }
.site-edit #content {
top: 30px;
}
#content.maximised { #content.maximised {
top: 0; top: 0;
left: 0; left: 0;
@ -2147,6 +2148,30 @@ a.button {
/* /*
* Rules for the iD editor * Rules for the iD editor
*/ */
.site-edit-id {
#left,
#large-title {
display: none;
}
#small-title {
display: inline-block;
width: 185px;
height: 30px;
font-size: 14px;
margin: 0;
background-color: #eee;
border-bottom: 1px solid #ccc;
text-align: center;
padding-top: 7px;
}
#content {
left: 0;
}
}
.id-embed { .id-embed {
width: 100%; width: 100%;
height: 100%; height: 100%;

19
app/assets/stylesheets/small.css.scss
View file

@ -74,29 +74,12 @@ h2, h3, h4 {
/* Rules for the site name - shown when left sidebar is hidden */ /* Rules for the site name - shown when left sidebar is hidden */
#small-title { #small-title {
font-size: 12px; font-size: 10px;
line-height: 14px;
height: 16px;
display: block; display: block;
position: absolute; position: absolute;
left: 5px; left: 5px;
top: 5px; top: 5px;
padding: 2px;
width: 110px;
background-color: #fff;
z-index: 100;
}
#small-title img {
position: absolute;
}
#small-title h1 {
position: absolute;
font-size: 10px;
line-height: 18px;
margin: 0; margin: 0;
left: 22px;
} }
/* Rules for greeting bar in the top right corner */ /* Rules for greeting bar in the top right corner */

2
app/controllers/site_controller.rb
View file

@ -59,6 +59,8 @@ class SiteController < ApplicationController
return return
end end
@extra_body_class = "site-edit-#{editor}"
if params[:node] if params[:node]
bbox = Node.find(params[:node]).bbox.to_unscaled bbox = Node.find(params[:node]).bbox.to_unscaled
@lat = bbox.centre_lat @lat = bbox.centre_lat

4
app/helpers/application_helper.rb
View file

@ -102,4 +102,8 @@ module ApplicationHelper
def friendly_date(date) def friendly_date(date)
content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly)) content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
end end
def body_class
[params[:controller], "#{params[:controller]}-#{params[:action]}", @extra_body_class].compact.join(" ")
end
end end

10
app/views/layouts/site.html.erb
View file

@ -1,11 +1,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= dir %>"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= dir %>">
<%= render :partial => "layouts/head" %> <%= render :partial => "layouts/head" %>
<body class="<%= params[:controller] %> <%= params[:controller] %>-<%= params[:action] %>"> <body class="<%= body_class %>">
<div id="small-title"> <h1 id="small-title">
<%= link_to(image_tag("osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text')), root_path) %> <%= image_tag "osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text') %>
<h1><%= t 'layouts.project_name.h1' %></h1> <%= t 'layouts.project_name.h1' %>
</div> </h1>
<div id="left"> <div id="left">
<div id="logo"> <div id="logo">
<%= link_to(image_tag("osm_logo.png", <%= link_to(image_tag("osm_logo.png",