diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 17f0e4e7..acd0f91d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3,32 +3,32 @@ module ApplicationHelper @body_class ||= '' @body_class << " #{class_name}" end - + def auth_server_icon_url "http://#{Openneo::Auth.config.auth_server}/favicon.png" end - + def body_class "#{params[:controller]} #{params[:controller]}-#{params[:action]}".tap do |output| output << @body_class if @body_class end end - + def flashes raw(flash.inject('') do |html, pair| key, value = pair html + content_tag('p', value, :class => key) end) end - + def hide_home_link @hide_home_link = true end - + def home_link? !@hide_home_link end - + JAVASCRIPT_LIBRARIES = { :addthis => 'http://s7.addthis.com/js/250/addthis_widget.js#username=openneo', :bitly => 'http://bit.ly/javascript-api.js?version=latest&login=openneo&apiKey=R_4d0438829b7a99860de1d3edf55d8dc8', @@ -37,30 +37,35 @@ module ApplicationHelper :jquery_tmpl => 'http://ajax.microsoft.com/ajax/jquery.templates/beta1/jquery.tmpl.min.js', :swfobject => 'http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js' } - + def include_javascript_libraries(*library_names) raw(library_names.inject('') do |html, name| html + javascript_include_tag(JAVASCRIPT_LIBRARIES[name]) end) end - + def login_path_with_return_to login_path :return_to => request.fullpath end - + def logout_path_with_return_to logout_path :return_to => request.fullpath end - + def origin_tag(value) hidden_field_tag 'origin', value, :id => nil end - + + def show_title_header? + params[:controller] != 'items' + end + def signed_in_meta_tag %().html_safe end - + def title(value) content_for :title, value end end + diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 632679f3..44ee2264 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -14,7 +14,7 @@ %body{:class => body_class} = javascript_include_tag "analytics" #container - - if content_for? :title + - if content_for?(:title) && show_title_header? %h1#title= yield :title = render 'static/announcement.html' = yield :before_flashes