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

Merge branch 'master' into notes

Browse source
This commit is contained in:
Tom Hughes 2013-02-02 11:00:46 +00:00
commit 56db9ca2b7
116 changed files with 2059 additions and 1069 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/helpers/application_helper.rb
View file

@ -20,12 +20,12 @@ module ApplicationHelper
def style_rules
css = ""
css << ".hidden { display: none }";
css << ".hide_unless_logged_in { display: none }" unless @user;
css << ".hide_if_logged_in { display: none }" if @user;
css << ".hide_if_user_#{@user.id} { display: none }" if @user;
css << ".show_if_user_#{@user.id} { display: inline }" if @user;
css << ".hide_unless_administrator { display: none }" unless @user and @user.administrator?;
css << ".hidden { display: none !important }";
css << ".hide_unless_logged_in { display: none !important }" unless @user;
css << ".hide_if_logged_in { display: none !important }" if @user;
css << ".hide_if_user_#{@user.id} { display: none !important }" if @user;
css << ".show_if_user_#{@user.id} { display: inline !important }" if @user;
css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator?;
return content_tag(:style, css, :type => "text/css")
end
@ -77,7 +77,7 @@ module ApplicationHelper
content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do
output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format)))
output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview")
output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview richtext")
end
output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do