diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-22 13:21:59 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-22 13:21:59 +0200 |
| commit | 3b91a103e023c1b5d013045ae06def1077a6988e (patch) | |
| tree | 222994e6311cf83126824b65d588124775fc7dc7 | |
| parent | 2cd5aa694de52536f2f7e42d84c3688c9de2fee8 (diff) | |
| download | gitlab-ce-3b91a103e023c1b5d013045ae06def1077a6988e.tar.gz | |
keep current branch when switch from tree to commits
| -rw-r--r-- | app/views/layouts/_project_side.html.haml | 19 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 24 |
2 files changed, 20 insertions, 23 deletions
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 |