+ <% if @title %> + <%=@title%> - <%= site_name %> + <% else %> + <%= site_name %> - <%= _('Make and browse Freedom of Information (FOI) requests') %> + <% end %> +

From a09c336e5719315afdd3822dcdfdc2f8112b80ab Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 17 Sep 2013 16:16:03 +0100 Subject: Using custom layout to override favicon.ico --- lib/views/layouts/default.html.erb | 157 +++++++++++++++++++++++++++++++++++++ public/images/favicon.ico | Bin 0 -> 1150 bytes 2 files changed, 157 insertions(+) create mode 100644 lib/views/layouts/default.html.erb create mode 100644 public/images/favicon.ico diff --git a/lib/views/layouts/default.html.erb b/lib/views/layouts/default.html.erb new file mode 100644 index 0000000..3b5a233 --- /dev/null +++ b/lib/views/layouts/default.html.erb @@ -0,0 +1,157 @@ + + + + + + <% if @title %> + <%=@title%> - <%= site_name %> + <% else %> + <%= site_name %> - <%= _('Make and browse Freedom of Information (FOI) requests') %> + <% end %> + + + + + <%= render :partial => 'general/stylesheet_includes' %> + <% if is_admin? %> + <%= stylesheet_link_tag "/admin/stylesheets/admin", :title => "Main", :rel => "stylesheet" %> + <% end %> + + <%= javascript_include_tag 'jquery.js', 'jquery-ui.min','jquery.cookie.js', 'general.js' %> + <% if @profile_photo_javascript %> + + + + <% end %> + + <% if @feed_autodetect %> + <% for feed in @feed_autodetect %> + + <% if feed[:has_json] %> + + <% end %> + <% end %> + <% end %> + <% if @has_json %> + + <% end %> + + <% if @no_crawl %> + + <% end %> + + <%= render :partial => 'general/before_head_end' %> + + + <% if AlaveteliConfiguration::force_registration_on_new_request && !@user %> + <%= javascript_include_tag 'jquery.fancybox-1.3.4.pack' %> + + <% end %> + +<% if is_admin? %> + <%= render :partial => 'admin_general/admin_navbar' %> +<% end %> +<% popup_banner = render(:partial => "general/popup_banner").strip %> +<% if popup_banner.present? %> +

+ + <%= raw popup_banner %> + +

+<% end %> + +

<%= render :partial => 'general/locale_switcher' %>

+ + <% if not (controller.action_name == 'signin' or controller.action_name == 'signup') %> +

+ <% if @user %> + <%= _('Hello, {{username}}!', :username => h(@user.name))%> + + <% if @user %> + <%=link_to _("My requests"), show_user_requests_path(:url_name => @user.url_name) %> + <%=link_to _("My profile"), show_user_profile_path(:url_name => @user.url_name) %> + <%=link_to _("My wall"), show_user_wall_path(:url_name => @user.url_name) %> + <% end %> + + + <%= link_to _("Sign out"), signout_path(:r => request.fullpath) %> + <% else %> + <%= link_to _("Sign in or sign up"), signin_path(:r => request.fullpath) %> + <% end %> +

+ <% end %> + +

+ +

+ + <%= render :partial => 'general/orglink' %> + + <%= render :partial => 'general/topnav' %> +

+ <% if flash[:notice] %> +

<%= flash[:notice] %>

+ <% end %> + <% if flash[:error] %> +

<%= flash[:error] %>

+ <% end %> + +

" class="controller_<%= controller.controller_name %>"> + <%= yield :layout %> +

+ + <%= render :partial => 'general/footer' %> + +

+ + <% + unless AlaveteliConfiguration::ga_code.empty? || (@user && @user.super?) %> + + + + <% end %> + + <%= render :partial => 'general/before_body_end' %> + + diff --git a/public/images/favicon.ico b/public/images/favicon.ico new file mode 100644 index 0000000..df5c8f9 Binary files /dev/null and b/public/images/favicon.ico differ -- cgit v1.2.3