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

Cleanup notes and fix CSS error

Browse source
This commit is contained in:
Saman Bemel-Benrud 2013-06-12 19:23:58 -04:00 • committed by Tom Hughes
parent c3b8897c44
commit 34edfdb9ba
4 changed files with 17 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/templates/notes/new.jst.ejs
View file

@ -5,7 +5,7 @@
<input type="hidden" name="lat">
<textarea class="comment" name="text" cols="40" rows="10"></textarea>
<br/>
<div class="buttons">
<div class="buttons clearfix">
<input type="submit" name="add" value="<%- I18n.t('javascripts.notes.new.add') %>" data-url="<%- create_url %>" disabled="1">
</div>
</form>

6
app/assets/javascripts/templates/notes/show.jst.ejs
View file

@ -23,16 +23,16 @@
<% if (note.status == "open") { %>
<form action="#">
<textarea class="comment" name="text" cols="40" rows="5"></textarea>
<div class="buttons">
<input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator" data-method="DELETE" data-url="<%- note.url %>">
<div class="buttons clearfix">
<input type="submit" name="close" value="<%- I18n.t('javascripts.notes.show.resolve') %>" class="hide_unless_logged_in" data-method="POST" data-url="<%- note.close_url %>">
<input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator" data-method="DELETE" data-url="<%- note.url %>">
<input type="submit" name="comment" value="<%- I18n.t('javascripts.notes.show.comment') %>" data-method="POST" data-url="<%- note.comment_url %>" disabled="1">
</div>
</form>
<% } else { %>
<form action="#">
<input type="hidden" name="text" value="">
<div class="buttons">
<div class="buttons clearfix">
<input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator" data-method="DELETE" data-url="<%- note.url %>">
<input type="submit" name="reopen" value="<%- I18n.t('javascripts.notes.show.reactivate') %>" class="hide_unless_logged_in" data-method="POST" data-url="<%- note.reopen_url %>">
</div>

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

@ -391,7 +391,7 @@ table {
.donate {
display: block;
width: 164px;
width: 163px;
padding: $lineheight/4;
border: 1px solid #AED1A0;
background: #cbeea7;
@ -440,7 +440,7 @@ table {
}
#tabnav {
height: 30px;
height: 29px;
margin-bottom:0;
overflow: hidden;
li {
@ -1034,6 +1034,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
/* Rules for the user profile page */
#userinformation {
min-height: 100px;
.userinformation-inner {
float: left;
@ -1072,13 +1073,13 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
}
.activity-details p {
margin-left: 72px;
margin-left: 70px;
margin-bottom: 0;
}
#friends-container .contact-activity ul {
margin-left: 72px;
}
margin-left: 70px;
}
.user-view {
p#no_home_location {
@ -1101,16 +1102,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
.user_popup {
min-width: 200px;
p {
padding-top: 0;
padding-bottom: 5px;
margin-top: 0;
margin-bottom: 0;
margin-left: 60px;
padding: 0 0 5px 0;
margin-top: 0 0 0 60px;
font-size: 12px;
}
img.user_thumbnail {
float: left;
margin: 0 $lineheight/2 0 0;
@ -1599,6 +1595,8 @@ ul.secondary-actions {
.inner12 { padding: $lineheight/2 $lineheight;}
.inner11 { padding: $lineheight/2;}
.inner02 { padding: 0 $lineheight;}
/* Utility for general button styles */
@ -1923,16 +1921,8 @@ a.button {
border-bottom: 1px solid #ccc;
}
.ads {
width: 370px;
position: absolute;
left: 0%;
}
.ad {
float: left;
height: 120px;
padding: $lineheight/2;
border: 0px;
height: 100px;
border: 0;
background: #fff;
}

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

@ -65,7 +65,7 @@
</li>
<%= yield :left_menu %>
</ul>
<div class='ad-container'>
<div class='ad-container inner11'>
<div class='ads'>
<%= ad = [{:image => 'sotm-birmingham-ad.png',
:title => 'State of the Map Birmingham',