Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ebb883e0
Commit
ebb883e0
authored
Oct 11, 2016
by
Phil Hughes
Committed by
Douglas Barbosa Alexandre
Oct 18, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added delete state
parent
ed1da57a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
4 deletions
+15
-4
app/assets/javascripts/boards/components/boards_selector.js.es6
...sets/javascripts/boards/components/boards_selector.js.es6
+2
-0
app/views/projects/boards/_title.html.haml
app/views/projects/boards/_title.html.haml
+13
-4
No files found.
app/assets/javascripts/boards/components/boards_selector.js.es6
View file @
ebb883e0
...
@@ -41,6 +41,8 @@
...
@@ -41,6 +41,8 @@
return 'Edit board';
return 'Edit board';
} else if (this.currentPage === 'new') {
} else if (this.currentPage === 'new') {
return 'Create new board';
return 'Create new board';
} else if (this.currentPage === 'delete') {
return 'Delete board';
} else {
} else {
return 'Go to a board';
return 'Go to a board';
}
}
...
...
app/views/projects/boards/_title.html.haml
View file @
ebb883e0
...
@@ -37,6 +37,18 @@
...
@@ -37,6 +37,18 @@
":current-page.sync"
=>
"currentPage"
,
":current-page.sync"
=>
"currentPage"
,
":reload.sync"
=>
"reload"
}
":reload.sync"
=>
"reload"
}
=
render
"projects/boards/components/form"
=
render
"projects/boards/components/form"
.dropdown-content.board-selector-page-two
{
"v-if"
=>
"currentPage === 'delete'"
}
%p
Are you sure you want to delete this board?
.clearfix
=
link_to
""
,
class:
"btn btn-danger pull-left"
,
method: :delete
,
":href"
=>
"'
#{
namespace_project_boards_path
(
@project
.
namespace
,
@project
)
}
/' + currentBoard.id"
do
Delete
%button
.btn.btn-default.pull-right
{
type:
"button"
,
"@click.stop.prevent"
=>
"currentPage = ''"
}
Cancel
.dropdown-footer
{
"v-if"
=>
"currentPage === ''"
}
.dropdown-footer
{
"v-if"
=>
"currentPage === ''"
}
%ul
.dropdown-footer-list
%ul
.dropdown-footer-list
%li
%li
...
@@ -46,8 +58,5 @@
...
@@ -46,8 +58,5 @@
%a
{
"@click.stop.prevent"
=>
"showPage('edit')"
}
%a
{
"@click.stop.prevent"
=>
"showPage('edit')"
}
Edit board name
Edit board name
%li
{
"v-if"
=>
"showDelete"
}
%li
{
"v-if"
=>
"showDelete"
}
=
link_to
""
,
%a
.text-danger
{
"@click.stop.prevent"
=>
"showPage('delete')"
}
class:
"text-danger"
,
method: :delete
,
":href"
=>
"'
#{
namespace_project_boards_path
(
@project
.
namespace
,
@project
)
}
/' + currentBoard.id"
do
Delete board
Delete 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