summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-08-18 22:34:17 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-22 16:09:26 +0300
commit1804f60fd5a1aab92f553b7c66b79857ef35df35 (patch)
tree6214e458ecee29e40a7e03c89ed447f7bc392001
parent53f11f9be79c30e50d4077257945467ff75e7d03 (diff)
downloadgitlab-ce-1804f60fd5a1aab92f553b7c66b79857ef35df35.tar.gz
Change images to reflect current status, add link to inline docs
-rw-r--r--app/views/shared/issuable/_label_page_default.html.haml8
-rw-r--r--doc/user/project/img/issue_board_add_list.pngbin22046 -> 22391 bytes
-rw-r--r--doc/user/project/img/issue_board_welcome_message.pngbin92257 -> 78694 bytes
-rw-r--r--doc/user/project/issue_board.md34
4 files changed, 24 insertions, 18 deletions
diff --git a/app/views/shared/issuable/_label_page_default.html.haml b/app/views/shared/issuable/_label_page_default.html.haml
index a76b7baf918..18b50f9da7b 100644
--- a/app/views/shared/issuable/_label_page_default.html.haml
+++ b/app/views/shared/issuable/_label_page_default.html.haml
@@ -8,7 +8,13 @@
- if show_boards_content
.issue-board-dropdown-content
%p
- Each label that exists in your issue tracker can have its own dedicated list. Select a label below to add a list to your Board and it will 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.
+ Each label that exists in your issue tracker can have its own dedicated
+ list. Select a label below to add a list to your Board and it will
+ 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.
+ Learn more in the
+ = succeed "." do
+ = link_to "Issue Boards documentation", help_page_path("user/project/issue_board"), class: "underlined-link"
= dropdown_filter(filter_placeholder)
= dropdown_content
- if @project && show_footer
diff --git a/doc/user/project/img/issue_board_add_list.png b/doc/user/project/img/issue_board_add_list.png
index e5538763dee..2b8c10eaa0a 100644
--- a/doc/user/project/img/issue_board_add_list.png
+++ b/doc/user/project/img/issue_board_add_list.png
Binary files differ
diff --git a/doc/user/project/img/issue_board_welcome_message.png b/doc/user/project/img/issue_board_welcome_message.png
index ebb9fbe8246..b757faeb230 100644
--- a/doc/user/project/img/issue_board_welcome_message.png
+++ b/doc/user/project/img/issue_board_welcome_message.png
Binary files differ
diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md
index a0edc062f99..0ad21606ef6 100644
--- a/doc/user/project/issue_board.md
+++ b/doc/user/project/issue_board.md
@@ -36,8 +36,8 @@ There are three types of lists, of which two are default:
In short, here's a list of actions you can take in an Issue Board:
-- [Add a new list](#adding-a-new-list).
-- [Remove an existing list](#removing-a-list).
+- [Create a new list](#creating-a-new-list).
+- [Delete an existing list](#deleting-a-list).
- Drag issues between lists.
- Drag and reorder the lists themselves.
- Change issue labels on-the-fly while dragging issues between lists.
@@ -62,10 +62,10 @@ because the labels associated to them will not exist up until that moment,
which means the system has no way of populating them automatically. It'll be
the users' job to add individual issues to them.
-## Adding a new list
+## Creating a new list
-Add a new list by clicking on the **Add new list** button at the upper right
-corner of the Issue Board.
+Create a new list by clicking on the **Create new list** button at the upper
+right corner of the Issue Board.
![Issue Board welcome message](img/issue_board_add_list.png)
@@ -73,16 +73,16 @@ Simply choose the label to create the list from. The new list will be inserted
at the end of the lists, before **Done**. Moving and reordering lists is as
easy as dragging them around.
-To add a list for a label that doesn't exist yet, simply create the label by
+To create a list for a label that doesn't exist yet, simply create the label by
choosing **Create new label**. The label will be created on-the-fly and it will
-be immediately added to the dropdown. You can now choose it to add a list.
+be immediately added to the dropdown. You can now choose it to create a list.
-## Removing a list
+## Deleting a list
-To remove a list from the Issue Board use the small trash icon that is present
+To delete a list from the Issue Board use the small trash icon that is present
in the list's heading. A confirmation dialog will appear for you to confirm.
-Removing a list doesn't have any effect in issues and labels, it's just the
+Deleting a list doesn't have any effect in issues and labels, it's just the
list view that is removed.
## Filtering issues
@@ -114,13 +114,13 @@ A typical workflow of using the Issue Board would be:
1. When the issue is finally resolved, the issue is moved to the **Done** list
and gets automatically closed.
-For instance you can add a
-list based on the label of 'Frontend' and one for 'Backend'. A designer can start
-working on an issue by dragging it from **Backlog** to 'Frontend'. That way, everyone
-knows that this issue is now being worked on by the designers. Then, once they’re
-done, all they have to do is drag it over to the next list, 'Backend', where a
-backend developer can eventually pick it up. Once they’re done, they move it to
-**Done**, to close the issue.
+For instance you can add a list based on the label of 'Frontend' and one for
+'Backend'. A designer can start working on an issue by dragging it from
+**Backlog** to 'Frontend'. That way, everyone knows that this issue is now being
+worked on by the designers. Then, once they're done, all they have to do is
+drag it over to the next list, 'Backend', where a backend developer can
+eventually pick it up. Once they’re done, they move it to **Done**, to close the
+issue.
## Permissions