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

Merge branch 'master' into feature/add-communities-page

Browse source
This commit is contained in:
Adam Hoyle 2021-12-14 10:42:42 +00:00 • committed by GitHub
commit 46875fdde3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
231 changed files with 8624 additions and 6133 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/config/manifest.js
View file

@ -19,8 +19,6 @@
//= link_directory ../../../vendor/assets/polyfill .js
//= link html5shiv/dist/html5shiv.js
//= link leaflet/dist/images/marker-icon.png
//= link leaflet/dist/images/marker-icon-2x.png
//= link leaflet/dist/images/marker-shadow.png

159
app/assets/stylesheets/common.scss
View file

@ -79,6 +79,16 @@ a {
color: $blue;
}
/* Rules for borders */
/* These add additional colours to those provided by bootstrap */
.border-grey {
border-color: $grey !important;
}
.border-lightgrey {
border-color: $lightgrey !important;
}
/* Rules for the header */
#menu-icon {
@ -216,11 +226,6 @@ nav.secondary {
}
}
img.user_thumbnail_tiny {
border: 0;
border-radius: 3px;
}
#inboxanchor {
display: inline-block;
height: 25px;
@ -370,8 +375,6 @@ body.compact-nav {
}
h3, h4 {
margin-top: $lineheight;
margin-bottom: $lineheight/2;
font-size: 1.25rem;
}
@ -390,23 +393,6 @@ body.compact-nav {
top: 20px;
}
}
.icon.close {
float: right;
cursor: pointer;
}
.flash {
padding: 15px;
picture {
margin-right: -25px;
}
div.message {
margin-left: 30px;
}
}
}
.overlay-sidebar #sidebar {
@ -813,7 +799,6 @@ tr.turn:hover {
border-bottom: 1px solid $grey;
h4:first-child {
margin-top: 0;
word-wrap: break-word;
}
}
@ -822,42 +807,13 @@ tr.turn:hover {
border-bottom: none;
}
.paginate {
float: right;
padding: 1px 6px;
border: 1px solid $lightgrey;
border-radius: 3px;
}
.browse-field {
margin-bottom: 10px;
h4 {
padding: 5px 0 5px 10px;
font-size: 12px;
border: 1px solid $grey;
border-radius: 4px 4px 0 0;
background-color: $offwhite;
}
p {
padding: 7px 10px;
font-size: 12px;
background-color: #FFF;
border: 1px solid $grey;
border-top: 0;
border-radius: 0 0 4px 4px;
}
}
.browse-tag-list {
background-color: $offwhite;
border: 1px solid $grey;
border-radius: 3px;
table-layout: fixed;
border-collapse: separate;
border-spacing: 0;
width: 100%;
margin-bottom: $spacer;
th, td {
border-bottom: 1px solid $grey;
@ -904,16 +860,6 @@ tr.turn:hover {
}
}
.comments-header {
float: left;
}
.subscribe-buttons {
float: left;
margin: 18px 10px 10px;
min-width: 80px;
}
.subscribe-buttons input {
font-size: 90%;
line-height: 15px;
@ -966,7 +912,7 @@ tr.turn:hover {
}
.export_area_inputs {
margin-bottom: $lineheight/2;
margin-bottom: $spacer;
input[type="text"] {
width: 100px;
text-align: center;
@ -975,8 +921,6 @@ tr.turn:hover {
.export_boxy {
background: $lightgrey;
border: 1px solid $grey;
border-radius: 3px;
#maxlat { margin-top: -1px; }
#minlon {
@ -1063,6 +1007,7 @@ tr.turn:hover {
background-image: image-url("sign-up-illustration-arm.png");
position: absolute;
z-index: 100;
pointer-events: none;
}
}
@ -1083,7 +1028,6 @@ tr.turn:hover {
.content_map {
height: 200px;
border: 1px solid $grey;
margin-bottom: $lineheight;
}
@ -1093,13 +1037,6 @@ tr.turn:hover {
}
}
/* Rules for the user profile page */
.contact-activity {
margin-top: $lineheight;
width: 100%;
}
/* Rules for the user map */
.content_map .leaflet-popup-content {
@ -1116,30 +1053,12 @@ tr.turn:hover {
margin-top: 0 0 0 60px;
font-size: 12px;
}
img.user_thumbnail {
float: left;
margin: 0 $lineheight/2 0 0;
}
}
/* Rules for the user list */
#user_list {
width: 100%;
tr {
vertical-align: middle;
}
p {
margin-top: 0px;
margin-bottom: 0px;
}
}
#user_list_actions {
float: right;
margin-top: $lineheight/2;
}
/* Rules for the diary list page */
@ -1150,26 +1069,9 @@ tr.turn:hover {
padding-bottom: $lineheight/2;
border-top: 1px solid $grey;
&:first-of-type {
margin-top: $lineheight/2;
}
&.deleted {
background-color: #fee;
}
.post_heading {
margin-bottom: $lineheight;
h2 {
margin-top: 0;
margin-bottom: $lineheight/2;
}
}
img.user_thumbnail {
float: left;
}
}
/* Rules for the diary entry page */
@ -1177,7 +1079,6 @@ tr.turn:hover {
.diary_entries {
#map {
height: 400px;
border: 1px solid $grey;
display: none;
margin-bottom: $lineheight;
}
@ -1206,10 +1107,6 @@ tr.turn:hover {
}
}
.diary_entries-show img.user_thumbnail {
float: left;
}
/* Rules for the log in page */
#login_auth_buttons {
@ -1225,7 +1122,6 @@ tr.turn:hover {
.users-terms {
.legale {
border: 1px solid $grey;
padding: $lineheight;
margin-bottom: $lineheight;
overflow: auto;
@ -1338,8 +1234,6 @@ tr.turn:hover {
/* Rules for "flash" notice boxes shown at the top of the content area */
.flash {
padding: $lineheight;
&.error {
background-color: #ff7070;
}
@ -1423,29 +1317,11 @@ tr.turn:hover {
img.user_image {
max-width: 100px;
max-height: 100px;
border: 1px solid $grey;
margin-bottom: $lineheight;
float: left;
margin-right: $lineheight;
}
img.user_image_no_margins {
max-width: 100px;
max-height: 100px;
border: 1px solid $grey;
}
img.user_thumbnail {
max-width: 50px;
max-height: 50px;
border: 1px solid $grey;
margin-right: $lineheight;
}
img.user_thumbnail_no_margins {
max-width: 50px;
max-height: 50px;
border: 1px solid $grey;
}
img.user_thumbnail_tiny {
@ -1453,7 +1329,6 @@ img.user_thumbnail_tiny {
height: auto;
max-width: 25px;
max-height: 25px;
border: 1px solid $grey;
}
/* Rules for geo microformats */
@ -1611,10 +1486,6 @@ dl.dl-inline {
}
}
.comments .richtext {
margin-left: 70px;
}
/* Rules for the user notes list */
.note_list {
@ -1744,8 +1615,8 @@ dl.dl-inline {
.byosm span {
display: inline-block;
width: 20px;
margin-left: -20px;
width: 1em;
margin-left: -1em;
}
}

3
app/assets/stylesheets/leaflet-all.scss
View file

@ -15,9 +15,6 @@ div.leaflet-marker-icon.location-filter.move-marker {
/* Override some conflicting styles.
https://github.com/openstreetmap/openstreetmap-website/pull/121#issuecomment-10206946 */
.leaflet-popup-content img.user_thumbnail {
max-width: 50px !important;
}
.user_popup p {
margin: 0 !important;

1
app/assets/stylesheets/parameters.scss
View file

@ -15,6 +15,5 @@ $hovercolor: 20%;
$headerHeight: 55px;
$sidebarWidth: 350px;
$keyline: 1px solid $lightgrey;
$border-radius: 3px;
$list-highlight: #FFFFC0;
$border: 1px solid $grey;

4
app/controllers/api/traces_controller.rb
View file

@ -38,7 +38,7 @@ module Api
if trace.user == current_user
trace.visible = false
trace.save!
TraceDestroyerJob.perform_later(trace) if Settings.trace_use_job_queue
TraceDestroyerJob.perform_later(trace)
head :ok
else
@ -79,7 +79,7 @@ module Api
trace = do_create(params[:file], tags, description, visibility)
if trace.id
TraceImporterJob.perform_later(trace) if Settings.trace_use_job_queue
TraceImporterJob.perform_later(trace)
render :plain => trace.id.to_s
elsif trace.valid?
head :internal_server_error

22
app/controllers/application_controller.rb
View file

@ -381,19 +381,23 @@ class ApplicationController < ActionController::Base
# clean any referer parameter
def safe_referer(referer)
referer = URI.parse(referer)
begin
referer = URI.parse(referer)
if referer.scheme == "http" || referer.scheme == "https"
referer.scheme = nil
referer.host = nil
referer.port = nil
elsif referer.scheme || referer.host || referer.port
if referer.scheme == "http" || referer.scheme == "https"
referer.scheme = nil
referer.host = nil
referer.port = nil
elsif referer.scheme || referer.host || referer.port
referer = nil
end
referer = nil if referer&.path&.first != "/"
rescue URI::InvalidURIError
referer = nil
end
referer = nil if referer&.path&.first != "/"
referer.to_s
referer&.to_s
end
def scope_enabled?(scope)

3
app/controllers/browse_controller.rb
View file

@ -5,6 +5,7 @@ class BrowseController < ApplicationController
before_action :set_locale
before_action -> { check_database_readable(:need_api => true) }
before_action :require_oauth
before_action :update_totp, :only => [:query]
around_action :web_timeout
authorize_resource :class => false
@ -88,4 +89,6 @@ class BrowseController < ApplicationController
rescue ActiveRecord::RecordNotFound
render :action => "not_found", :status => :not_found
end
def query; end
end

2
app/controllers/concerns/session_methods.rb
View file

@ -69,7 +69,7 @@ module SessionMethods
def failed_login(message, username = nil)
flash[:error] = message
redirect_to :action => "new", :referer => session[:referer],
redirect_to :controller => "sessions", :action => "new", :referer => session[:referer],
:username => username, :remember_me => session[:remember_me]
session.delete(:remember_me)

2
app/controllers/diary_entries_controller.rb
View file

@ -235,6 +235,8 @@ class DiaryEntriesController < ApplicationController
end
def comments
@title = t ".title", :user => @user.display_name
conditions = { :user_id => @user }
conditions[:visible] = true unless can? :unhidecomment, DiaryEntry

15
app/controllers/errors_controller.rb
View file

@ -4,14 +4,23 @@ class ErrorsController < ApplicationController
skip_authorization_check
def forbidden
render :status => :forbidden
respond_to do |format|
format.html { render :status => :forbidden }
format.any { render :status => :forbidden, :plain => "" }
end
end
def not_found
render :status => :not_found
respond_to do |format|
format.html { render :status => :not_found }
format.any { render :status => :not_found, :plain => "" }
end
end
def internal_server_error
render :status => :internal_server_error
respond_to do |format|
format.html { render :status => :internal_server_error }
format.any { render :status => :internal_server_error, :plain => "" }
end
end
end

16
app/controllers/friendships_controller.rb
View file

@ -28,11 +28,9 @@ class FriendshipsController < ApplicationController
friendship.add_error(t("friendships.make_friend.failed", :name => @new_friend.display_name))
end
if params[:referer]
redirect_to safe_referer(params[:referer])
else
redirect_to user_path
end
referer = safe_referer(params[:referer]) if params[:referer]
redirect_to referer || user_path
end
else
render_unknown_user params[:display_name]
@ -51,11 +49,9 @@ class FriendshipsController < ApplicationController
flash[:error] = t "friendships.remove_friend.not_a_friend", :name => @friend.display_name
end
if params[:referer]
redirect_to safe_referer(params[:referer])
else
redirect_to user_path
end
referer = safe_referer(params[:referer]) if params[:referer]
redirect_to referer || user_path
end
else
render_unknown_user params[:display_name]

6
app/controllers/messages_controller.rb
View file

@ -119,8 +119,10 @@ class MessagesController < ApplicationController
if @message.save && !request.xhr?
flash[:notice] = t ".destroyed"
if params[:referer]
redirect_to safe_referer(params[:referer])
referer = safe_referer(params[:referer]) if params[:referer]
if referer
redirect_to referer
else
redirect_to :action => :inbox
end

8
app/controllers/sessions_controller.rb
View file

@ -34,10 +34,14 @@ class SessionsController < ApplicationController
token&.destroy
session.delete(:token)
end
session.delete(:user)
session_expires_automatically
if params[:referer]
redirect_to safe_referer(params[:referer])
referer = safe_referer(params[:referer]) if params[:referer]
if referer
redirect_to referer
else
redirect_to :controller => "site", :action => "index"
end

4
app/controllers/traces_controller.rb
View file

@ -110,7 +110,7 @@ class TracesController < ApplicationController
flash[:notice] = t ".trace_uploaded"
flash[:warning] = t ".traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4
TraceImporterJob.perform_later(@trace) if Settings.trace_use_job_queue
TraceImporterJob.perform_later(@trace)
redirect_to :action => :index, :display_name => current_user.display_name
else
flash[:error] = t("traces.create.upload_failed") if @trace.valid?
@ -194,7 +194,7 @@ class TracesController < ApplicationController
trace.visible = false
trace.save
flash[:notice] = t ".scheduled_for_deletion"
TraceDestroyerJob.perform_later(trace) if Settings.trace_use_job_queue
TraceDestroyerJob.perform_later(trace)
redirect_to :action => :index, :display_name => trace.user.display_name
end
rescue ActiveRecord::RecordNotFound

34
app/controllers/users_controller.rb
View file

@ -44,11 +44,9 @@ class UsersController < ApplicationController
flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save
if params[:referer]
redirect_to safe_referer(params[:referer])
else
redirect_to user_account_path(current_user)
end
referer = safe_referer(params[:referer]) if params[:referer]
redirect_to referer || user_account_path(current_user)
elsif params[:decline]
redirect_to t("users.terms.declined")
else
@ -64,11 +62,9 @@ class UsersController < ApplicationController
flash[:notice] = t "users.new.terms accepted" if current_user.save
end
if params[:referer]
redirect_to safe_referer(params[:referer])
else
redirect_to user_account_path(current_user)
end
referer = safe_referer(params[:referer]) if params[:referer]
redirect_to referer || user_account_path(current_user)
else
self.current_user = session.delete(:new_user)
@ -335,23 +331,15 @@ class UsersController < ApplicationController
##
# omniauth failure callback
def auth_failure
flash[:error] = t("users.auth_failure.#{params[:message]}")
redirect_to params[:origin] || login_url
flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t("users.auth_failure.unknown_error"))
origin = safe_referer(params[:origin]) if params[:origin]
redirect_to origin || login_url
end
private
##
#
def unconfirmed_login(user)
session[:token] = user.tokens.create.token
redirect_to :action => "confirm", :display_name => user.display_name
session.delete(:remember_me)
session.delete(:referer)
end
##
# update a user's details
def update_user(user, params)

2
app/helpers/application_helper.rb
View file

@ -71,5 +71,7 @@ module ApplicationHelper
else
flash
end
rescue StandardError
flash.inspect if Rails.env.development?
end
end

4
app/helpers/reports_helper.rb
View file

@ -1,6 +1,8 @@
require "ostruct"
module ReportsHelper
Category = Struct.new(:id, :label)
def report_link(name, reportable)
link_to name, new_report_url(:reportable_id => reportable.id, :reportable_type => reportable.class.name)
end
@ -8,7 +10,7 @@ module ReportsHelper
# Convert a list of strings into objects with methods that the collection_radio_buttons helper expects
def report_categories(reportable)
Report.categories_for(reportable).map do |c|
OpenStruct.new(:id => c, :label => t(".categories.#{reportable.class.name.underscore}.#{c}_label"))
Category.new(c, t(".categories.#{reportable.class.name.underscore}.#{c}_label"))
end
end
end

6
app/helpers/user_helper.rb
View file

@ -2,7 +2,7 @@ module UserHelper
# User images
def user_image(user, options = {})
options[:class] ||= "user_image"
options[:class] ||= "user_image border border-grey"
options[:alt] ||= ""
if user.image_use_gravatar
@ -15,7 +15,7 @@ module UserHelper
end
def user_thumbnail(user, options = {})
options[:class] ||= "user_thumbnail"
options[:class] ||= "user_thumbnail border border-grey"
options[:alt] ||= ""
if user.image_use_gravatar
@ -28,7 +28,7 @@ module UserHelper
end
def user_thumbnail_tiny(user, options = {})
options[:class] ||= "user_thumbnail_tiny"
options[:class] ||= "user_thumbnail_tiny border border-grey"
options[:alt] ||= ""
if user.image_use_gravatar

4
app/views/browse/_common_details.html.erb
View file

@ -11,7 +11,7 @@
<% end %>
</p>
<div class="details">
<p class="details">
<%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
:time => time_ago_in_words(common_details.timestamp, :scope => :"datetime.distance_in_words_ago"),
:user => changeset_user_link(common_details.changeset),
@ -19,7 +19,7 @@
&middot;
<%= t "browse.in_changeset" %>
#<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
</div>
</p>
<% if @type == "node" and common_details.visible? %>
<div class="details geo">

19
app/views/browse/_paging_nav.html.erb
View file

@ -1,5 +1,14 @@
<% if pages.page_count > 1 %>
<span class="paginate">
<%= raw pagination_links_each(pages, {}) { |n| link_to(n, page_param => n) } %>
</span>
<% end %>
<div class="row">
<div class="col">
<h4><%= heading %></h4>
</div>
<% if pages.page_count > 1 %>
<div class="col-auto">
<h4>
<span class="border border-lightgrey rounded p-1">
<%= raw pagination_links_each(pages, {}) { |n| link_to(n, page_param => n) } %>
</span>
</h4>
</div>
<% end %>
</div>

2
app/views/browse/_tag_details.html.erb
View file

@ -1,6 +1,6 @@
<% unless tag_details.empty? %>
<h4><%= t ".tags" %></h4>
<table class='browse-tag-list'>
<table class='browse-tag-list border border-grey rounded'>
<%= render :partial => "tag", :collection => tag_details.sort %>
</table>
<% end %>

61
app/views/browse/changeset.html.erb
View file

@ -6,25 +6,29 @@
<p class="font-italic">
<%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
</p>
<div class="details"><%= changeset_details(@changeset) %></div>
<p class="details"><%= changeset_details(@changeset) %></p>
<%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>
<h4 class="comments-header"><%= t(".discussion") %></h4>
<% if current_user %>
<div class="buttons clearfix subscribe-buttons">
<form action="#">
<% if @changeset.subscribers.exists?(current_user.id) %>
<input class="action-button btn btn-sm btn-primary" type="submit" name="unsubscribe" value="<%= t("javascripts.changesets.show.unsubscribe") %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
<% else %>
<input class="action-button btn btn-sm btn-primary" type="submit" name="subscribe" value="<%= t("javascripts.changesets.show.subscribe") %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
<% end %>
</form>
<div class="row">
<div class="col">
<h4><%= t(".discussion") %></h4>
</div>
<% end %>
<div class="clearfix"></div>
<% if current_user %>
<div class="col-auto">
<div class="subscribe-buttons">
<form action="#">
<% if @changeset.subscribers.exists?(current_user.id) %>
<input class="action-button btn btn-sm btn-primary" type="submit" name="unsubscribe" value="<%= t("javascripts.changesets.show.unsubscribe") %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
<% else %>
<input class="action-button btn btn-sm btn-primary" type="submit" name="subscribe" value="<%= t("javascripts.changesets.show.subscribe") %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
<% end %>
</form>
</div>
</div>
<% end %>
</div>
<% if @comments.length > 0 %>
<div class='changeset-comments'>
@ -63,33 +67,30 @@
<% end %>
<% unless current_user %>
<div class="notice">
<p class="notice">
<%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %>
</div>
</p>
<% end %>
<% if current_user %>
<% unless @changeset.is_open? %>
<form action="#">
<form action="#" class="mb-3">
<div class="form-group">
<textarea class="form-control" name="text" cols="40" rows="5"></textarea>
</div>
<div class="buttons clearfix">
<div>
<input type="submit" name="comment" value="<%= t("javascripts.changesets.show.comment") %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" class="btn btn-sm btn-primary" />
</div>
</form>
<% else %>
<div class="notice">
<%= t(".still_open") %>
</div>
<p class="notice">
<%= t(".still_open") %>
</p>
<% end %>
<% end %>
<% unless @ways.empty? %>
<h4>
<%= type_and_paginated_count("way", @way_pages) %>
<%= render :partial => "paging_nav", :locals => { :pages => @way_pages, :page_param => "way_page" } %>
</h4>
<%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("way", @way_pages), :pages => @way_pages, :page_param => "way_page" } %>
<ul class="list-unstyled">
<% @ways.each do |way| %>
<li><%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>
@ -98,10 +99,7 @@
<% end %>
<% unless @relations.empty? %>
<h4>
<%= type_and_paginated_count("relation", @relation_pages) %>
<%= render :partial => "paging_nav", :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
</h4>
<%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("relation", @relation_pages), :pages => @relation_pages, :page_param => "relation_page" } %>
<ul class="list-unstyled">
<% @relations.each do |relation| %>
<li><%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %></li>
@ -110,10 +108,7 @@
<% end %>
<% unless @nodes.empty? %>
<h4>
<%= type_and_paginated_count("node", @node_pages) %>
<%= render :partial => "paging_nav", :locals => { :pages => @node_pages, :page_param => "node_page" } %>
</h4>
<%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("node", @node_pages), :pages => @node_pages, :page_param => "node_page" } %>
<ul class="list-unstyled">
<% @nodes.each do |node| %>
<li><%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %></li>

4
app/views/dashboards/_contact.html.erb
View file

@ -4,9 +4,9 @@
:icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
:description => render(:partial => "popup", :object => contact, :locals => { :type => type })
} %>
<%= tag.div :class => "contact-activity clearfix row", :data => { :user => user_data } do %>
<%= tag.div :class => "clearfix row", :data => { :user => user_data } do %>
<div class="col-auto">
<%= user_thumbnail contact, :class => "user_thumbnail_no_margins" %>
<%= user_thumbnail contact %>
</div>
<div class="col">
<p class='text-muted mb-0'>

12
app/views/dashboards/_popup.html.erb
View file

@ -1,5 +1,9 @@
<div class="user_popup">
<%= user_thumbnail popup %>
<p><%= t(".#{type}") %></p>
<p><%= link_to popup.display_name, user_path(popup) %></p>
<div class="user_popup row no-gutters mx-1">
<div class="col-auto mx-1">
<%= user_thumbnail popup %>
</div>
<div class="col mx-1">
<p><%= t(".#{type}") %></p>
<p><%= link_to popup.display_name, user_path(popup) %></p>
</div>
</div>

8
app/views/dashboards/show.html.erb
View file

@ -6,7 +6,7 @@
<% if current_user and @user.id == current_user.id %>
<div class="col-md order-md-last">
<% if @user.home_lat.nil? or @user.home_lon.nil? %>
<div id="map" class="content_map">
<div id="map" class="content_map border border-grey">
<p class="m-3"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p>
</div>
<% else %>
@ -19,7 +19,7 @@
:icon => image_path("marker-red.png"),
:description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
} %>
<%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
<%= tag.div "", :id => "map", :class => "content_map border border-grey rounded", :data => { :user => user_data } %>
<% end %>
<% friends = @user.friends %>
@ -32,7 +32,7 @@
<% if friends.empty? %>
<%= t ".no friends" %>
<% else %>
<nav class='secondary-actions'>
<nav class='secondary-actions mb-3'>
<ul class='clearfix'>
<li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
<li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
@ -50,7 +50,7 @@
<% if nearby.empty? %>
<%= t ".no nearby users" %>
<% else %>
<nav class='secondary-actions'>
<nav class='secondary-actions mb-3'>
<ul class='clearfix'>
<li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
<li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>

38
app/views/diary_entries/_diary_comment.html.erb
View file

@ -1,19 +1,23 @@
<div class="clearfix diary-comment<%= " text-muted deleted" unless diary_comment.visible? %>">
<%= user_thumbnail diary_comment.user %>
<p class="text-muted comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
<% if current_user and diary_comment.user.id != current_user.id %>
| <%= report_link(t(".report"), diary_comment) %>
<% end %>
</p>
<div class="richtext text-break"><%= diary_comment.body.to_html %></div>
<% if can? :hidecomment, DiaryEntry %>
<span>
<% if diary_comment.visible? %>
<%= link_to t(".hide_link"), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %>
<% else %>
<%= link_to t(".unhide_link"), unhide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %>
<div class="row diary-comment<%= " text-muted deleted" unless diary_comment.visible? %>">
<div class="col-auto">
<%= user_thumbnail diary_comment.user %>
</div>
<div class="col">
<p class="text-muted comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
<% if current_user and diary_comment.user.id != current_user.id %>
| <%= report_link(t(".report"), diary_comment) %>
<% end %>
</span>
<% end %>
</p>
<div class="richtext text-break"><%= diary_comment.body.to_html %></div>
<% if can? :hidecomment, DiaryEntry %>
<span>
<% if diary_comment.visible? %>
<%= link_to t(".hide_link"), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %>
<% else %>
<%= link_to t(".unhide_link"), unhide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %>
<% end %>
</span>
<% end %>
</div>
</div>

17
app/views/diary_entries/_diary_entry.html.erb
View file

@ -1,11 +1,18 @@
<div class='diary_post<%= " text-muted px-3 deleted" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
<div class='post_heading clearfix'>
<% if !@user %>
<%= user_thumbnail diary_entry.user %>
<div class='mb-3'>
<% if @user %>
<h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
<% else %>
<div class="row">
<div class="col-auto">
<%= user_thumbnail diary_entry.user %>
</div>
<div class="col">
<h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
</div>
</div>
<% end %>
<h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
<small class='text-muted'>
<%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %>
<% if (l(diary_entry.updated_at, :format => :blog) != l(diary_entry.created_at, :format => :blog)) %>

2
app/views/diary_entries/_form.html.erb
View file

@ -5,7 +5,7 @@
<fieldset>
<legend><%= t ".location" -%></legend>
<%= tag.div "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
<%= tag.div "", :id => "map", :class => "border border-grey rounded", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
<div class="form-row">
<%= f.text_field :latitude, :wrapper_class => "col-sm-4", :id => "latitude" %>

3
app/views/diary_entries/comments.html.erb
View file

@ -1,5 +1,6 @@
<% content_for :heading do %>
<h1><%= t(".has_commented_on", :display_name => @user.display_name) %></h1>
<h1><%= t ".heading", :user => @user.display_name %></h1>
<p><%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>
<% end %>
<% if @comments.empty? %>

39
app/views/diary_entries/index.html.erb
View file

@ -1,26 +1,31 @@
<% content_for :head, tag(:meta, :name => :robots, :content => :noindex) %>
<% content_for :head, tag.meta(:name => :robots, :content => :noindex) %>
<% content_for :heading do %>
<div <% if @user %> id="userinformation"<% end %>>
<div class="row">
<% if @user %>
<%= user_image @user %>
<div class="col-auto">
<%= user_image @user %>
</div>
<% end %>
<h1><%= @title %></h1>
<nav class="secondary-actions">
<ul class="clearfix">
<% unless params[:friends] or params[:nearby] -%>
<li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
<% end -%>
<div class="col">
<h1><%= @title %></h1>
<% if @user && @user == current_user || !@user && current_user %>
<li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
<% end %>
<nav class="secondary-actions">
<ul class="clearfix">
<% unless params[:friends] or params[:nearby] -%>
<li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
<% end -%>
<% if !@user && current_user %>
<li><%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %></li>
<% end %>
</ul>
</nav>
<% if @user && @user == current_user || !@user && current_user %>
<li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
<% end %>
<% if !@user && current_user %>
<li><%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %></li>
<% end %>
</ul>
</nav>
</div>
</div>
<% end %>

2
app/views/diary_entries/no_such_entry.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h2><%= t ".heading", :id => h(params[:id]) %></h2>
<h1><%= t ".heading", :id => h(params[:id]) %></h1>
<% end %>
<p><%= t ".body", :id => h(params[:id]) %></p>

12
app/views/diary_entries/show.html.erb
View file

@ -1,8 +1,12 @@
<% content_for :heading do %>
<div id="userinformation">
<%= user_image @entry.user %>
<h2><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h2>
<p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
<div class="row">
<div class="col-sm-auto">
<%= user_image @entry.user %>
</div>
<div class="col">
<h1><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h1>
<p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
</div>
</div>
<% end %>

16
app/views/issues/_comments.html.erb
View file

@ -1,14 +1,16 @@
<div>
<% comments.each do |comment| %>
<div class="comment">
<div class="float-left">
<div class="row">
<div class="col-auto">
<%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
</div>
<p class="text-muted mb-0">
<%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
:comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
</p>
<p><%= comment.body %></p>
<div class="col">
<p class="text-muted mb-0">
<%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
:comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
</p>
<p><%= comment.body %></p>
</div>
</div>
<hr>
<% end %>

18
app/views/issues/_reports.html.erb
View file

@ -1,14 +1,16 @@
<% reports.each do |report| %>
<div class="report">
<div class="float-left">
<div class="row">
<div class="col-auto">
<%= link_to user_thumbnail(report.user), user_path(report.user) %>
</div>
<p class="text-muted mb-0">
<%= t ".reported_by_html", :category => report.category,
:user => link_to(report.user.display_name, user_path(report.user)),
:updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>
</p>
<p><%= report.details %></p>
<div class="col">
<p class="text-muted mb-0">
<%= t ".reported_by_html", :category => report.category,
:user => link_to(report.user.display_name, user_path(report.user)),
:updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>
</p>
<p><%= report.details %></p>
</div>
</div>
<hr>
<% end %>

2
app/views/issues/show.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h2><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h2>
<h1><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h1>
<p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
<p class="text-muted">
<small>

6
app/views/layouts/_flash.html.erb
View file

@ -1,5 +1,5 @@
<% if flash[:error] %>
<div class="flash error row align-items-center">
<div class="flash error row mx-0 p-3 align-items-center">
<div class="col-auto">
<picture>
<source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml" />
@ -11,7 +11,7 @@
<% end %>
<% if flash[:warning] %>
<div class="flash warning row align-items-center">
<div class="flash warning row mx-0 p-3 align-items-center">
<div class="col-auto">
<picture>
<source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>
@ -23,7 +23,7 @@
<% end %>
<% if flash[:notice] %>
<div class="flash notice row align-items-center">
<div class="flash notice row mx-0 p-3 align-items-center">
<div class="col-auto">
<picture>
<source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>

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

@ -1,8 +1,6 @@
<%= tag.head :data => application_data do %>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0" />
<%= javascript_include_tag "html5shiv/dist/html5shiv" unless browser.html5? %>
<%= javascript_include_tag "es5" unless browser.es5? %>
<%= javascript_include_tag "es6" unless browser.es6? %>
<%= javascript_include_tag "application" %>
<%= javascript_include_tag "i18n/#{I18n.locale}" %>

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

@ -85,7 +85,7 @@
<% if current_user && current_user.id %>
<div class='d-inline-flex dropdown user-menu logged-in clearfix'>
<a class='dropdown-toggle btn btn-outline-secondary pl-2 py-1 flex-grow-1' data-toggle='dropdown' href="#">
<%= user_thumbnail_tiny(current_user, :width => 25, :height => 25) %>
<%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-sm") %>
<%= render :partial => "layouts/inbox" %>
<span class="user-button">
<span class='username'>

20
app/views/layouts/_meta.html.erb
View file

@ -7,19 +7,19 @@
<%= favicon_link_tag "favicon-96x96.png", :rel => "icon", :sizes => "96x96", :type => "image/png" %>
<%= favicon_link_tag "android-chrome-192x192.png", :rel => "icon", :sizes => "192x192", :type => "image/png" %>
<%= favicon_link_tag "favicon-16x16.png", :rel => "icon", :sizes => "16x16", :type => "image/png" %>
<%= tag("link", :rel => "mask-icon", :href => asset_path("tab-icon.svg"), :color => "#7ebc6f") %>
<%= tag("link", :rel => "manifest", :href => asset_path("manifest.json")) %>
<%= tag("meta", :name => "msapplication-config", :content => asset_path("browserconfig.xml")) %>
<%= tag("meta", :name => "msapplication-TileColor", :content => "#00a300") %>
<%= tag("meta", :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png")) %>
<%= tag("meta", :name => "theme-color", :content => "#ffffff") %>
<%= tag.link :rel => "mask-icon", :href => asset_path("tab-icon.svg"), :color => "#7ebc6f" %>
<%= tag.link :rel => "manifest", :href => asset_path("manifest.json") %>
<%= tag.meta :name => "msapplication-config", :content => asset_path("browserconfig.xml") %>
<%= tag.meta :name => "msapplication-TileColor", :content => "#00a300" %>
<%= tag.meta :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png") %>
<%= tag.meta :name => "theme-color", :content => "#ffffff" %>
<%= canonical_tag %>
<% if Settings.key?(:publisher_url) -%>
<%= tag("link", :rel => "publisher", :href => Settings.publisher_url) %>
<%= tag.link :rel => "publisher", :href => Settings.publisher_url %>
<% end -%>
<%= tag("link", :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml")) %>
<%= tag("meta", :name => "description", :content => "OpenStreetMap is the free wiki world map.") %>
<%= tag.link :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") %>
<%= tag.meta :name => "description", :content => "OpenStreetMap is the free wiki world map." %>
<%= opengraph_tags(@title) %>
<% if flash[:piwik_goal] -%>
<%= tag("meta", :name => "piwik-goal", :content => flash[:piwik_goal]) %>
<%= tag.meta :name => "piwik-goal", :content => flash[:piwik_goal] %>
<% end -%>

2
app/views/messages/new.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h2><%= t(".send_message_to_html", :name => link_to(@message.recipient.display_name, user_path(@message.recipient))) %></h2>
<h1><%= t(".send_message_to_html", :name => link_to(@message.recipient.display_name, user_path(@message.recipient))) %></h1>
<% end %>
<%= bootstrap_form_for @message do |f| %>

2
app/views/messages/show.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h2><%= @message.title %></h2>
<h1><%= @message.title %></h1>
<% end %>
<% if current_user == @message.recipient %>

2
app/views/notes/index.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h2><%= t ".heading", :user => @user.display_name %></h2>
<h1><%= t ".heading", :user => @user.display_name %></h1>
<p><%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>
<% end %>

2
app/views/profiles/edit.html.erb
View file

@ -53,7 +53,7 @@
<input class="form-check-input" type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
<label class="form-check-label" for="updatehome"><%= t ".update home location on click" %></label>
</div>
<%= tag.div "", :id => "map", :class => "content_map set_location" %>
<%= tag.div "", :id => "map", :class => "content_map set_location border border-grey rounded" %>
</fieldset>
<%= f.primary t(".save") %>

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

@ -3,7 +3,7 @@
<div class='row'>
<div class='col-sm-7 user-image'></div>
<div class='col-sm-5 px-5 py-3 byosm'>
<h5 class='text-white text-nowrap'><%= t ".copyright_html", :locale => @locale %></h4>
<h5 class='text-white text-nowrap'><%= t ".copyright_html", :locale => @locale %></h5>
</div>
</div>
<div class='row'>

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

@ -6,7 +6,7 @@
<%= hidden_field_tag "format", "osm", :autocomplete => "off" %>
<div class='export_area_inputs'>
<div class='export_boxy'>
<div class='export_boxy border border-grey rounded'>
<%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control mx-auto") %>
<div class="clearfix">
<%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control") %>

2
app/views/traces/edit.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h2><%= t ".heading", :name => @trace.name %></h2>
<h1><%= t ".heading", :name => @trace.name %></h1>
<% end %>
<img src="<%= url_for :controller => "traces", :action => "picture", :id => @trace.id, :display_name => @trace.user.display_name %>">

2
app/views/traces/offline.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h2><%= t ".heading" %></h2>
<h1><%= t ".heading" %></h1>
<% end %>
<p><%= t ".message" %></p>

2
app/views/traces/show.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h2><%= t ".heading", :name => @trace.name %></h2>
<h1><%= t ".heading", :name => @trace.name %></h1>
<% end %>
<% if Settings.status != "gpx_offline" %>

4
app/views/user_mailer/diary_comment_notification.html.erb
View file

@ -11,8 +11,8 @@
<% content_for :footer do %>
<p><%= t ".footer_html",
:readurl => link_to(@readurl, @readurl) + tag(:br),
:commenturl => link_to(@commenturl, @commenturl) + tag(:br),
:readurl => link_to(@readurl, @readurl) + tag.br,
:commenturl => link_to(@commenturl, @commenturl) + tag.br,
:replyurl => link_to(@replyurl, @replyurl) %>
</p>
<% end %>

2
app/views/user_mailer/message_notification.html.erb
View file

@ -14,7 +14,7 @@
<% content_for :footer do %>
<p>
<%= t ".footer_html",
:readurl => link_to(@readurl, @readurl) + tag(:br),
:readurl => link_to(@readurl, @readurl) + tag.br,
:replyurl => link_to(@replyurl, @replyurl) %>
</p>
<% end %>

6
app/views/users/index.html.erb
View file

@ -35,9 +35,9 @@
<%= render @users %>
</table>
<div id="user_list_actions buttons">
<%= submit_tag t(".confirm"), :name => "confirm" %>
<%= submit_tag t(".hide"), :name => "hide" %>
<div>
<%= submit_tag t(".confirm"), :name => "confirm", :class => "btn btn-primary" %>
<%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-primary" %>
</div>
<% end %>
<% else %>

4
app/views/users/show.html.erb
View file

@ -1,7 +1,7 @@
<% content_for :heading do %>
<div id="userinformation" class="row">
<div class="row">
<div class="col-sm-auto">
<%= user_image @user, :class => "user_image_no_margins" %>
<%= user_image @user %>
</div>
<div class="col">
<h1><%= @user.display_name %> <%= role_icons(@user) %></h1>

2
app/views/users/terms.html.erb
View file

@ -30,7 +30,7 @@
<% end %>
</div>
<div id="contributorTerms" class="legale">
<div id="contributorTerms" class="legale border border-grey rounded">
<%= render :partial => "terms" %>
</div>