Commit 3b91a103e023c1b5d013045ae06def1077a6988e
1 parent
2cd5aa69
Exists in
master
and in
4 other branches
keep current branch when switch from tree to commits
Showing
2 changed files
with
20 additions
and
23 deletions
Show diff stats
| @@ -0,0 +1,19 @@ | @@ -0,0 +1,19 @@ | ||
| 1 | +.project-sidebar | ||
| 2 | + .fixed | ||
| 3 | + %aside | ||
| 4 | + = link_to project_path(@project), :class => project_tab_class do | ||
| 5 | + Project | ||
| 6 | + | ||
| 7 | + - if @project.repo_exists? | ||
| 8 | + = link_to "Repository", project_repository_path(@project), :class => repository_tab_class | ||
| 9 | + = link_to "Tree", tree_project_ref_path(@project, @ref || @project.root_ref), :class => tree_tab_class | ||
| 10 | + = link_to "Commits", project_commits_path(@project, :ref => (@ref || @project.root_ref)), :class => (controller.controller_name == "commits") ? "current" : nil | ||
| 11 | + = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil | ||
| 12 | + = link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do | ||
| 13 | + Issues | ||
| 14 | + = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do | ||
| 15 | + Wall | ||
| 16 | + - if @project.common_notes.today.count > 0 | ||
| 17 | + %span{ :class => "number" }= @project.common_notes.today.count | ||
| 18 | + = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do | ||
| 19 | + Requests |
app/views/layouts/project.html.haml
| @@ -18,29 +18,7 @@ | @@ -18,29 +18,7 @@ | ||
| 18 | = render :partial => "layouts/flash" | 18 | = render :partial => "layouts/flash" |
| 19 | #container | 19 | #container |
| 20 | = render :partial => "layouts/head_panel" | 20 | = render :partial => "layouts/head_panel" |
| 21 | - -#= render :partial => "layouts/middle_panel" if @project && !@project.new_record? | ||
| 22 | .project-container | 21 | .project-container |
| 23 | - .project-sidebar | ||
| 24 | - .fixed | ||
| 25 | - %aside | ||
| 26 | - = link_to project_path(@project), :class => project_tab_class do | ||
| 27 | - Project | ||
| 28 | - | ||
| 29 | - - if @project.repo_exists? | ||
| 30 | - = link_to "Repository", project_repository_path(@project), :class => repository_tab_class | ||
| 31 | - = link_to "Tree", tree_project_ref_path(@project, @ref || @project.root_ref), :class => tree_tab_class | ||
| 32 | - = link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil | ||
| 33 | - = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil | ||
| 34 | - = link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do | ||
| 35 | - Issues | ||
| 36 | - = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do | ||
| 37 | - Wall | ||
| 38 | - - if @project.common_notes.today.count > 0 | ||
| 39 | - %span{ :class => "number" }= @project.common_notes.today.count | ||
| 40 | - = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do | ||
| 41 | - Requests | ||
| 42 | - | ||
| 43 | - | ||
| 44 | - | 22 | + = render :partial => "layouts/project_side" |
| 45 | .project-content | 23 | .project-content |
| 46 | = yield | 24 | = yield |