diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/general_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/application_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/admin_general/_admin_navbar.rhtml | 1 | ||||
| -rw-r--r-- | app/views/layouts/default.rhtml | 13 |
4 files changed, 16 insertions, 4 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 6e89a2832..839064fcd 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -21,7 +21,7 @@ class GeneralController < ApplicationController # New, improved front page! def frontpage medium_cache - behavior_cache do + behavior_cache :tag => [session[:user_id], request.url] do # get some example searches and public bodies to display # either from config, or based on a (slow!) query if not set body_short_names = MySociety::Config.get('FRONTPAGE_PUBLICBODY_EXAMPLES', '').split(/\s*;\s*/).map{|s| "'%s'" % s.gsub(/'/, "''") }.join(", ") diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cb6615199..278df5a3b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -132,5 +132,9 @@ module ApplicationHelper return "#{exact_date} (#{ago_text})" end + def is_admin? + return !session[:using_admin].nil? || (!@user.nil? && @user.admin_level == "super") + end + end diff --git a/app/views/admin_general/_admin_navbar.rhtml b/app/views/admin_general/_admin_navbar.rhtml new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/app/views/admin_general/_admin_navbar.rhtml @@ -0,0 +1 @@ + diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index ed0a52e85..5c3499c93 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -16,6 +16,10 @@ <% if !params[:print_stylesheet].nil? %> <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "all" %> <% end %> + + <% if is_admin? %> + <%= stylesheet_link_tag "/adminbootstraptheme/stylesheets/admin", :title => "Main", :rel => "stylesheet" %> + <% end %> <%= javascript_include_tag 'jquery.js', 'jquery-ui.min','jquery.cookie.js', 'general.js' %> <% if @profile_photo_javascript %> @@ -58,8 +62,7 @@ <%= render :partial => 'general/before_head_end' %> </head> - <body class="<%= 'admin' if !session[:using_admin].nil?%> <%= 'front' if params[:action] == 'frontpage' %>"> - + <body class="<%= 'admin' if is_admin? %> <%= 'front' if params[:action] == 'frontpage' %>"> <!-- XXX: move to a separate file --> <% if force_registration_on_new_request && !@user %> <%= javascript_include_tag 'jquery.fancybox-1.3.4.pack' %> @@ -81,7 +84,11 @@ }); </script> <% end %> - + +<% if session[:using_admin] %> + <%= render :partial => 'admin_general/admin_navbar' %> +<% end %> + <% # code for popup advert for a campaign etc. =begin <div id="everypage" class="jshide"> |