diff --git a/ChangeLog b/ChangeLog
index c90d6ae2a..c549322b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Version 1.0.27 (unreleased)
Improvements:
+* Added Ajax loading icon for submit buttons
* Added support for HTTP header "X-Forwarded-Proto: https"
Security issues:
diff --git a/app/Template/action/event.php b/app/Template/action/event.php
index b4741a98c..f4f12db33 100644
--- a/app/Template/action/event.php
+++ b/app/Template/action/event.php
@@ -18,7 +18,7 @@
-
+ = t('Next step') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id'])) ?>
diff --git a/app/Template/action/index.php b/app/Template/action/index.php
index f31652519..6e9c16a52 100644
--- a/app/Template/action/index.php
+++ b/app/Template/action/index.php
@@ -70,6 +70,6 @@
= $this->form->select('action_name', $available_actions, $values) ?>
-
+ = t('Next step') ?>
\ No newline at end of file
diff --git a/app/Template/action/params.php b/app/Template/action/params.php
index a2350dead..99e9206f9 100644
--- a/app/Template/action/params.php
+++ b/app/Template/action/params.php
@@ -42,7 +42,7 @@
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id'])) ?>
diff --git a/app/Template/analytic/burndown.php b/app/Template/analytic/burndown.php
index 3dfb6ee81..ed6c8aeb9 100644
--- a/app/Template/analytic/burndown.php
+++ b/app/Template/analytic/burndown.php
@@ -27,7 +27,7 @@
-
+ = t('Execute') ?>
diff --git a/app/Template/analytic/cfd.php b/app/Template/analytic/cfd.php
index 45f53e0fe..ee259c700 100644
--- a/app/Template/analytic/cfd.php
+++ b/app/Template/analytic/cfd.php
@@ -27,6 +27,6 @@
-
+ = t('Execute') ?>
diff --git a/app/Template/analytic/lead_cycle_time.php b/app/Template/analytic/lead_cycle_time.php
index 8e04bd6d3..82ffe5347 100644
--- a/app/Template/analytic/lead_cycle_time.php
+++ b/app/Template/analytic/lead_cycle_time.php
@@ -31,7 +31,7 @@
-
+ = t('Execute') ?>
diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php
index 3fcb6bbf0..cc5621706 100644
--- a/app/Template/auth/index.php
+++ b/app/Template/auth/index.php
@@ -28,7 +28,7 @@
-
+ = t('Sign in') ?>
app->config('password_reset') == 1): ?>
diff --git a/app/Template/board/popover_assignee.php b/app/Template/board/popover_assignee.php
index 8db953235..a64dfb041 100644
--- a/app/Template/board/popover_assignee.php
+++ b/app/Template/board/popover_assignee.php
@@ -12,7 +12,7 @@
= $this->task->selectAssignee($users_list, $values, array(), array('autofocus')) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/board/popover_category.php b/app/Template/board/popover_category.php
index e65593cd2..190780793 100644
--- a/app/Template/board/popover_category.php
+++ b/app/Template/board/popover_category.php
@@ -12,7 +12,7 @@
= $this->task->selectCategory($categories_list, $values, array(), array('autofocus'), true) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/board/popover_close_all_tasks_column.php b/app/Template/board/popover_close_all_tasks_column.php
index da6b9ad75..5090f4996 100644
--- a/app/Template/board/popover_close_all_tasks_column.php
+++ b/app/Template/board/popover_close_all_tasks_column.php
@@ -10,7 +10,7 @@
= t('%d task(s) in the column "%s" and the swimlane "%s" will be closed.', $nb_tasks, $column, $swimlane) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/category/edit.php b/app/Template/category/edit.php
index d788f6738..78156e6fe 100644
--- a/app/Template/category/edit.php
+++ b/app/Template/category/edit.php
@@ -33,7 +33,7 @@
= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/category/index.php b/app/Template/category/index.php
index 7b1adf783..b3bdfd813 100644
--- a/app/Template/category/index.php
+++ b/app/Template/category/index.php
@@ -40,6 +40,6 @@
= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
-
+ = t('Save') ?>
\ No newline at end of file
diff --git a/app/Template/column/create.php b/app/Template/column/create.php
index 58b130f57..747b15298 100644
--- a/app/Template/column/create.php
+++ b/app/Template/column/create.php
@@ -34,7 +34,7 @@
= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/column/edit.php b/app/Template/column/edit.php
index 618cb1342..206322cd1 100644
--- a/app/Template/column/edit.php
+++ b/app/Template/column/edit.php
@@ -37,7 +37,7 @@
= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/comment/create.php b/app/Template/comment/create.php
index 15dd3a8e8..574eec9f5 100644
--- a/app/Template/comment/create.php
+++ b/app/Template/comment/create.php
@@ -37,7 +37,7 @@
= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?>
-
+
= t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/comment/edit.php b/app/Template/comment/edit.php
index 6db952ccc..ad6f58fb0 100644
--- a/app/Template/comment/edit.php
+++ b/app/Template/comment/edit.php
@@ -29,7 +29,7 @@
= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/config/application.php b/app/Template/config/application.php
index d78ae4271..259756bc6 100644
--- a/app/Template/config/application.php
+++ b/app/Template/config/application.php
@@ -33,6 +33,6 @@
= $this->hook->render('template:config:application', array('values' => $values, 'errors' => $errors)) ?>
-
+ = t('Save') ?>
diff --git a/app/Template/config/board.php b/app/Template/config/board.php
index f787a9312..ba1bab593 100644
--- a/app/Template/config/board.php
+++ b/app/Template/config/board.php
@@ -18,6 +18,6 @@
= t('Frequency in second (0 to disable this feature, 10 seconds by default)') ?>
-
+ = t('Save') ?>
diff --git a/app/Template/config/calendar.php b/app/Template/config/calendar.php
index f5250132c..b7b230dfa 100644
--- a/app/Template/config/calendar.php
+++ b/app/Template/config/calendar.php
@@ -28,7 +28,7 @@
-
+ = t('Save') ?>
\ No newline at end of file
diff --git a/app/Template/config/integrations.php b/app/Template/config/integrations.php
index ced051f7e..e404c52ee 100644
--- a/app/Template/config/integrations.php
+++ b/app/Template/config/integrations.php
@@ -12,6 +12,6 @@
-
+ = t('Save') ?>
\ No newline at end of file
diff --git a/app/Template/config/project.php b/app/Template/config/project.php
index 1d32a14f6..b6b7ec25e 100644
--- a/app/Template/config/project.php
+++ b/app/Template/config/project.php
@@ -22,6 +22,6 @@
= $this->form->checkbox('cfd_include_closed_tasks', t('Include closed tasks in the cumulative flow diagram'), 1, $values['cfd_include_closed_tasks'] == 1) ?>
-
+ = t('Save') ?>
diff --git a/app/Template/config/webhook.php b/app/Template/config/webhook.php
index bcf957871..b96979a0e 100644
--- a/app/Template/config/webhook.php
+++ b/app/Template/config/webhook.php
@@ -10,7 +10,7 @@
= $this->form->text('webhook_url', $values, $errors) ?>
-
+ = t('Save') ?>
diff --git a/app/Template/currency/index.php b/app/Template/currency/index.php
index f3e20026a..d35ac4594 100644
--- a/app/Template/currency/index.php
+++ b/app/Template/currency/index.php
@@ -32,7 +32,7 @@
= $this->form->select('application_currency', $currencies, $config_values, $errors) ?>
-
+ = t('Save') ?>
@@ -49,6 +49,6 @@
= $this->form->text('rate', $values, $errors, array(), 'form-numeric') ?>
-
+ = t('Save') ?>
diff --git a/app/Template/custom_filter/add.php b/app/Template/custom_filter/add.php
index 361083ee5..e3e144ae9 100644
--- a/app/Template/custom_filter/add.php
+++ b/app/Template/custom_filter/add.php
@@ -19,6 +19,6 @@
= $this->form->checkbox('append', t('Append filter (instead of replacement)'), 1) ?>
-
+ = t('Save') ?>
\ No newline at end of file
diff --git a/app/Template/custom_filter/edit.php b/app/Template/custom_filter/edit.php
index 01fb4ec59..5d07e8c22 100644
--- a/app/Template/custom_filter/edit.php
+++ b/app/Template/custom_filter/edit.php
@@ -25,7 +25,7 @@
= $this->form->checkbox('append', t('Append filter (instead of replacement)'), 1, $values['append'] == 1) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'customfilter', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/export/subtasks.php b/app/Template/export/subtasks.php
index f2a00f849..a82cb3d1f 100644
--- a/app/Template/export/subtasks.php
+++ b/app/Template/export/subtasks.php
@@ -19,6 +19,6 @@
= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?>
-
+ = t('Execute') ?>
\ No newline at end of file
diff --git a/app/Template/export/summary.php b/app/Template/export/summary.php
index 0c2a96fb5..60aa306f7 100644
--- a/app/Template/export/summary.php
+++ b/app/Template/export/summary.php
@@ -19,6 +19,6 @@
= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?>
-
+ = t('Execute') ?>
\ No newline at end of file
diff --git a/app/Template/export/tasks.php b/app/Template/export/tasks.php
index c27149d26..bed8ab907 100644
--- a/app/Template/export/tasks.php
+++ b/app/Template/export/tasks.php
@@ -19,6 +19,6 @@
= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?>
-
+ = t('Execute') ?>
\ No newline at end of file
diff --git a/app/Template/export/transitions.php b/app/Template/export/transitions.php
index d935bde17..093930a3c 100644
--- a/app/Template/export/transitions.php
+++ b/app/Template/export/transitions.php
@@ -19,6 +19,6 @@
= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?>
-
+ = t('Execute') ?>
\ No newline at end of file
diff --git a/app/Template/gantt/task_creation.php b/app/Template/gantt/task_creation.php
index a08f41b4f..ef1298a9c 100644
--- a/app/Template/gantt/task_creation.php
+++ b/app/Template/gantt/task_creation.php
@@ -43,7 +43,7 @@
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/group/associate.php b/app/Template/group/associate.php
index 468281e20..9de46f35a 100644
--- a/app/Template/group/associate.php
+++ b/app/Template/group/associate.php
@@ -16,7 +16,7 @@
= $this->form->select('user_id', $users, $values, $errors, array('required'), 'chosen-select') ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'group', 'index') ?>
diff --git a/app/Template/group/create.php b/app/Template/group/create.php
index 4a935c08a..4ce6b1f3b 100644
--- a/app/Template/group/create.php
+++ b/app/Template/group/create.php
@@ -11,7 +11,7 @@
= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'group', 'index') ?>
diff --git a/app/Template/group/edit.php b/app/Template/group/edit.php
index d9646ee84..e9d9dd5a1 100644
--- a/app/Template/group/edit.php
+++ b/app/Template/group/edit.php
@@ -14,7 +14,7 @@
= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'group', 'index') ?>
diff --git a/app/Template/link/create.php b/app/Template/link/create.php
index 2b4ac62c7..3b36abee9 100644
--- a/app/Template/link/create.php
+++ b/app/Template/link/create.php
@@ -13,6 +13,6 @@
= $this->form->text('opposite_label', $values, $errors) ?>
-
+ = t('Save') ?>
\ No newline at end of file
diff --git a/app/Template/link/edit.php b/app/Template/link/edit.php
index 516de4640..e91422bee 100644
--- a/app/Template/link/edit.php
+++ b/app/Template/link/edit.php
@@ -14,7 +14,7 @@
= $this->form->select('opposite_id', $labels, $values, $errors) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'link', 'index') ?>
diff --git a/app/Template/password_reset/change.php b/app/Template/password_reset/change.php
index 6d06f442c..0a1d8de48 100644
--- a/app/Template/password_reset/change.php
+++ b/app/Template/password_reset/change.php
@@ -10,7 +10,7 @@
= $this->form->password('confirmation', $values, $errors) ?>
-
+ = t('Change Password') ?>
\ No newline at end of file
diff --git a/app/Template/password_reset/create.php b/app/Template/password_reset/create.php
index ef9580117..918a0eb48 100644
--- a/app/Template/password_reset/create.php
+++ b/app/Template/password_reset/create.php
@@ -11,7 +11,7 @@
= $this->form->text('captcha', array(), $errors, array('required')) ?>
-
+ = t('Change Password') ?>
\ No newline at end of file
diff --git a/app/Template/project/duplicate.php b/app/Template/project/duplicate.php
index ca7d33024..7cfa89692 100644
--- a/app/Template/project/duplicate.php
+++ b/app/Template/project/duplicate.php
@@ -20,7 +20,7 @@
= $this->form->checkbox('task', t('Tasks'), 1, false) ?>
-
+ = t('Duplicate') ?>
= t('or') ?> = $this->url->link(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?>
diff --git a/app/Template/project/notifications.php b/app/Template/project/notifications.php
index b39d6c056..494a322a3 100644
--- a/app/Template/project/notifications.php
+++ b/app/Template/project/notifications.php
@@ -12,7 +12,7 @@
= $this->form->checkboxes('notification_types', $types, $notifications) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?>
diff --git a/app/Template/project_creation/create.php b/app/Template/project_creation/create.php
index 46ec5d1eb..c34173a94 100644
--- a/app/Template/project_creation/create.php
+++ b/app/Template/project_creation/create.php
@@ -29,7 +29,7 @@
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'project', 'index', array(), false, 'close-popover') ?>
diff --git a/app/Template/project_edit/dates.php b/app/Template/project_edit/dates.php
index cb585c6af..836515927 100644
--- a/app/Template/project_edit/dates.php
+++ b/app/Template/project_edit/dates.php
@@ -19,7 +19,7 @@
= $this->form->text('end_date', $values, $errors, array('maxlength="10"'), 'form-date') ?>
-
+ = t('Save') ?>
diff --git a/app/Template/project_edit/description.php b/app/Template/project_edit/description.php
index dce8ab105..6bfe8b8d0 100644
--- a/app/Template/project_edit/description.php
+++ b/app/Template/project_edit/description.php
@@ -32,6 +32,6 @@
= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?>
-
+ = t('Save') ?>
diff --git a/app/Template/project_edit/general.php b/app/Template/project_edit/general.php
index 28cbb66a1..5e6d32b4f 100644
--- a/app/Template/project_edit/general.php
+++ b/app/Template/project_edit/general.php
@@ -31,6 +31,6 @@
-
+ = t('Save') ?>
diff --git a/app/Template/project_edit/task_priority.php b/app/Template/project_edit/task_priority.php
index e54215b2a..faf49f5de 100644
--- a/app/Template/project_edit/task_priority.php
+++ b/app/Template/project_edit/task_priority.php
@@ -22,7 +22,7 @@
= $this->form->number('priority_end', $values, $errors) ?>
-
+ = t('Save') ?>
diff --git a/app/Template/project_permission/index.php b/app/Template/project_permission/index.php
index 6135ad9d5..a7d666a67 100644
--- a/app/Template/project_permission/index.php
+++ b/app/Template/project_permission/index.php
@@ -57,7 +57,7 @@
= $this->form->select('role', $roles, $values, $errors) ?>
-
+ = t('Add') ?>
@@ -119,7 +119,7 @@
= $this->form->select('role', $roles, $values, $errors) ?>
-
+ = t('Add') ?>
@@ -135,7 +135,7 @@
= $this->form->checkbox('is_everybody_allowed', t('Allow everybody to access to this project'), 1, $project['is_everybody_allowed']) ?>
-
+ = t('Save') ?>
diff --git a/app/Template/subtask/create.php b/app/Template/subtask/create.php
index 8fffd3a9c..029fddf55 100644
--- a/app/Template/subtask/create.php
+++ b/app/Template/subtask/create.php
@@ -13,7 +13,7 @@
= $this->form->checkbox('another_subtask', t('Create another sub-task'), 1, isset($values['another_subtask']) && $values['another_subtask'] == 1) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/subtask/edit.php b/app/Template/subtask/edit.php
index acce625ef..3c210f60f 100644
--- a/app/Template/subtask/edit.php
+++ b/app/Template/subtask/edit.php
@@ -13,7 +13,7 @@
= $this->subtask->selectTimeSpent($values, $errors) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/subtask/show.php b/app/Template/subtask/show.php
index b0326c481..999016c33 100644
--- a/app/Template/subtask/show.php
+++ b/app/Template/subtask/show.php
@@ -13,7 +13,7 @@
= $this->form->text('title', array(), array(), array('required', 'placeholder="'.t('Type here to create a new sub-task').'"')) ?>
= $this->form->numeric('time_estimated', array(), array(), array('placeholder="'.t('Original estimate').'"')) ?>
= $this->form->select('user_id', $users_list, array(), array(), array('placeholder="'.t('Assignee').'"')) ?>
-
+ = t('Add') ?>
diff --git a/app/Template/subtask_restriction/popover.php b/app/Template/subtask_restriction/popover.php
index e80d6b6dc..916a664ee 100644
--- a/app/Template/subtask_restriction/popover.php
+++ b/app/Template/subtask_restriction/popover.php
@@ -10,7 +10,7 @@
= $this->form->hidden('id', $subtask_inprogress) ?>
diff --git a/app/Template/swimlane/create.php b/app/Template/swimlane/create.php
index bb3895558..aa92a9308 100644
--- a/app/Template/swimlane/create.php
+++ b/app/Template/swimlane/create.php
@@ -30,7 +30,7 @@
= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'Swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/swimlane/edit.php b/app/Template/swimlane/edit.php
index 31d819d43..232570e71 100644
--- a/app/Template/swimlane/edit.php
+++ b/app/Template/swimlane/edit.php
@@ -34,7 +34,7 @@
= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/swimlane/edit_default.php b/app/Template/swimlane/edit_default.php
index df25ec123..3bf825685 100644
--- a/app/Template/swimlane/edit_default.php
+++ b/app/Template/swimlane/edit_default.php
@@ -11,7 +11,7 @@
= $this->form->checkbox('show_default_swimlane', t('Show default swimlane'), 1, $values['show_default_swimlane'] == 1) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'Swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/task_creation/form.php b/app/Template/task_creation/form.php
index 84f74c369..0af2eb1e9 100644
--- a/app/Template/task_creation/form.php
+++ b/app/Template/task_creation/form.php
@@ -60,7 +60,7 @@
-
+ = t('Save') ?>
= t('or') ?> = $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?>
\ No newline at end of file
diff --git a/app/Template/task_duplication/copy.php b/app/Template/task_duplication/copy.php
index fe2c599a1..b7337a1e2 100644
--- a/app/Template/task_duplication/copy.php
+++ b/app/Template/task_duplication/copy.php
@@ -39,7 +39,7 @@
= t('Current assignee: %s', ($task['assignee_name'] ?: $task['assignee_username']) ?: e('not assigned')) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/task_duplication/move.php b/app/Template/task_duplication/move.php
index 8ab81f5bf..beebf9eb0 100644
--- a/app/Template/task_duplication/move.php
+++ b/app/Template/task_duplication/move.php
@@ -39,7 +39,7 @@
= t('Current assignee: %s', ($task['assignee_name'] ?: $task['assignee_username']) ?: e('not assigned')) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/task_external_link/create.php b/app/Template/task_external_link/create.php
index b62abdb25..5d49eef0c 100644
--- a/app/Template/task_external_link/create.php
+++ b/app/Template/task_external_link/create.php
@@ -6,7 +6,7 @@
= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/task_external_link/edit.php b/app/Template/task_external_link/edit.php
index 8caaaebe0..dcbc26333 100644
--- a/app/Template/task_external_link/edit.php
+++ b/app/Template/task_external_link/edit.php
@@ -6,7 +6,7 @@
= $this->render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/task_external_link/find.php b/app/Template/task_external_link/find.php
index 36a031d38..3977a66c4 100644
--- a/app/Template/task_external_link/find.php
+++ b/app/Template/task_external_link/find.php
@@ -21,7 +21,7 @@
= $this->form->select('type', $types, $values) ?>
-
+ = t('Next') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/task_file/screenshot.php b/app/Template/task_file/screenshot.php
index 72214362b..2880478db 100644
--- a/app/Template/task_file/screenshot.php
+++ b/app/Template/task_file/screenshot.php
@@ -10,7 +10,7 @@
= $this->form->csrf() ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/task_import/step1.php b/app/Template/task_import/step1.php
index 7619216ae..abb435058 100644
--- a/app/Template/task_import/step1.php
+++ b/app/Template/task_import/step1.php
@@ -16,7 +16,7 @@
= t('Maximum size: ') ?>= is_integer($max_size) ? $this->text->bytes($max_size) : $max_size ?>
-
+ = t('Import') ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/task_recurrence/edit.php b/app/Template/task_recurrence/edit.php
index ce69aade6..0f5d611ae 100644
--- a/app/Template/task_recurrence/edit.php
+++ b/app/Template/task_recurrence/edit.php
@@ -38,7 +38,7 @@
= $this->form->select('recurrence_basedate', $recurrence_basedate_list, $values, $errors) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/tasklink/create.php b/app/Template/tasklink/create.php
index c0d49191d..02d38a9b8 100644
--- a/app/Template/tasklink/create.php
+++ b/app/Template/tasklink/create.php
@@ -26,7 +26,7 @@
'autocomplete') ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
diff --git a/app/Template/tasklink/edit.php b/app/Template/tasklink/edit.php
index 896f84c0f..15afe047b 100644
--- a/app/Template/tasklink/edit.php
+++ b/app/Template/tasklink/edit.php
@@ -27,7 +27,7 @@
'autocomplete') ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
diff --git a/app/Template/tasklink/show.php b/app/Template/tasklink/show.php
index 82c3d6c94..8527a344e 100644
--- a/app/Template/tasklink/show.php
+++ b/app/Template/tasklink/show.php
@@ -104,7 +104,7 @@
),
'autocomplete') ?>
-
+ = t('Add') ?>
diff --git a/app/Template/twofactor/check.php b/app/Template/twofactor/check.php
index 68a58a6c7..b0cb48251 100644
--- a/app/Template/twofactor/check.php
+++ b/app/Template/twofactor/check.php
@@ -5,6 +5,6 @@
= $this->form->text('code', array(), array(), array('placeholder="123456"', 'autofocus'), 'form-numeric') ?>
-
+ = t('Check my code') ?>
\ No newline at end of file
diff --git a/app/Template/twofactor/index.php b/app/Template/twofactor/index.php
index 6e7012730..6de365146 100644
--- a/app/Template/twofactor/index.php
+++ b/app/Template/twofactor/index.php
@@ -7,9 +7,9 @@
= t('Two-Factor Provider: ') ?>= $this->text->e($provider) ?>
-
+ = t('Disable two-factor authentication') ?>
-
+ = t('Enable two-factor authentication') ?>
diff --git a/app/Template/twofactor/show.php b/app/Template/twofactor/show.php
index df4080359..59897e203 100644
--- a/app/Template/twofactor/show.php
+++ b/app/Template/twofactor/show.php
@@ -26,6 +26,6 @@
= $this->form->text('code', array(), array(), array('placeholder="123456"', 'autofocus'), 'form-numeric') ?>
-
+ = t('Check my code') ?>
\ No newline at end of file
diff --git a/app/Template/user/authentication.php b/app/Template/user/authentication.php
index 0c08f3fba..6cfd4e577 100644
--- a/app/Template/user/authentication.php
+++ b/app/Template/user/authentication.php
@@ -14,7 +14,7 @@
= $this->form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
diff --git a/app/Template/user/create_local.php b/app/Template/user/create_local.php
index 38bd7836f..7257456d8 100644
--- a/app/Template/user/create_local.php
+++ b/app/Template/user/create_local.php
@@ -44,7 +44,7 @@
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'user', 'index') ?>
diff --git a/app/Template/user/create_remote.php b/app/Template/user/create_remote.php
index 7399a0107..05acbba1c 100644
--- a/app/Template/user/create_remote.php
+++ b/app/Template/user/create_remote.php
@@ -41,7 +41,7 @@
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'user', 'index') ?>
diff --git a/app/Template/user/edit.php b/app/Template/user/edit.php
index f7f67fb78..7b51eb731 100644
--- a/app/Template/user/edit.php
+++ b/app/Template/user/edit.php
@@ -28,7 +28,7 @@
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
diff --git a/app/Template/user/notifications.php b/app/Template/user/notifications.php
index 7223013c7..2a5c81524 100644
--- a/app/Template/user/notifications.php
+++ b/app/Template/user/notifications.php
@@ -22,7 +22,7 @@
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
diff --git a/app/Template/user/password.php b/app/Template/user/password.php
index a24a4ee4a..ea6e997d3 100644
--- a/app/Template/user/password.php
+++ b/app/Template/user/password.php
@@ -19,7 +19,7 @@
= $this->form->password('confirmation', $values, $errors) ?>
-
+ = t('Save') ?>
= t('or') ?>
= $this->url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
diff --git a/app/Template/user_import/step1.php b/app/Template/user_import/step1.php
index 69643d6df..592587a3e 100644
--- a/app/Template/user_import/step1.php
+++ b/app/Template/user_import/step1.php
@@ -26,7 +26,7 @@
= t('Maximum size: ') ?>= is_integer($max_size) ? $this->text->bytes($max_size) : $max_size ?>
-
+ = t('Import') ?>