Refactored navigation

app/views/layouts/_app_menu.html.haml

@@ -1,11 +1,19 @@
-%nav.main_menu
-  = link_to "Home", root_path, :class => "home #{"current" if current_page?(dashboard_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
-  = link_to dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" do
-    Requests
-    %span.count= current_user.cared_merge_requests.count
-  = link_to search_path, :class => "#{"current" if current_page?(search_path)}" do
-    Search
-  = link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}"
+%ul.main_menu
+  %li.home{:class => tab_class(:root)}
+    = link_to "Home", root_path, :title => "Home"
+
+  %li{:class => tab_class(:dash_issues)}
+    = link_to dashboard_issues_path do
+      Issues
+      %span.count= current_user.assigned_issues.opened.count
+
+  %li{:class => tab_class(:dash_mr)}
+    = link_to dashboard_merge_requests_path do
+      Merge Requests
+      %span.count= current_user.cared_merge_requests.count
+
+  %li{:class => tab_class(:search)}
+    = link_to "Search", search_path
+
+  %li{:class => tab_class(:help)}
+    = link_to "Help", help_path

app/views/layouts/_project_menu.html.haml

@@ -1,25 +1,36 @@
-%nav.main_menu
-  = link_to @project.code, project_path(@project), :class => "home #{project_tab_class}", :title => "Project"
+%ul.main_menu
+  %li.home{:class => project_tab_class}
+    = link_to @project.code, project_path(@project), :title => "Project"
+
   - if @project.repo_exists?
     - if can? current_user, :download_code, @project
-      = link_to tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class do
-        Files
-      = link_to "Commits", project_commits_path(@project), :class => commit_tab_class
+      %li{:class => tree_tab_class}
+        = link_to tree_project_ref_path(@project, @project.root_ref) do
+          Files
+      %li{:class => commit_tab_class}
+        = link_to "Commits", project_commits_path(@project)
+
+      %li{:class => tab_class(:network)}
+        = link_to "Network", graph_project_path(@project)
 
-    = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
     - if @project.issues_enabled
-      = link_to  project_issues_filter_path(@project), :class => issues_tab? ? "current" : nil do
-        Issues
-        %span.count= @project.issues.opened.count
+      %li{:class => tab_class(:issues)}
+        = link_to  project_issues_filter_path(@project)  do
+          Issues
+          %span.count= @project.issues.opened.count
+
     - if @project.merge_requests_enabled
-      = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current wide" : "wide" do
-        Merge Requests
-        %span.count= @project.merge_requests.opened.count
+      %li{:class => tab_class(:merge_requests)}
+        = link_to project_merge_requests_path(@project) do
+          Merge Requests
+          %span.count= @project.merge_requests.opened.count
 
     - if @project.wall_enabled
-      = link_to wall_project_path(@project), :class => wall_tab? ? "current" : nil do
-        Wall
+      %li{:class =>  tab_class(:wall)}
+        = link_to wall_project_path(@project) do
+          Wall
 
     - if @project.wiki_enabled
-      = link_to project_wiki_path(@project, :index), :class => (controller.controller_name == "wikis") ? "current" : nil do
-        Wiki
+      %li{:class =>  tab_class(:wiki)}
+        = link_to project_wiki_path(@project, :index) do
+          Wiki

app/views/layouts/admin.html.haml

@@ -5,11 +5,16 @@
     = render "layouts/flash"
     = render "layouts/head_panel", :title => "Admin area"
     .container
-      %nav.main_menu
-        = link_to "Stats", admin_root_path, :class => "home #{'current' if controller.controller_name == "dashboard"}"
-        = link_to "Projects", admin_projects_path, :class => ('current' if controller.controller_name == "projects")
-        = link_to "Users", admin_users_path, :class => ('current' if controller.controller_name == 'users')
-        = link_to "Emails", admin_emails_path, :class => ('current' if controller.controller_name == 'mailer')
-        = link_to "Resque", admin_resque_path, :class => ('current' if controller.controller_name == 'resque')
+      %ul.main_menu
+        %li.home{:class => tab_class(:admin_root)}
+          = link_to "Stats", admin_root_path
+        %li{:class => tab_class(:admin_projects)}
+          = link_to "Projects", admin_projects_path
+        %li{:class => tab_class(:admin_users)}
+          = link_to "Users", admin_users_path
+        %li{:class => tab_class(:admin_emails)}
+          = link_to "Emails", admin_emails_path
+        %li{:class => tab_class(:admin_resque)}
+          = link_to "Resque", admin_resque_path
 
       .content= yield

app/views/layouts/profile.html.haml

@@ -5,12 +5,23 @@
     = render "layouts/flash"
     = render "layouts/head_panel", :title => "Profile"
     .container
-      %nav.main_menu
-        = link_to "Profile", profile_path, :class => "home #{current_page?(:controller => "profile", :action => :show) ? "current" : nil}"
-        = link_to "Password", profile_password_path,  :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
-        = link_to "Token", profile_token_path,  :class => current_page?(:controller => "profile", :action => :token) ? "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
-          SSH Keys
+      %ul.main_menu
+        %li.home{:class => tab_class(:profile)}
+          = link_to "Profile", profile_path
+
+        %li{:class => tab_class(:password)}
+          = link_to "Password", profile_password_path
+
+        %li{:class => tab_class(:token)}
+          = link_to "Token", profile_token_path
+
+        %li{:class => tab_class(:design)}
+          = link_to "Design", profile_design_path
+
+        %li{:class => tab_class(:ssh_keys)}
+          = link_to keys_path do
+            SSH Keys
+            %span.count= current_user.keys.count
+
       .content
         = yield