Home button should targeted on root page of context

diff --git a/app/views/layouts/_app_menu.html.haml b/app/views/layouts/_app_menu.html.haml
index 50b5c92..b8874ab 100644 (file)
--- a/app/views/layouts/_app_menu.html.haml
+++ b/app/views/layouts/_app_menu.html.haml
@@ -1,5 +1,5 @@
 %nav.main_menu
-  = render "layouts/const_menu_links"
+  = link_to "Home", root_path, :class => "home #{"current" if current_page?(projects_path) || current_page?(root_path)}", :title => "Home"
   = link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do 
     Issues
     %span.count= current_user.assigned_issues.opened.count

diff --git a/app/views/layouts/_const_menu_links.html.haml b/app/views/layouts/_const_menu_links.html.haml
deleted file mode 100644 (file)
index c0b971c..0000000
--- a/app/views/layouts/_const_menu_links.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= link_to "Home", root_path, :class => "home #{"current" if current_page?(projects_path) || current_page?(root_path)}", :title => "Home"

diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index cbe5099..3debf5c 100644 (file)
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -2,7 +2,7 @@
   %meta{:charset => "utf-8"}
   %title
     GitLab
-    = " - #{@project.name}" if @project && !@project.new_record?
+    = " > #{@project.name}" if @project && !@project.new_record?
   = favicon_link_tag 'favicon.ico'
   = stylesheet_link_tag    "application"
   = javascript_include_tag "application"

diff --git a/app/views/layouts/_project_menu.html.haml b/app/views/layouts/_project_menu.html.haml
index 34987e4..953a979 100644 (file)
--- a/app/views/layouts/_project_menu.html.haml
+++ b/app/views/layouts/_project_menu.html.haml
@@ -1,8 +1,5 @@
 %nav.main_menu
-  = render "layouts/const_menu_links"
-  = link_to project_path(@project), :class => "#{project_tab_class}", :title => "Project" do 
-    Project
-
+  = link_to @project.code, project_path(@project), :class => "home #{project_tab_class}", :title => "Project"
   - if @project.repo_exists?
     - if can? current_user, :download_code, @project
       = link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class

diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 2d5387c..e48903a 100644 (file)
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -6,8 +6,7 @@
     = render "layouts/head_panel", :title => "Admin area"
     .container
       %nav.main_menu
-        = render "layouts/const_menu_links"
-        = link_to "Stats", admin_root_path, :class => controller.controller_name == "dashboard" ? "current" : nil
+        = link_to "Stats", admin_root_path, :class => "home #{controller.controller_name == "dashboard" ? "current" : nil}"
         = link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil
         = link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil
         = link_to "Emails", admin_emails_path, :class => controller.controller_name == "mailer" ? "current" : nil

diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 52fa56f..943dbe7 100644 (file)
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -5,7 +5,6 @@
     = render "layouts/flash"
     = render "layouts/head_panel", :title => ""
     .container
-      %nav.main_menu
-        = render "layouts/const_menu_links"
       .content
+        %br
         %h3= yield

diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index 96f9615..571612e 100644 (file)
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -6,8 +6,7 @@
     = render "layouts/head_panel", :title => "Profile"
     .container
       %nav.main_menu
-        = render "layouts/const_menu_links"
-        = link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
+        = link_to "Profile", profile_path, :class => "home #{current_page?(:controller => "profile", :action => :show) ? "current" : nil}"
         = link_to "Password & token", profile_password_path,  :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
         = link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil
         = link_to keys_path,  :class => controller.controller_name == "keys" ? "current" : nil do