Rename menu item and page 'Task queue' to 'Tasks'

parent fc3f8a8f
- page_title "Task Queue" - page_title "Tasks"
- header_title "Task Queue", dashboard_tasks_path - header_title "Tasks", dashboard_tasks_path
.top-area .top-area
%ul.nav-links %ul.nav-links
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
= link_to admin_root_path, title: 'Admin Area', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to admin_root_path, title: 'Admin Area', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= icon('wrench fw') = icon('wrench fw')
%li %li
= link_to dashboard_tasks_path, title: 'Task Queue', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to dashboard_tasks_path, title: 'Tasks', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
%span.badge.tasks-pending-count %span.badge.tasks-pending-count
= tasks_pending_count = tasks_pending_count
- if current_user.can_create_project? - if current_user.can_create_project?
......
...@@ -4,6 +4,12 @@ ...@@ -4,6 +4,12 @@
= icon('home fw') = icon('home fw')
%span %span
Projects Projects
= nav_link(controller: :tasks) do
= link_to dashboard_tasks_path, title: 'Tasks' do
= icon('bell fw')
%span
Tasks
%span.count= number_with_delimiter(tasks_pending_count)
= nav_link(path: 'dashboard#activity') do = nav_link(path: 'dashboard#activity') do
= link_to activity_dashboard_path, class: 'shortcuts-activity', title: 'Activity' do = link_to activity_dashboard_path, class: 'shortcuts-activity', title: 'Activity' do
= icon('dashboard fw') = icon('dashboard fw')
...@@ -31,12 +37,6 @@ ...@@ -31,12 +37,6 @@
%span %span
Merge Requests Merge Requests
%span.count= number_with_delimiter(current_user.assigned_merge_requests.opened.count) %span.count= number_with_delimiter(current_user.assigned_merge_requests.opened.count)
= nav_link(path: 'dashboard#tasks') do
= link_to dashboard_tasks_path, title: 'Task Queue' do
= icon('bell fw')
%span
Task Queue
%span.count= number_with_delimiter(tasks_pending_count)
= nav_link(controller: :snippets) do = nav_link(controller: :snippets) do
= link_to dashboard_snippets_path, title: 'Snippets' do = link_to dashboard_snippets_path, title: 'Snippets' do
= icon('clipboard fw') = icon('clipboard fw')
......
@dashboard @dashboard
Feature: Dashboard Task Queue Feature: Dashboard Tasks
Background: Background:
Given I sign in as a user Given I sign in as a user
And I own project "Shop" And I own project "Shop"
......
class Spinach::Features::DashboardTaskQueue < Spinach::FeatureSteps class Spinach::Features::DashboardTasks < Spinach::FeatureSteps
include SharedAuthentication include SharedAuthentication
include SharedPaths include SharedPaths
include SharedProject include SharedProject
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment