Titled dashboard, admin, profile areas. Wider top panel. Restored search input

app/assets/stylesheets/common.scss

@@ -97,7 +97,7 @@ $blue_link: "#2fa0bb";
   min-width:$min_app_width;
   max-width:$max_app_width;
   margin:auto;
-  margin-top:52px;
+  margin-top:62px;
 }
 
 .container-fluid > .sidebar { 

app/assets/stylesheets/top_panel.scss

@@ -11,24 +11,25 @@ body header {
   -moz-box-shadow: 0 -1px 0 white inset;
   -webkit-box-shadow: 0 -1px 0 white inset;
 
-  height:50px;
+  height:60px;
 
   .wrapper { 
     margin:auto;
     min-width:$min_app_width;
     max-width:$max_app_width;
     position:relative;
-    padding:10px $app_padding;
+    padding:15px $app_padding;
   }
 
   .project_name {
     float:left;
     width:400px;
+    margin:0;
     margin-right:30px;
-    font-size:16px;
+    font-size:20px;
+    line-height:28px;
     font-weight:bold;
-    padding:8px;
+    color:#666;
-    color:#333;
     text-shadow: 0 1px 1px #FFF;
   }
 
@@ -118,7 +119,7 @@ body header {
 header .account-box{ 
   position: absolute; 
   right: 0; 
-  top: 8px;
+  top: 13px;
   z-index: 10000;
   width: 128px;
   font-size: 11px;

app/helpers/application_helper.rb

@@ -71,11 +71,11 @@ module ApplicationHelper
 
     if @project && !@project.new_record?
       project_nav = [
-        { :label => "#{@project.code} / Issues", :url => project_issues_path(@project) },
+        { :label => "#{@project.name} / Issues", :url => project_issues_path(@project) },
-        { :label => "#{@project.code} / Wall", :url => wall_project_path(@project) },
+        { :label => "#{@project.name} / Wall", :url => wall_project_path(@project) },
-        { :label => "#{@project.code} / Tree", :url => tree_project_ref_path(@project, @project.root_ref) },
+        { :label => "#{@project.name} / Tree", :url => tree_project_ref_path(@project, @project.root_ref) },
-        { :label => "#{@project.code} / Commits", :url => project_commits_path(@project) },
+        { :label => "#{@project.name} / Commits", :url => project_commits_path(@project) },
-        { :label => "#{@project.code} / Team", :url => team_project_path(@project) }
+        { :label => "#{@project.name} / Team", :url => team_project_path(@project) }
       ]
     end
 
@@ -83,11 +83,15 @@ module ApplicationHelper
   end
 
   def project_layout
-    @project && !@project.new_record?
+    layout == "project"
+  end
+
+  def admin_layout
+    layout == "admin"
   end
 
   def profile_layout
-    controller.controller_name == "dashboard" || current_page?(projects_path) || controller.controller_name == "profile" || controller.controller_name == "keys"
+    layout == "profile"
   end
 
   def help_layout
@@ -97,4 +101,8 @@ module ApplicationHelper
   def ldap_enable?
     Devise.omniauth_providers.include?(:ldap)
   end
+
+  def layout 
+    controller.send :_layout
+  end
 end

app/views/layouts/_head_panel.html.haml

@@ -6,9 +6,8 @@
         = link_to root_path, :class => "home", :title => "Home" do 
           = image_tag "logo.png", :width => 100
 
-      - if project_layout
+      %h1.project_name= title
-        .project_name
+      .search= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input xlarge"
-          = truncate @project.name, :length => 35
 
 
       .account-box
@@ -18,3 +17,20 @@
           = link_to profile_path, :class => "username" do
             My profile
           = link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete
+
+:javascript
+  $(function(){
+    $("#search").autocomplete({
+      source: #{raw search_autocomplete_source},
+      select: function(event, ui) { location.href = ui.item.url }
+    });
+
+    $(document).keypress(function(e) {
+      if( $(e.target).is(":input") ) return;
+        switch(e.which)  {
+        case 115:  focusSearch();
+        e.preventDefault();
+      }
+    });
+  });
+

app/views/layouts/admin.html.haml

@@ -2,8 +2,8 @@
 %html{ :lang => "en"}
   = render "layouts/head"
   %body.admin
-    = render :partial => "layouts/flash"
+    = render "layouts/flash"
-    = render :partial => "layouts/head_panel"
+    = render "layouts/head_panel", :title => "Admin area"
     .container-fluid
       .sidebar
         .fixed

app/views/layouts/application.html.haml

@@ -2,8 +2,8 @@
 %html{ :lang => "en"}
   = render "layouts/head"
   %body.application
-    = render :partial => "layouts/flash"
+    = render "layouts/flash"
-    = render :partial => "layouts/head_panel"
+    = render "layouts/head_panel", :title => "Dashboard"
     .container-fluid
       .sidebar
         = render :partial => "layouts/app_side"

app/views/layouts/profile.html.haml

@@ -2,8 +2,8 @@
 %html{ :lang => "en"}
   = render "layouts/head"
   %body.profile
-    = render :partial => "layouts/flash"
+    = render "layouts/flash"
-    = render :partial => "layouts/head_panel"
+    = render "layouts/head_panel", :title => "Profile"
     .container-fluid
       .sidebar
         %aside

app/views/layouts/project.html.haml

@@ -2,8 +2,8 @@
 %html{ :lang => "en"}
   = render "layouts/head"
   %body.project
-    = render :partial => "layouts/flash"
+    = render "layouts/flash"
-    = render :partial => "layouts/head_panel"
+    = render "layouts/head_panel", :title => @project.name
     .container-fluid
       .sidebar= render :partial => "layouts/project_side"
       .content