From 3b91a103e023c1b5d013045ae06def1077a6988e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sun, 22 Jan 2012 13:21:59 +0200
Subject: keep current branch when switch from tree to commits

---
 app/views/layouts/_project_side.html.haml | 19 +++++++++++++++++++
 app/views/layouts/project.html.haml       | 24 +-----------------------
 2 files changed, 20 insertions(+), 23 deletions(-)
 create mode 100644 app/views/layouts/_project_side.html.haml

diff --git a/app/views/layouts/_project_side.html.haml b/app/views/layouts/_project_side.html.haml
new file mode 100644
index 00000000000..00038cc373e
--- /dev/null
+++ b/app/views/layouts/_project_side.html.haml
@@ -0,0 +1,19 @@
+.project-sidebar
+  .fixed
+    %aside
+      = link_to project_path(@project), :class => project_tab_class do 
+        Project
+
+      - if @project.repo_exists?
+        = link_to "Repository", project_repository_path(@project), :class => repository_tab_class
+        = link_to "Tree", tree_project_ref_path(@project, @ref || @project.root_ref), :class => tree_tab_class
+        = link_to "Commits", project_commits_path(@project, :ref => (@ref || @project.root_ref)), :class => (controller.controller_name == "commits") ? "current" : nil
+        = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
+        = link_to  project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
+          Issues
+        = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
+          Wall
+          - if @project.common_notes.today.count > 0
+            %span{ :class => "number" }= @project.common_notes.today.count
+        = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
+          Requests
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml
index 00593a8c94b..a87b3400812 100644
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -18,29 +18,7 @@
     = render :partial => "layouts/flash"
     #container
       = render :partial => "layouts/head_panel"
-      -#= render :partial => "layouts/middle_panel" if @project && !@project.new_record?
       .project-container
-        .project-sidebar
-          .fixed
-            %aside
-              = link_to project_path(@project), :class => project_tab_class do 
-                Project
-
-              - if @project.repo_exists?
-                = link_to "Repository", project_repository_path(@project), :class => repository_tab_class
-                = link_to "Tree", tree_project_ref_path(@project, @ref || @project.root_ref), :class => tree_tab_class
-                = link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil
-                = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
-                = link_to  project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
-                  Issues
-                = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
-                  Wall
-                  - if @project.common_notes.today.count > 0
-                    %span{ :class => "number" }= @project.common_notes.today.count
-                = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
-                  Requests
-
-
-
+        = render :partial => "layouts/project_side"
         .project-content
           = yield
-- 
cgit v1.2.1