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

Replace the title in the note popup with a permalink

Browse source
This commit is contained in:
Tom Hughes 2013-04-27 11:51:51 +01:00
parent 4a69512ce4
commit d48b1ccdf2
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
<div class="note"> <div class="note">
<h2><a href="/?note=<%- note.id %>"><%- I18n.t('javascripts.notes.show.title', { id: note.id }) %></a></h2> <p class="permalink"><a href="/?note=<%- note.id %>"><%- I18n.t('javascripts.notes.show.permalink', { id: note.id }) %></a></p>
<% if (note.comments.some(function (comment) { return !comment.user })) { %> <% if (note.comments.some(function (comment) { return !comment.user })) { %>
<small class="warning"><%- I18n.t('javascripts.notes.show.anonymous_warning') %></small> <small class="warning"><%- I18n.t('javascripts.notes.show.anonymous_warning') %></small>
<% } %> <% } %>

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

@ -1732,6 +1732,10 @@ a.button.submit {
margin-top: 10px; margin-top: 10px;
} }
.permalink {
margin: -10px 0 10px -12px;
}
.warning { .warning {
display: block; display: block;
background-color: #ff7070; background-color: #ff7070;

2
config/locales/en.yml
View file

@ -2038,7 +2038,7 @@ en:
intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below." intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
add: Add Note add: Add Note
show: show:
title: Note %{id} permalink: Permalink
anonymous_warning: This note includes comments from anonymous users which should be independently verified. anonymous_warning: This note includes comments from anonymous users which should be independently verified.
opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}" opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}"
opened_by_anonymous: "created by anonymous at %{time}" opened_by_anonymous: "created by anonymous at %{time}"