From 5f4a7c3e04f9511be01234b9f2d7bd0134491b22 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 20 Feb 2012 08:39:03 +0200 Subject: Home tab added, Repository tab removed\n Ability to download branch --- app/views/layouts/_app_menu.html.haml | 3 ++- app/views/layouts/_const_menu_links.html.haml | 1 + app/views/layouts/_project_menu.html.haml | 4 ++-- app/views/layouts/admin.html.haml | 1 + app/views/layouts/profile.html.haml | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 app/views/layouts/_const_menu_links.html.haml (limited to 'app/views/layouts') diff --git a/app/views/layouts/_app_menu.html.haml b/app/views/layouts/_app_menu.html.haml index 484ac6303e7..c42bb3ebe70 100644 --- a/app/views/layouts/_app_menu.html.haml +++ b/app/views/layouts/_app_menu.html.haml @@ -1,5 +1,6 @@ %nav.main_menu - = link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path) || current_page?(root_path)}" + = render "layouts/const_menu_links" + -#= link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path) || current_page?(root_path)}" = link_to "Issues", dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" = link_to "Requests", dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" = link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}" diff --git a/app/views/layouts/_const_menu_links.html.haml b/app/views/layouts/_const_menu_links.html.haml new file mode 100644 index 00000000000..c0b971c2836 --- /dev/null +++ b/app/views/layouts/_const_menu_links.html.haml @@ -0,0 +1 @@ += 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/_project_menu.html.haml b/app/views/layouts/_project_menu.html.haml index 54cfd2b079d..5260fcd13de 100644 --- a/app/views/layouts/_project_menu.html.haml +++ b/app/views/layouts/_project_menu.html.haml @@ -1,11 +1,11 @@ %nav.main_menu + = render "layouts/const_menu_links" = link_to project_path(@project), :class => "#{project_tab_class}", :title => "Project" do Project - if @project.repo_exists? - = link_to "Repository", project_repository_path(@project), :class => repository_tab_class = link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class - = link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil + = link_to "Commits", project_commits_path(@project), :class => commit_tab_class = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil - if @project.issues_enabled diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 98d890c199f..87b9832e3ef 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -6,6 +6,7 @@ = render "layouts/head_panel", :title => "Admin area" .container %nav.main_menu + = render "layouts/const_menu_links" = link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil = link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil = link_to "Emails", admin_emails_path, :class => controller.controller_name == "mailer" ? "current" : nil diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml index dd7030f4ff1..9d02a4ffa3a 100644 --- a/app/views/layouts/profile.html.haml +++ b/app/views/layouts/profile.html.haml @@ -6,6 +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 "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 -- cgit v1.2.1