GitLab steht Mittwoch, den 23. September, zwischen 10:00 und 12:00 Uhr aufgrund von Wartungsarbeiten nicht zur Verfügung.

Commit c17d8d55 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'issue_24748' into 'master'

Fix title case to sentence case in "Add Todo"

## What does this MR do?
Implements sentence case for `Add Todo`

## Are there points in the code the reviewer needs to double check?
I changed the images used in the file `doc/workflow/todos.md` to show the new look.

## Why was this MR needed?
#24748 

## Screenshots (if relevant)
Before
![Screen_Shot_2016-11-21_at_12.03.21_PM](/uploads/225abe2901aacccea697596853bdc52c/Screen_Shot_2016-11-21_at_12.03.21_PM.png)
![Screen_Shot_2016-11-21_at_11.58.17_AM](/uploads/3a5997eb6bb037f1c581d9925fa288ce/Screen_Shot_2016-11-21_at_11.58.17_AM.png)

After
![Screen_Shot_2016-11-21_at_12.03.38_PM](/uploads/3be4d58e5adaa10fab759f8726a4d257/Screen_Shot_2016-11-21_at_12.03.38_PM.png)
![Screen_Shot_2016-11-21_at_11.58.37_AM](/uploads/016cdb32cb1e87e9e3cfd89309b53a4a/Screen_Shot_2016-11-21_at_11.58.37_AM.png)


## Does this MR meet the acceptance criteria?

- [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [X] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
#24748

See merge request !7724
parents 2914fa39 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 Done", 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 done", 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 Done Mark done
- else - else
Add Todo Add todo
= 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|
......
---
title: Fix title case to sentence case
merge_request:
author: Luis Alonso Chavez Armendariz
...@@ -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 Todo" button in the issue or merge request sidebar. the "Add todo" 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 Done" button. the "Mark done" 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)
......
...@@ -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 Todo' click_button 'Add todo'
expect(page).to have_content 'Mark Done' expect(page).to have_content 'Mark done'
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 Todo' click_button 'Add todo'
click_button 'Mark Done' click_button 'Mark done'
end end
expect(page).to have_selector('.todos-pending-count', visible: false) expect(page).to have_selector('.todos-pending-count', visible: false)
......
...@@ -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 Done", 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 done", issuable_id: "1", issuable_type: "issue", url: "/todos" }}
%span.js-issuable-todo-text %span.js-issuable-todo-text
Add Todo Add todo
%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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment