6 files changed, 51 insertions, 11 deletions
diff --git a/app/views/general/_footer.html.erb b/app/views/general/_footer.html.erb
index 990093694..2e10a0f94 100644
--- a/app/views/general/_footer.html.erb
+++ b/app/views/general/_footer.html.erb
@@ -1,6 +1,8 @@
 <div id="footer">
     <%= link_to _("Contact {{site_name}}", :site_name => site_name), help_contact_path %>
-| <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="https://twitter.com/<%= AlaveteliConfiguration::twitter_username %>"><%= _("Follow us on twitter") %></a>
+<% unless AlaveteliConfiguration::twitter_username.blank? %>
+| <%= image_tag "twitter-16.png", :alt => "twitter icon", :class => "twitter-icon" %> <a href="https://twitter.com/<%= AlaveteliConfiguration::twitter_username %>"><%= _("Follow us on twitter") %></a>
+<% end %>
 <%= render :partial => 'general/credits' %>
 </div>
 <div class="after-footer">&nbsp;</div>
diff --git a/app/views/general/_frontpage_requests_list.html.erb b/app/views/general/_frontpage_requests_list.html.erb
index 41a875cab..d7d9184c4 100644
--- a/app/views/general/_frontpage_requests_list.html.erb
+++ b/app/views/general/_frontpage_requests_list.html.erb
@@ -22,7 +22,7 @@
 
            <%=link_to h(event.info_request.title), request_path(event.info_request)%>
            <%= _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(event.described_at)) %>
-           <p class="excerpt" onclick="document.location.href='<%=request_path(event.info_request)%>'"><%= excerpt(event.search_text_main(true), "", 200) %></p>
+           <p class="excerpt" onclick="document.location.href='<%=request_path(event.info_request)%>'"><%= excerpt(event.search_text_main(true), "", :radius => 200) %></p>
         </li>
       <% end %>
     </ul>
diff --git a/app/views/general/_header.html.erb b/app/views/general/_header.html.erb
new file mode 100644
index 000000000..55bf719e2
--- /dev/null
+++ b/app/views/general/_header.html.erb
@@ -0,0 +1,37 @@
+<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>
diff --git a/app/views/general/_stylesheet_includes.html.erb b/app/views/general/_stylesheet_includes.html.erb
index 416ddb825..7a1648efd 100644
--- a/app/views/general/_stylesheet_includes.html.erb
+++ b/app/views/general/_stylesheet_includes.html.erb
@@ -1,23 +1,22 @@
 <%- if @render_to_file %>
   <style>
-  <%= raw File.read(Rails.root.join('public', 'stylesheets', 'main.css')) %>
-  <%= raw File.read(Rails.root.join('public', 'stylesheets', 'print.css')) %>
+  <%= Rails.application.assets["main.css"].to_s %>
+  <%= Rails.application.assets["print.css"].to_s %>
   </style>
 <%- else %>
-  <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet", :media => "all" %>
+  <%= stylesheet_link_tag 'application', :title => "Main", :rel => "stylesheet", :media => "all" %>
   <%= stylesheet_link_tag 'fonts', :rel => "stylesheet", :media => "all"  %>
   <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "print"  %>
   <% if !params[:print_stylesheet].nil? %>
   <%= stylesheet_link_tag 'print', :rel => "stylesheet", :media => "all"  %>
   <% end %>
-  <%= stylesheet_link_tag 'admin-theme/jquery-ui-1.8.15.custom.css', :rel => 'stylesheet'%>
   <!--[if LT IE 7]>
-  <style type="text/css">@import url("/stylesheets/ie6.css");</style>
+  <%= stylesheet_link_tag 'ie6.css' %>
   <![endif]-->
   <!--[if LT IE 8]>
-  <style type="text/css">@import url("/stylesheets/ie7.css");</style>
+  <%= stylesheet_link_tag 'ie7.css' %>
   <![endif]-->
   <% if AlaveteliConfiguration::force_registration_on_new_request %>
-  <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet"  %>
+  <%= stylesheet_link_tag 'jquery.fancybox-1.3.4.css', :rel => "stylesheet"  %>
   <% end %>
 <% end %>
diff --git a/app/views/general/_topnav.html.erb b/app/views/general/_topnav.html.erb
index c7f2cedea..d37bd97d1 100644
--- a/app/views/general/_topnav.html.erb
+++ b/app/views/general/_topnav.html.erb
@@ -4,7 +4,9 @@
         <li class="<%= 'selected' if params[:controller] == 'request' and ['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("Make a request"), select_authority_path, :id => 'make-request-link' %></li>
         <li class="<%= 'selected' if params[:controller] == 'request' and !['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("View requests"), request_list_successful_path %></li>
         <li class="<%= 'selected' if params[:controller] == 'public_body' %>"><%= link_to _("View authorities"), list_public_bodies_default_path %></li>
+<% unless AlaveteliConfiguration::blog_feed.empty? %>
         <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] == 'blog' %>"><%= link_to _("Read blog"), blog_path %></li>
+<% end %>
         <li class="<%= 'selected' if params[:controller] == 'help' %>"><%= link_to _("Help"), help_about_path %></li>
     </ul>
 </div>
diff --git a/app/views/general/blog.html.erb b/app/views/general/blog.html.erb
index ef587421e..b81989ca8 100644
--- a/app/views/general/blog.html.erb
+++ b/app/views/general/blog.html.erb
@@ -4,8 +4,8 @@
 <div id="right_column">
   <div class="act_link">
     <h2><%= _("Stay up to date") %></h2>
-    <img src="/images/twitter-16.png" alt="twitter icon"  class="twitter-icon"> <a href="https://twitter.com/<%= @twitter_user %>"><%= _("Follow us on twitter") %></a><br/><br/>
-    <img src="/images/feed-16.png" alt="RSS icon"> <a href="<%= @feed_url %>"><%= _("Subscribe to blog") %></a>
+    <%= image_tag "twitter-16.png", :alt => "twitter icon", :class => "twitter-icon" %> <a href="https://twitter.com/<%= @twitter_user %>"><%= _("Follow us on twitter") %></a><br/><br/>
+    <%= image_tag "feed-16.png", :alt => "RSS icon" %> <a href="<%= @feed_url %>"><%= _("Subscribe to blog") %></a>
   </div>
   <% if AlaveteliConfiguration::twitter_widget_id %>
   <div id="twitter">