diff options
Diffstat (limited to 'app/views/layouts/default.rhtml')
| -rw-r--r-- | app/views/layouts/default.rhtml | 87 |
1 files changed, 40 insertions, 47 deletions
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 94ec5a956..98f6a55a7 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -18,7 +18,9 @@ <link rel="shortcut icon" href="/favicon.ico"> - <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %> + <%= stylesheet_link_tag 'theme', :rel => "stylesheet" %> <!--[if LT IE 7]> <style type="text/css">@import url("/stylesheets/ie6.css");</style> <![endif]--> @@ -57,55 +59,46 @@ =end %> <div class="entirebody"> - <div id="banner"></div> - <div id="header"> - <h1> - <%= link_to site_name, frontpage_url %> - </h1> - - <div id="tagline"> - <%= _('Make and explore Freedom of Information requests') %> - </div> - - </div> - <div id="orglogo"> - <%= render :partial => 'general/orglink' %> - </div> - <div class="lang"><%= render :partial => 'general/locale_switcher' %></div> - - <div id="navigation_search"> - <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "navigation_search_form"}) do %> - <p> - <%= text_field_tag 'query', params[:query], { :size => 40, :id => "navigation_search_query" } %> - <%= submit_tag _("Search") %> - </p> - <% end %> - - </div> - <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> + <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))%> - (<%= 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) %>) + <div id="logged_in_bar"> + <% if @user %> + <%= _('Hello, {{username}}!', :username => h(@user.name))%> + <%= link_to _("Sign out"), signout_url(:r => request.request_uri) %> + <% else %> + <%= link_to _("Sign in or sign up"), signin_url(:r => request.request_uri) %> + <% end %> + </div> + <% end %> + + <div id="navigation_search"> + <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "navigation_search_form"}) do %> + <p> + <%= text_field_tag 'query', params[:query], { :size => 40, :id => "navigation_search_query" } %> + <%= image_submit_tag('search-button.png') %> + </p> <% end %> - </div> - <% end %> + </div> + + <%= link_to image_tag('logo.png'), frontpage_url, :id=>'logo' %> + + <div id="topnav"> + <ul id="navigation"> + <li class="<%= 'selected' if params[:controller] == 'general' %>"><%= link_to _("Make a request"), frontpage_url %></li> + <li class="<%= 'selected' if params[:controller] == 'request' %>"><%= link_to _("View requests"), request_list_successful_url %></li> + <li class="<%= 'selected' if params[:controller] == 'public_body' %>"><%= link_to _("View authorities"), list_public_bodies_default %></li> + <% if @user %> + <li><%=link_to _("My requests"), user_url(@user) %></li> + <% end %> + <li class="<%= 'selected' if params[:controller] == 'blog' %>"><%= link_to _("Read blog"), blog_url %></li> + <li class="<%= 'selected' if params[:controller] == 'help' %>"><%= link_to _("Help"), help_about_url %></li> + </ul> + </div> + </div> </div> - <div id="wrapper"> <div id="content"> |