BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
1bfa7425
Commit
1bfa7425
authored
Feb 09, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added help box where backlog list used to be
This is to ease the transition for users who were used to having the backlog list Closes #27933
parent
ba92981f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
85 additions
and
0 deletions
+85
-0
boards_bundle.js.es6
app/assets/javascripts/boards/boards_bundle.js.es6
+7
-0
boards_backlog_help.js.es6
.../javascripts/boards/components/boards_backlog_help.js.es6
+56
-0
boards_store.js.es6
app/assets/javascripts/boards/stores/boards_store.js.es6
+1
-0
boards.scss
app/assets/stylesheets/pages/boards.scss
+20
-0
_show.html.haml
app/views/projects/boards/_show.html.haml
+1
-0
No files found.
app/assets/javascripts/boards/boards_bundle.js.es6
View file @
1bfa7425
...
@@ -16,6 +16,7 @@ require('./components/board');
...
@@ -16,6 +16,7 @@ require('./components/board');
require('./components/board_sidebar');
require('./components/board_sidebar');
require('./components/new_list_dropdown');
require('./components/new_list_dropdown');
require('./components/modal/index');
require('./components/modal/index');
const backlogHelp = require('./components/boards_backlog_help');
require('../vue_shared/vue_resource_interceptor');
require('../vue_shared/vue_resource_interceptor');
$(() => {
$(() => {
...
@@ -37,6 +38,7 @@ $(() => {
...
@@ -37,6 +38,7 @@ $(() => {
'board': gl.issueBoards.Board,
'board': gl.issueBoards.Board,
'board-sidebar': gl.issueBoards.BoardSidebar,
'board-sidebar': gl.issueBoards.BoardSidebar,
'board-add-issues-modal': gl.issueBoards.IssuesModal,
'board-add-issues-modal': gl.issueBoards.IssuesModal,
backlogHelp,
},
},
data: {
data: {
state: Store.state,
state: Store.state,
...
@@ -53,6 +55,11 @@ $(() => {
...
@@ -53,6 +55,11 @@ $(() => {
detailIssueVisible () {
detailIssueVisible () {
return Object.keys(this.detailIssue.issue).length;
return Object.keys(this.detailIssue.issue).length;
},
},
hideHelp() {
if (this.loading) return false;
return !this.state.helpHidden;
},
},
},
created () {
created () {
gl.boardService = new BoardService(this.endpoint, this.bulkUpdatePath, this.boardId);
gl.boardService = new BoardService(this.endpoint, this.bulkUpdatePath, this.boardId);
...
...
app/assets/javascripts/boards/components/boards_backlog_help.js.es6
0 → 100644
View file @
1bfa7425
/* global Cookies */
const Vue = require('vue');
const Store = gl.issueBoards.BoardsStore;
const ModalStore = gl.issueBoards.ModalStore;
module.exports = Vue.extend({
mixins: [gl.issueBoards.ModalMixins],
data() {
return ModalStore.store;
},
methods: {
closeHelp(openModal) {
Store.state.helpHidden = true;
Cookies.set('boards_backlog_help_hidden', true);
if (openModal) {
this.toggleModal(true);
}
},
},
computed: {
disabled() {
return !Store.state.lists
.filter(list => list.type !== 'blank' && list.type !== 'done').length;
},
},
template: `
<div class="boards-backlog-help">
<h4>
We removed the Backlog
<button
type="button"
class="close"
aria-label="Close backlog help"
@click="closeHelp(false)">
<i class="fa fa-times"></i>
</button>
</h4>
<p>
<a href="http://docs.gitlab.com/ce/user/project/issue_board.html">Read the docs</a> to find out why
</p>
<p>
You can populate your board using this button
</p>
<div class="text-center">
<button
class="btn btn-success"
type="button"
@click="closeHelp(true)">
Add issues
</button>
</div>
</div>
`,
});
app/assets/javascripts/boards/stores/boards_store.js.es6
View file @
1bfa7425
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
label_name: gl.utils.getParameterValues('label_name[]'),
label_name: gl.utils.getParameterValues('label_name[]'),
search: ''
search: ''
};
};
this.state.helpHidden = Cookies.get('boards_backlog_help_hidden') === 'true';
},
},
addList (listObj) {
addList (listObj) {
const list = new List(listObj);
const list = new List(listObj);
...
...
app/assets/stylesheets/pages/boards.scss
View file @
1bfa7425
...
@@ -522,3 +522,23 @@
...
@@ -522,3 +522,23 @@
}
}
}
}
}
}
.boards-backlog-help
{
display
:
inline-block
;
width
:
250px
;
padding
:
15px
;
border
:
1px
solid
$border-color
;
border-radius
:
2px
;
white-space
:
normal
;
>
h4
{
margin-top
:
0
;
font-size
:
14px
;
}
.close
{
padding
:
2px
0
;
font-size
:
12px
;
line-height
:
0
;
}
}
app/views/projects/boards/_show.html.haml
View file @
1bfa7425
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
.boards-list
{
":class"
=>
"{ 'is-compact': detailIssueVisible }"
}
.boards-list
{
":class"
=>
"{ 'is-compact': detailIssueVisible }"
}
.boards-app-loading.text-center
{
"v-if"
=>
"loading"
}
.boards-app-loading.text-center
{
"v-if"
=>
"loading"
}
=
icon
(
"spinner spin"
)
=
icon
(
"spinner spin"
)
%backlog-help
{
"v-if"
=>
"hideHelp"
}
%board
{
"v-cloak"
=>
true
,
%board
{
"v-cloak"
=>
true
,
"v-for"
=>
"list in state.lists"
,
"v-for"
=>
"list in state.lists"
,
"ref"
=>
"board"
,
"ref"
=>
"board"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment