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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
80a7c369
Commit
80a7c369
authored
Jan 26, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not rely on style class for changing DOM state on "Mark all as done"
parent
27a79491
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
37 deletions
+38
-37
app/assets/javascripts/todos.js.es6
app/assets/javascripts/todos.js.es6
+1
-1
app/views/dashboard/todos/index.html.haml
app/views/dashboard/todos/index.html.haml
+37
-36
No files found.
app/assets/javascripts/todos.js.es6
View file @
80a7c369
...
...
@@ -85,7 +85,7 @@
},
success: (data) => {
$target.remove();
$('.
prepend-top-default
').html('<div class="nothing-here-block">You\'re all done!</div>');
$('.
js-todos-all
').html('<div class="nothing-here-block">You\'re all done!</div>');
return this.updateBadges(data);
}
});
...
...
app/views/dashboard/todos/index.html.haml
View file @
80a7c369
...
...
@@ -67,40 +67,41 @@
=
sort_title_oldest_created
-
if
@todos
.
any?
.js-todos-options
{
data:
{
per_page:
@todos
.
limit_value
,
current_page:
@todos
.
current_page
,
total_pages:
@todos
.
total_pages
}
}
.panel.panel-default.panel-small.panel-without-border
%ul
.content-list.todos-list
=
render
@todos
=
paginate
@todos
,
theme:
"gitlab"
.js-todos-all
-
if
@todos
.
any?
.js-todos-options
{
data:
{
per_page:
@todos
.
limit_value
,
current_page:
@todos
.
current_page
,
total_pages:
@todos
.
total_pages
}
}
.panel.panel-default.panel-small.panel-without-border
%ul
.content-list.todos-list
=
render
@todos
=
paginate
@todos
,
theme:
"gitlab"
-
elsif
current_user
.
todos
.
any?
.todos-all-done
=
render
"shared/empty_states/todos_all_done.svg"
-
if
todos_filter_empty?
%h4
.text-center
=
Gitlab
.
config
.
gitlab
.
no_todos_messages
.
sample
%p
.text-center
Are you looking for things to do? Take a look at
=
succeed
","
do
=
link_to
"the opened issues"
,
issues_dashboard_path
contribute to
=
link_to
"merge requests"
,
merge_requests_dashboard_path
or mention someone in a comment to assign a new todo automatically.
-
else
%h4
.text-center
There are no todos to show.
-
else
.todos-empty
.todos-empty-hero
=
render
"shared/empty_states/todos_empty.svg"
.todos-empty-content
%h4
Todos let you see what you should do next.
%p
When an issue or merge request is assigned to you, or when you
%strong
@mention
in a comment, this will trigger a new item in your todo list, automatically.
%p
You will always know what to work on next.
-
elsif
current_user
.
todos
.
any?
.todos-all-done
=
render
"shared/empty_states/todos_all_done.svg"
-
if
todos_filter_empty?
%h4
.text-center
=
Gitlab
.
config
.
gitlab
.
no_todos_messages
.
sample
%p
.text-center
Are you looking for things to do? Take a look at
=
succeed
","
do
=
link_to
"the opened issues"
,
issues_dashboard_path
contribute to
=
link_to
"merge requests"
,
merge_requests_dashboard_path
or mention someone in a comment to assign a new todo automatically.
-
else
%h4
.text-center
There are no todos to show.
-
else
.todos-empty
.todos-empty-hero
=
render
"shared/empty_states/todos_empty.svg"
.todos-empty-content
%h4
Todos let you see what you should do next.
%p
When an issue or merge request is assigned to you, or when you
%strong
@mention
in a comment, this will trigger a new item in your todo list, automatically.
%p
You will always know what to work on next.
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