summaryrefslogtreecommitdiff
path: root/app/views/dashboard
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-07 17:12:04 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-07 17:12:04 +0100
commitcbcb8dbe702c0b1532327aeb2dc53caffb6e8ed9 (patch)
treefd5b44f26fb3458f5f0eaf0c875b231fbe5cf44b /app/views/dashboard
parent8f817c7b08bcad23e1b047f84cc60d1748104e2a (diff)
downloadgitlab-ce-cbcb8dbe702c0b1532327aeb2dc53caffb6e8ed9.tar.gz
Use select2 dropdown for dashboard/group 'New X' buttons
Diffstat (limited to 'app/views/dashboard')
-rw-r--r--app/views/dashboard/issues.html.haml13
-rw-r--r--app/views/dashboard/merge_requests.html.haml13
-rw-r--r--app/views/dashboard/milestones/index.html.haml13
3 files changed, 3 insertions, 36 deletions
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 829c3c83769..2d3da01178a 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -12,18 +12,7 @@
= link_to issues_dashboard_url(format: :atom, private_token: current_user.private_token), class: 'btn' do
%i.fa.fa-rss
- - if @projects.any? { |project| can?(current_user, :create_issue, project) }
- .dropdown.inline.prepend-left-10
- %button.dropdown-toggle.btn.btn-new{type: 'button', 'data-toggle' => 'dropdown'}
- %i.fa.fa-plus
- New Issue
- %b.caret
- %ul.dropdown-menu.dropdown-menu-align-right
- - @projects.each do |project|
- - if can?(current_user, :create_issue, project)
- %li
- = link_to new_namespace_project_issue_path(project.namespace, project) do
- = project.name_with_namespace
+ = render 'shared/new_project_item_select', path: 'issues/new', label: "New Issue"
= render 'shared/issuable/filter', type: :issues
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 2e91c8dec8a..c5a5ec21f78 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -3,18 +3,7 @@
.project-issuable-filter
.controls
- - if @projects.any? { |project| can?(current_user, :create_merge_request, project) }
- .dropdown.inline
- %button.dropdown-toggle.btn.btn-new{type: 'button', 'data-toggle' => 'dropdown'}
- %i.fa.fa-plus
- New Merge Request
- %b.caret
- %ul.dropdown-menu.dropdown-menu-align-right
- - @projects.each do |project|
- - if can?(current_user, :create_merge_request, project)
- %li
- = link_to new_namespace_project_merge_request_path(project.namespace, project) do
- = project.name_with_namespace
+ = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New Merge Request"
= render 'shared/issuable/filter', type: :merge_requests
diff --git a/app/views/dashboard/milestones/index.html.haml b/app/views/dashboard/milestones/index.html.haml
index 9aea75e50db..94ff259a338 100644
--- a/app/views/dashboard/milestones/index.html.haml
+++ b/app/views/dashboard/milestones/index.html.haml
@@ -3,18 +3,7 @@
.project-issuable-filter
.controls
- - if @projects.any? { |project| can?(current_user, :admin_milestone, project) }
- .dropdown.inline
- %button.dropdown-toggle.btn.btn-new{type: 'button', 'data-toggle' => 'dropdown'}
- %i.fa.fa-plus
- New Milestone
- %b.caret
- %ul.dropdown-menu.dropdown-menu-align-right
- - @projects.each do |project|
- - if can?(current_user, :admin_milestone, project)
- %li
- = link_to new_namespace_project_milestone_path(project.namespace, project) do
- = project.name_with_namespace
+ = render 'shared/new_project_item_select', path: 'milestones/new', label: "New Milestone"
= render 'shared/milestones_filter'