diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-09-17 16:16:03 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-09-17 16:16:03 +0100 |
commit | a09c336e5719315afdd3822dcdfdc2f8112b80ab (patch) | |
tree | 15a26d62eaed1be8ebbd9b8003da0a9c36d922d1 | |
parent | 9d17c9ba8a7f09bc9c1b64cd8c369927f6924247 (diff) |
Using custom layout to override favicon.ico
-rw-r--r-- | lib/views/layouts/default.html.erb | 157 | ||||
-rw-r--r-- | public/images/favicon.ico | bin | 0 -> 1150 bytes |
2 files changed, 157 insertions, 0 deletions
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 @@ +<!DOCTYPE html> +<html lang="<%= I18n.locale %>"> + <head> + <meta charset="utf-8"> + <title> + <% if @title %> + <%=@title%> - <%= site_name %> + <% else %> + <%= site_name %> - <%= _('Make and browse Freedom of Information (FOI) requests') %> + <% end %> + </title> + + <link rel="shortcut icon" href="/alavetelitheme/images/favicon.ico"> + + <%= 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 %> + <script type="text/javascript" src="/javascripts/jquery.Jcrop.js"></script> + <script type="text/javascript" src="/javascripts/profile_photo.js"></script> + <link rel="stylesheet" href="/stylesheets/jquery.Jcrop.css" type="text/css" > + <% end %> + + <% if @feed_autodetect %> + <% for feed in @feed_autodetect %> + <link rel="alternate" type="application/atom+xml" title="<%=h feed[:title] %>" href="<%=h feed[:url]%>"> + <% if feed[:has_json] %> + <link rel="alternate" type="application/json" title="JSON version of <%=h feed[:title] %>" href="<%=h feed[:url]%>.json"> + <% end %> + <% end %> + <% end %> + <% if @has_json %> + <link rel="alternate" type="application/json" title="JSON version of this page" href="<%=h url_for(request.params.merge(:format => 'json')) %>"> + <% end %> + + <% if @no_crawl %> + <meta name="robots" content="noindex, nofollow"> + <% end %> + + <%= render :partial => 'general/before_head_end' %> + </head> + <body class="<%= 'front' if params[:action] == 'frontpage' %>"> + <% if AlaveteliConfiguration::force_registration_on_new_request && !@user %> + <%= javascript_include_tag 'jquery.fancybox-1.3.4.pack' %> + <script type="text/javascript"> + $(document).ready(function() { + $("#make-request-link").fancybox({ + 'modal': false, + 'width': 920, + 'height': 400, + 'type': 'iframe', + 'href': '/<%= FastGettext.locale %>/profile/sign_in?modal=1', + 'onClosed': function() { + // modal_signin_successful variable set by modal dialog box + if (typeof modal_signin_successful != 'undefined' ) { + window.location.href = '<%= select_authority_url %>'; + } + } + }); + }); + </script> + <% end %> + +<% if is_admin? %> + <%= render :partial => 'admin_general/admin_navbar' %> +<% end %> +<% popup_banner = render(:partial => "general/popup_banner").strip %> +<% if popup_banner.present? %> +<div id="everypage" class="jshide"> + <p class="popup-close"><a href="#top" onclick="$.cookie('seen_foi2', 1, { expires: 7, path: '/' }); $('#everypage').hide('slow'); return false;"><%= _('Close') %></a></p> + <%= raw popup_banner %> + <p class="popup-close"><a href="#top" onclick="$.cookie('seen_foi2', 1, { expires: 7, path: '/' }); $('#everypage').hide('slow'); return false;"><%= _('Close') %></a></p> +</div> +<% end %> + +<div class="entirebody"> + <div id="banner"> + <div id="banner_inner"> + <div class="lang"><%= render :partial => 'general/locale_switcher' %></div> + + <% if not (controller.action_name == 'signin' or controller.action_name == 'signup') %> + <div id="logged_in_bar"> + <% 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 %> + </div> + <% end %> + + <div id="navigation_search"> + <form id="navigation_search_form" method="post" action="<%= search_redirect_path %>"> + <p> + <%= text_field_tag 'query', params[:query], { :size => 40, :id => "navigation_search_query", :title => "type your search term here" } %> + <input id="navigation_search_button" type="submit" value="search"> + </p> + </form> + </div> + + <%= render :partial => 'general/orglink' %> + + <%= render :partial => 'general/topnav' %> + </div> + </div> + <div id="wrapper"> + <div id="content"> + <% if flash[:notice] %> + <div id="notice"><%= flash[:notice] %></div> + <% end %> + <% if flash[:error] %> + <div id="error"><%= flash[:error] %></div> + <% end %> + + <div id="<%= controller.controller_name + "_" + controller.action_name %>" class="controller_<%= controller.controller_name %>"> + <%= yield :layout %> + </div> + <div style="clear:both"></div> + </div> + </div> + + <%= render :partial => 'general/footer' %> + +</div> +<div id="other-country-notice"></div> +<div id="link_box"><span class="close-button">X</span> +<%= _("Paste this link into emails, tweets, and anywhere else:") %> +<br /> +<input type="text"> +</div> + <% + unless AlaveteliConfiguration::ga_code.empty? || (@user && @user.super?) %> + <script type="text/javascript"> + var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); + document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); + </script> + <script type="text/javascript"> + var pageTracker = _gat._getTracker("<%= AlaveteliConfiguration::ga_code %>"); + pageTracker._trackPageview(); + </script> + + <% end %> + + <%= render :partial => 'general/before_body_end' %> + </body> +</html> diff --git a/public/images/favicon.ico b/public/images/favicon.ico Binary files differnew file mode 100644 index 0000000..df5c8f9 --- /dev/null +++ b/public/images/favicon.ico |