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

Fix display of raw HTML in flash message

Browse source 
Fixes #1095
This commit is contained in:
Tom Hughes 2015-11-30 08:56:26 +00:00
parent 33b5af5c85
commit d218d5bf7d
4 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1820,6 +1820,19 @@ tr.turn:hover {
display: inline-block;
margin-left: $lineheight / 2;
vertical-align: middle;
p {
margin-top: $lineheight * 0.5;
margin-bottom: $lineheight * 0.5;
&:first-child {
margin-top: 0px;
}
&:last-child {
margin-bottom: 0px;
}
}
}
}

2
app/controllers/user_controller.rb
View file

@ -213,7 +213,7 @@ class UserController < ApplicationController
:auth_provider => params[:auth_provider],
:auth_uid => params[:auth_uid])
flash.now[:notice] = t "user.new.auth association"
flash.now[:notice] = render_to_string :partial => "auth_association"
else
check_signup_allowed
end

3
app/views/user/_auth_association.html.erb Normal file
View file

@ -0,0 +1,3 @@
<p><%= t "user.auth_association.heading" %></p>
<p><%= t "user.auth_association.option_1" %></p>
<p><%= t "user.auth_association.option_2" %></p>