diff options
| author | Robin Houston <robin@lenny.robin> | 2011-07-18 05:35:38 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-07-18 05:35:38 +0100 |
| commit | 6626e43407b99a413ba660de9bb1401cfc1b3b23 (patch) | |
| tree | 3178eba44dcf4e0cf7cba1fa0c8a3a1ae21f6fa0 | |
| parent | 7b96f465eb908205286b7f6ec004f66145c14f4b (diff) | |
| parent | f0630d1ae02e4bc262c156d61dad0f49c5ae6a2a (diff) | |
Merge branch 'master' into wdtk
| -rw-r--r-- | app/views/general/_before_body_end.rhtml | 2 | ||||
| -rw-r--r-- | app/views/general/_before_head_end.rhtml | 1 | ||||
| -rw-r--r-- | app/views/layouts/default.rhtml | 73 |
3 files changed, 29 insertions, 47 deletions
diff --git a/app/views/general/_before_body_end.rhtml b/app/views/general/_before_body_end.rhtml index 42206b021..25fdf4684 100644 --- a/app/views/general/_before_body_end.rhtml +++ b/app/views/general/_before_body_end.rhtml @@ -1 +1 @@ -<%# This file may be overwritten by a local theme, to add analytics code %> +<%# This file may be overwritten by a local theme to add a site footer, analytics code, etc. %> diff --git a/app/views/general/_before_head_end.rhtml b/app/views/general/_before_head_end.rhtml new file mode 100644 index 000000000..8886745ab --- /dev/null +++ b/app/views/general/_before_head_end.rhtml @@ -0,0 +1 @@ +<%# This file may be overwritten by a local theme to add scripts, Google Analytics code, etc. %> diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 159aa1e62..94ec5a956 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -43,26 +43,7 @@ <meta name="robots" content="noindex, nofollow"> <% end %> -<% # code for popup advert for a campaign etc. -=begin - <script type="text/javascript" src="/javascripts/jquery.js"></script> - <script type="text/javascript" src="/javascripts/jquery.cookie.js"></script> - - <script type="text/javascript"> - - document.write('<style type="text/css">.jshide { display: none; }<'+'/style>'); - $(function(){ - if (!$.cookie('seen_foi2')) { - window.setTimeout(function(){ - $('#everypage').slideDown('slow'); - }, 1000); - } - }); - - </script> -=end -%> - + <%= render :partial => 'general/before_head_end' %> </head> <body> @@ -101,30 +82,30 @@ <% end %> </div> - <div id="topnav"> - <ul id="navigation"> + <div id="topnav"> + <ul id="navigation"> <li><%= link_to _("Make request"), frontpage_url %></li> - <li><%= link_to _("View requests"), request_list_successful_url %></li> - <li><%= link_to _("View authorities"), list_public_bodies_default %></li> - <% if @user %> - <li><%=link_to _("My requests"), user_url(@user) %></li> - <% end %> - <li><%= link_to _("Read blog"), blog_url %></li> - <li><%= link_to _("Help"), help_about_url %></li> - </ul> - <% if not (controller.action_name == 'signin' or controller.action_name == 'signup') %> - <div id="logged_in_bar"> - <% if @user %> - <%= _('Hello, {{username}}!', :username => h(@user.name))%> - (<%= link_to _("Sign out"), signout_url(:r => request.request_uri) %>) - <% else %> - <%= _('Hello!') %> - (<%= link_to _("Sign in or sign up"), signin_url(:r => request.request_uri) %>) - <% end %> - </div> - <% end %> - </div> - + <li><%= link_to _("View requests"), request_list_successful_url %></li> + <li><%= link_to _("View authorities"), list_public_bodies_default %></li> + <% if @user %> + <li><%=link_to _("My requests"), user_url(@user) %></li> + <% end %> + <li><%= link_to _("Read blog"), blog_url %></li> + <li><%= link_to _("Help"), help_about_url %></li> + </ul> + <% if not (controller.action_name == 'signin' or controller.action_name == 'signup') %> + <div id="logged_in_bar"> + <% if @user %> + <%= _('Hello, {{username}}!', :username => h(@user.name))%> + (<%= link_to _("Sign out"), signout_url(:r => request.request_uri) %>) + <% else %> + <%= _('Hello!') %> + (<%= link_to _("Sign in or sign up"), signin_url(:r => request.request_uri) %>) + <% end %> + </div> + <% end %> + </div> + <div id="wrapper"> <div id="content"> @@ -144,11 +125,11 @@ <div id="footer"> <%= link_to _("Contact {{site_name}}", :site_name => site_name), help_contact_url %> - <%= render :partial => 'general/credits' %> + <%= render :partial => 'general/credits' %> </div> - <div class="after-footer"> </div> + <div class="after-footer"> </div> - <%= render :partial => 'general/before_body_end' %> + <%= render :partial => 'general/before_body_end' %> </div> </body> </html> |