diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-11-25 00:36:19 +0100 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-11-25 00:36:19 +0100 |
| commit | 79a4ed15cefc4f70919a8a0b5059816f823d69d2 (patch) | |
| tree | af7dfd5d08a3dd7432ca64fef2da47c76caa21f9 | |
| parent | 267b18dead74106420430f79cde38fd90c17445d (diff) | |
| download | gitlab-ce-79a4ed15cefc4f70919a8a0b5059816f823d69d2.tar.gz | |
Change "Get Patch" buttons to dropdowns orffering patches and diffs
| -rw-r--r-- | app/views/commits/_commit_box.html.haml | 11 | ||||
| -rw-r--r-- | app/views/merge_requests/show/_mr_title.html.haml | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/app/views/commits/_commit_box.html.haml b/app/views/commits/_commit_box.html.haml index 26753a1465f..8f7826e0c8d 100644 --- a/app/views/commits/_commit_box.html.haml +++ b/app/views/commits/_commit_box.html.haml @@ -5,9 +5,14 @@ %span.btn.disabled.grouped %i.icon-comment = @notes_count - = link_to project_commit_path(@project, @commit, format: :patch), class: "btn small grouped" do - %i.icon-download-alt - Get Patch + .left.btn-group + %a.btn.small.grouped.dropdown-toggle{ data: {toggle: :dropdown} } + %i.icon-download-alt + Download as + %span.caret + %ul.dropdown-menu + %li= link_to "Email Patches", project_commit_path(@project, @commit, format: :patch) + %li= link_to "Plain Diff", project_commit_path(@project, @commit, format: :diff) = link_to project_tree_path(@project, @commit), class: "browse-button primary grouped" do %strong Browse Code ยป %h3.commit-title.page_title diff --git a/app/views/merge_requests/show/_mr_title.html.haml b/app/views/merge_requests/show/_mr_title.html.haml index f43f7b40ed2..a5275650d86 100644 --- a/app/views/merge_requests/show/_mr_title.html.haml +++ b/app/views/merge_requests/show/_mr_title.html.haml @@ -13,9 +13,14 @@ = "MERGED" - if can?(current_user, :modify_merge_request, @merge_request) - if @merge_request.open? - = link_to project_merge_request_path(@project, @merge_request, format: :patch), class: "btn grouped" do - %i.icon-download-alt - Get Patch + .left.btn-group + %a.btn.grouped.dropdown-toggle{ data: {toggle: :dropdown} } + %i.icon-download-alt + Download as + %span.caret + %ul.dropdown-menu + %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch) + %li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff) = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped danger", title: "Close merge request" |