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
5e26745e
Commit
5e26745e
authored
Nov 23, 2016
by
Luis Alonso Chavez Armendariz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix title case to sentence case
parent
5c6d3a99
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
11 deletions
+15
-11
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+3
-3
changelogs/unreleased/issue_24748.yml
changelogs/unreleased/issue_24748.yml
+4
-0
doc/workflow/img/todos_add_todo_sidebar.png
doc/workflow/img/todos_add_todo_sidebar.png
+0
-0
doc/workflow/img/todos_mark_done_sidebar.png
doc/workflow/img/todos_mark_done_sidebar.png
+0
-0
doc/workflow/todos.md
doc/workflow/todos.md
+2
-2
spec/features/issues/todo_spec.rb
spec/features/issues/todo_spec.rb
+4
-4
spec/javascripts/fixtures/right_sidebar.html.haml
spec/javascripts/fixtures/right_sidebar.html.haml
+2
-2
No files found.
app/views/shared/issuable/_sidebar.html.haml
View file @
5e26745e
...
@@ -9,12 +9,12 @@
...
@@ -9,12 +9,12 @@
%a
.gutter-toggle.pull-right.js-sidebar-toggle
{
role:
"button"
,
href:
"#"
,
aria:
{
label:
"Toggle sidebar"
}
}
%a
.gutter-toggle.pull-right.js-sidebar-toggle
{
role:
"button"
,
href:
"#"
,
aria:
{
label:
"Toggle sidebar"
}
}
=
sidebar_gutter_toggle_icon
=
sidebar_gutter_toggle_icon
-
if
current_user
-
if
current_user
%button
.btn.btn-default.issuable-header-btn.pull-right.js-issuable-todo
{
type:
"button"
,
aria:
{
label:
(
todo
.
nil?
?
"Add
Todo"
:
"Mark Done"
)
},
data:
{
todo_text:
"Add Todo"
,
mark_text:
"Mark D
one"
,
issuable_id:
issuable
.
id
,
issuable_type:
issuable
.
class
.
name
.
underscore
,
url:
namespace_project_todos_path
(
@project
.
namespace
,
@project
),
delete_path:
(
dashboard_todo_path
(
todo
)
if
todo
)
}
}
%button
.btn.btn-default.issuable-header-btn.pull-right.js-issuable-todo
{
type:
"button"
,
aria:
{
label:
(
todo
.
nil?
?
"Add
todo"
:
"Mark done"
)
},
data:
{
todo_text:
"Add todo"
,
mark_text:
"Mark d
one"
,
issuable_id:
issuable
.
id
,
issuable_type:
issuable
.
class
.
name
.
underscore
,
url:
namespace_project_todos_path
(
@project
.
namespace
,
@project
),
delete_path:
(
dashboard_todo_path
(
todo
)
if
todo
)
}
}
%span
.js-issuable-todo-text
%span
.js-issuable-todo-text
-
if
todo
-
if
todo
Mark
D
one
Mark
d
one
-
else
-
else
Add
T
odo
Add
t
odo
=
icon
(
'spin spinner'
,
class:
'hidden js-issuable-todo-loading'
)
=
icon
(
'spin spinner'
,
class:
'hidden js-issuable-todo-loading'
)
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
format: :json
,
html:
{
class:
'issuable-context-form inline-update js-issuable-update'
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
format: :json
,
html:
{
class:
'issuable-context-form inline-update js-issuable-update'
}
do
|
f
|
...
...
changelogs/unreleased/issue_24748.yml
0 → 100644
View file @
5e26745e
---
title
:
Fix title case to sentence case
merge_request
:
author
:
Luis Alonso Chavez Armendariz
doc/workflow/img/todos_add_todo_sidebar.png
View replaced file @
5c6d3a99
View file @
5e26745e
32.6 KB
|
W:
|
H:
41.4 KB
|
W:
|
H:
2-up
Swipe
Onion skin
doc/workflow/img/todos_mark_done_sidebar.png
View replaced file @
5c6d3a99
View file @
5e26745e
32.9 KB
|
W:
|
H:
41.3 KB
|
W:
|
H:
2-up
Swipe
Onion skin
doc/workflow/todos.md
View file @
5e26745e
...
@@ -35,7 +35,7 @@ A Todo appears in your Todos dashboard when:
...
@@ -35,7 +35,7 @@ A Todo appears in your Todos dashboard when:
### Manually creating a Todo
### Manually creating a Todo
You can also add an issue or merge request to your Todos dashboard by clicking
You can also add an issue or merge request to your Todos dashboard by clicking
the "Add
T
odo" button in the issue or merge request sidebar.
the "Add
t
odo" button in the issue or merge request sidebar.
![
Adding a Todo from the issuable sidebar
](
img/todos_add_todo_sidebar.png
)
![
Adding a Todo from the issuable sidebar
](
img/todos_add_todo_sidebar.png
)
...
@@ -69,7 +69,7 @@ corresponding **Done** button, and it will disappear from your Todo list.
...
@@ -69,7 +69,7 @@ corresponding **Done** button, and it will disappear from your Todo list.
![
A Todo in the Todos dashboard
](
img/todo_list_item.png
)
![
A Todo in the Todos dashboard
](
img/todo_list_item.png
)
A Todo can also be marked as done from the issue or merge request sidebar using
A Todo can also be marked as done from the issue or merge request sidebar using
the "Mark
D
one" button.
the "Mark
d
one" button.
![
Mark Done from the issuable sidebar
](
img/todos_mark_done_sidebar.png
)
![
Mark Done from the issuable sidebar
](
img/todos_mark_done_sidebar.png
)
...
...
spec/features/issues/todo_spec.rb
View file @
5e26745e
...
@@ -13,8 +13,8 @@ feature 'Manually create a todo item from issue', feature: true, js: true do
...
@@ -13,8 +13,8 @@ feature 'Manually create a todo item from issue', feature: true, js: true do
it
'creates todo when clicking button'
do
it
'creates todo when clicking button'
do
page
.
within
'.issuable-sidebar'
do
page
.
within
'.issuable-sidebar'
do
click_button
'Add
T
odo'
click_button
'Add
t
odo'
expect
(
page
).
to
have_content
'Mark
D
one'
expect
(
page
).
to
have_content
'Mark
d
one'
end
end
page
.
within
'.header-content .todos-pending-count'
do
page
.
within
'.header-content .todos-pending-count'
do
...
@@ -30,8 +30,8 @@ feature 'Manually create a todo item from issue', feature: true, js: true do
...
@@ -30,8 +30,8 @@ feature 'Manually create a todo item from issue', feature: true, js: true do
it
'marks a todo as done'
do
it
'marks a todo as done'
do
page
.
within
'.issuable-sidebar'
do
page
.
within
'.issuable-sidebar'
do
click_button
'Add
T
odo'
click_button
'Add
t
odo'
click_button
'Mark
D
one'
click_button
'Mark
d
one'
end
end
expect
(
page
).
to
have_selector
(
'.todos-pending-count'
,
visible:
false
)
expect
(
page
).
to
have_selector
(
'.todos-pending-count'
,
visible:
false
)
...
...
spec/javascripts/fixtures/right_sidebar.html.haml
View file @
5e26745e
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
%div
.block.issuable-sidebar-header
%div
.block.issuable-sidebar-header
%a
.gutter-toggle.pull-right.js-sidebar-toggle
%a
.gutter-toggle.pull-right.js-sidebar-toggle
%i
.fa.fa-angle-double-left
%i
.fa.fa-angle-double-left
%button
.btn.btn-default.issuable-header-btn.pull-right.js-issuable-todo
{
type:
"button"
,
data:
{
todo_text:
"Add
Todo"
,
mark_text:
"Mark D
one"
,
issuable_id:
"1"
,
issuable_type:
"issue"
,
url:
"/todos"
}}
%button
.btn.btn-default.issuable-header-btn.pull-right.js-issuable-todo
{
type:
"button"
,
data:
{
todo_text:
"Add
todo"
,
mark_text:
"Mark d
one"
,
issuable_id:
"1"
,
issuable_type:
"issue"
,
url:
"/todos"
}}
%span
.js-issuable-todo-text
%span
.js-issuable-todo-text
Add
T
odo
Add
t
odo
%i
.fa.fa-spin.fa-spinner.js-issuable-todo-loading.hidden
%i
.fa.fa-spin.fa-spinner.js-issuable-todo-loading.hidden
%form
.issuable-context-form
%form
.issuable-context-form
...
...
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