Commit 4b716429 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'simplify-create-new-list-issue-boards' into 'master'

Simplify copy on "Create a new list" dropdown in Issue Boards

## What does this MR do?

It changes the "Create new list" text to simply "Add list". It also describes the operation in a more concise way. It was suggested in #24659.

## Are there points in the code the reviewer needs to double check?

Although I refactored references to the name of the button to reflect the new text, I left part of the documentation unmodified:

File: `doc/user/project/issue_board.md`
```
In short, here's a list of actions you can take in an Issue Board:                 
                                                                                   
- [Create a new list](#creating-a-new-list).                                       
- [Delete an existing list](#deleting-a-list). 
```
because I was not sure if changing those was necessary.


Additionally, I replaced every occurrence of `click_button 'Create new list'` with `click_button 'Add list'`in the spec. I'm not sure if that causes any change in behavior as I am not sure if there are any hooks to the previous name, explicitly.

File: `spec/features/boards/boards_spec.rb`

## Why was this MR needed?

It is an improvement, as suggested in #24659

## Screenshots (if relevant)

**Before:**
![before](/uploads/cffd30b0e9a21d16bc25d046eb4ca42b/before.png)

**After:**
![after2](/uploads/95b049e0c1c565c4ccd1a72a3f4be925/after2.png)

## Does this MR meet the acceptance criteria?

- [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [X] All builds are passing
- [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [X] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
#24659

See merge request !7605
parents 0bcce7c0 8434a642
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
} }
.issue-boards-search { .issue-boards-search {
width: 335px; width: 290px;
.form-control { .form-control {
display: inline-block; display: inline-block;
......
...@@ -40,9 +40,9 @@ ...@@ -40,9 +40,9 @@
- if can?(current_user, :admin_list, @project) - if can?(current_user, :admin_list, @project)
.dropdown.pull-right .dropdown.pull-right
%button.btn.btn-create.js-new-board-list{ type: "button", data: { toggle: "dropdown", labels: labels_filter_path, namespace_path: @project.try(:namespace).try(:path), project_path: @project.try(:path) } } %button.btn.btn-create.js-new-board-list{ type: "button", data: { toggle: "dropdown", labels: labels_filter_path, namespace_path: @project.try(:namespace).try(:path), project_path: @project.try(:path) } }
Create new list Add list
.dropdown-menu.dropdown-menu-paging.dropdown-menu-align-right.dropdown-menu-issues-board-new.dropdown-menu-selectable .dropdown-menu.dropdown-menu-paging.dropdown-menu-align-right.dropdown-menu-issues-board-new.dropdown-menu-selectable
= render partial: "shared/issuable/label_page_default", locals: { show_footer: true, show_create: true, show_boards_content: true, title: "Create a new list" } = render partial: "shared/issuable/label_page_default", locals: { show_footer: true, show_create: true, show_boards_content: true, title: "Add list" }
- if can?(current_user, :admin_label, @project) - if can?(current_user, :admin_label, @project)
= render partial: "shared/issuable/label_page_create" = render partial: "shared/issuable/label_page_create"
= dropdown_loading = dropdown_loading
......
- title = local_assigns.fetch(:title, 'Assign labels') - title = local_assigns.fetch(:title, 'Assign labels')
- show_create = local_assigns.fetch(:show_create, true) - show_create = local_assigns.fetch(:show_create, true)
- show_footer = local_assigns.fetch(:show_footer, true) - show_footer = local_assigns.fetch(:show_footer, true)
- filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search labels') - filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search')
- show_boards_content = local_assigns.fetch(:show_boards_content, false) - show_boards_content = local_assigns.fetch(:show_boards_content, false)
.dropdown-page-one .dropdown-page-one
= dropdown_title(title) = dropdown_title(title)
- if show_boards_content - if show_boards_content
.issue-board-dropdown-content .issue-board-dropdown-content
%p %p
Each label that exists in your issue tracker can have its own dedicated Create lists from the labels you use in your project. Issues with that
list. Select a label below to add a list to your Board and it will label will automatically be added to the list.
automatically be populated with issues that have that label. To create
a list for a label that doesn't exist yet, simply create the label below.
= dropdown_filter(filter_placeholder) = dropdown_filter(filter_placeholder)
= dropdown_content = dropdown_content
- if @project && show_footer - if @project && show_footer
......
---
title: Simplify copy on "Create a new list" dropdown in Issue Boards
merge_request: 7605
author: Victor Rodrigues
doc/user/project/img/issue_board.png

79.7 KB | W: | H:

doc/user/project/img/issue_board.png

88.5 KB | W: | H:

doc/user/project/img/issue_board.png
doc/user/project/img/issue_board.png
doc/user/project/img/issue_board.png
doc/user/project/img/issue_board.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -72,7 +72,7 @@ the list will be created and filled with the issues that have that label. ...@@ -72,7 +72,7 @@ the list will be created and filled with the issues that have that label.
## Creating a new list ## Creating a new list
Create a new list by clicking on the **Create new list** button at the upper Create a new list by clicking on the **Add list** button at the upper
right corner of the Issue Board. right corner of the Issue Board.
![Issue Board welcome message](img/issue_board_add_list.png) ![Issue Board welcome message](img/issue_board_add_list.png)
......
...@@ -158,7 +158,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -158,7 +158,7 @@ describe 'Issue Boards', feature: true, js: true do
end end
it 'removes checkmark in new list dropdown after deleting' do it 'removes checkmark in new list dropdown after deleting' do
click_button 'Create new list' click_button 'Add list'
wait_for_ajax wait_for_ajax
page.within(find('.board:nth-child(2)')) do page.within(find('.board:nth-child(2)')) do
...@@ -304,7 +304,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -304,7 +304,7 @@ describe 'Issue Boards', feature: true, js: true do
context 'new list' do context 'new list' do
it 'shows all labels in new list dropdown' do it 'shows all labels in new list dropdown' do
click_button 'Create new list' click_button 'Add list'
wait_for_ajax wait_for_ajax
page.within('.dropdown-menu-issues-board-new') do page.within('.dropdown-menu-issues-board-new') do
...@@ -315,7 +315,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -315,7 +315,7 @@ describe 'Issue Boards', feature: true, js: true do
end end
it 'creates new list for label' do it 'creates new list for label' do
click_button 'Create new list' click_button 'Add list'
wait_for_ajax wait_for_ajax
page.within('.dropdown-menu-issues-board-new') do page.within('.dropdown-menu-issues-board-new') do
...@@ -328,7 +328,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -328,7 +328,7 @@ describe 'Issue Boards', feature: true, js: true do
end end
it 'creates new list for Backlog label' do it 'creates new list for Backlog label' do
click_button 'Create new list' click_button 'Add list'
wait_for_ajax wait_for_ajax
page.within('.dropdown-menu-issues-board-new') do page.within('.dropdown-menu-issues-board-new') do
...@@ -341,7 +341,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -341,7 +341,7 @@ describe 'Issue Boards', feature: true, js: true do
end end
it 'creates new list for Done label' do it 'creates new list for Done label' do
click_button 'Create new list' click_button 'Add list'
wait_for_ajax wait_for_ajax
page.within('.dropdown-menu-issues-board-new') do page.within('.dropdown-menu-issues-board-new') do
...@@ -354,7 +354,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -354,7 +354,7 @@ describe 'Issue Boards', feature: true, js: true do
end end
it 'keeps dropdown open after adding new list' do it 'keeps dropdown open after adding new list' do
click_button 'Create new list' click_button 'Add list'
wait_for_ajax wait_for_ajax
page.within('.dropdown-menu-issues-board-new') do page.within('.dropdown-menu-issues-board-new') do
...@@ -369,7 +369,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -369,7 +369,7 @@ describe 'Issue Boards', feature: true, js: true do
it 'moves issues from backlog into new list' do it 'moves issues from backlog into new list' do
wait_for_board_cards(1, 6) wait_for_board_cards(1, 6)
click_button 'Create new list' click_button 'Add list'
wait_for_ajax wait_for_ajax
page.within('.dropdown-menu-issues-board-new') do page.within('.dropdown-menu-issues-board-new') do
...@@ -382,7 +382,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -382,7 +382,7 @@ describe 'Issue Boards', feature: true, js: true do
end end
it 'creates new list from a new label' do it 'creates new list from a new label' do
click_button 'Create new list' click_button 'Add list'
wait_for_ajax wait_for_ajax
......
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