diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2012-09-16 12:07:57 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2012-09-16 12:07:57 -0400 |
| commit | 465e40d3a663944b5aacf3e53a63158a7812f219 (patch) | |
| tree | 740d9fd85344a4fe5d2b19c38d196a5ecf05b975 /app/views | |
| parent | 4247ccd3401b81f654f2203f4b71f0257fd9c569 (diff) | |
| download | gitlab-ce-465e40d3a663944b5aacf3e53a63158a7812f219.tar.gz | |
Extract ref switcher into a partial
Also moves onchange JS to projects.js.coffee
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/commits/_head.html.haml | 7 | ||||
| -rw-r--r-- | app/views/refs/_head.html.haml | 5 | ||||
| -rw-r--r-- | app/views/shared/_ref_switcher.html.haml | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/app/views/commits/_head.html.haml b/app/views/commits/_head.html.haml index 5a09d82aa61..a8111a72ed5 100644 --- a/app/views/commits/_head.html.haml +++ b/app/views/commits/_head.html.haml @@ -1,9 +1,5 @@ %ul.nav.nav-tabs - %li - = form_tag switch_project_refs_path(@project), method: :get, class: "project-refs-form" do - = select_tag "ref", grouped_options_refs, onchange: "$(this.form).trigger('submit');", class: "project-refs-select chosen" - = hidden_field_tag :destination, "commits" - + %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'} %li{class: "#{'active' if current_page?(project_commits_path(@project)) }"} = link_to project_commits_path(@project) do Commits @@ -20,7 +16,6 @@ Tags %span.badge= @project.repo.tag_count - - if current_page?(project_commits_path(@project)) && current_user.private_token %li.right %span.rss-icon diff --git a/app/views/refs/_head.html.haml b/app/views/refs/_head.html.haml index 94603f0a42a..3592f5737ce 100644 --- a/app/views/refs/_head.html.haml +++ b/app/views/refs/_head.html.haml @@ -1,9 +1,6 @@ %ul.nav.nav-tabs %li - = form_tag switch_project_refs_path(@project), method: :get, class: "project-refs-form", remote: true do - = select_tag "ref", grouped_options_refs, onchange: "$(this.form).trigger('submit');", class: "project-refs-select chosen" - = hidden_field_tag :destination, "tree" - = hidden_field_tag :path, params[:path] + = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]} %li{class: "#{'active' if (controller.controller_name == "refs") }"} = link_to tree_project_ref_path(@project, @ref) do Source diff --git a/app/views/shared/_ref_switcher.html.haml b/app/views/shared/_ref_switcher.html.haml new file mode 100644 index 00000000000..e0c89522c11 --- /dev/null +++ b/app/views/shared/_ref_switcher.html.haml @@ -0,0 +1,5 @@ += form_tag switch_project_refs_path(@project), method: :get, class: "project-refs-form" do + = select_tag "ref", grouped_options_refs, class: "project-refs-select chosen" + = hidden_field_tag :destination, destination + - if respond_to?(:path) + = hidden_field_tag :path, path |