summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Locales/de_DE/translations.php1
-rw-r--r--app/Locales/es_ES/translations.php1
-rw-r--r--app/Locales/fi_FI/translations.php1
-rw-r--r--app/Locales/fr_FR/translations.php1
-rw-r--r--app/Locales/pl_PL/translations.php1
-rw-r--r--app/Locales/pt_BR/translations.php1
-rw-r--r--app/Locales/sv_SE/translations.php1
-rw-r--r--app/Locales/zh_CN/translations.php1
-rw-r--r--app/Templates/notification_comment_creation.php3
-rw-r--r--app/Templates/notification_comment_update.php3
-rw-r--r--app/Templates/notification_file_creation.php3
-rw-r--r--app/Templates/notification_footer.php6
-rw-r--r--app/Templates/notification_subtask_creation.php3
-rw-r--r--app/Templates/notification_subtask_update.php3
-rw-r--r--app/Templates/notification_task_close.php3
-rw-r--r--app/Templates/notification_task_creation.php3
-rw-r--r--app/Templates/notification_task_due.php3
-rw-r--r--app/Templates/notification_task_open.php3
-rw-r--r--app/Templates/notification_task_update.php3
-rw-r--r--config.default.php3
-rw-r--r--docs/email-configuration.markdown20
21 files changed, 47 insertions, 20 deletions
diff --git a/app/Locales/de_DE/translations.php b/app/Locales/de_DE/translations.php
index a504b865..48f365ff 100644
--- a/app/Locales/de_DE/translations.php
+++ b/app/Locales/de_DE/translations.php
@@ -422,4 +422,5 @@ return array(
// '[%s][Due tasks]' => '',
// '[Kanboard] Notification' => '',
// 'I want to receive notifications only for those projects:' => '',
+ // 'view the task on Kanboard' => '',
);
diff --git a/app/Locales/es_ES/translations.php b/app/Locales/es_ES/translations.php
index 157a8658..4e86b766 100644
--- a/app/Locales/es_ES/translations.php
+++ b/app/Locales/es_ES/translations.php
@@ -420,4 +420,5 @@ return array(
// '[%s][Due tasks]' => '',
// '[Kanboard] Notification' => '',
// 'I want to receive notifications only for those projects:' => '',
+ // 'view the task on Kanboard' => '',
);
diff --git a/app/Locales/fi_FI/translations.php b/app/Locales/fi_FI/translations.php
index f593c8af..4a85630e 100644
--- a/app/Locales/fi_FI/translations.php
+++ b/app/Locales/fi_FI/translations.php
@@ -420,4 +420,5 @@ return array(
// '[%s][Due tasks]' => '',
// '[Kanboard] Notification' => '',
// 'I want to receive notifications only for those projects:' => '',
+ // 'view the task on Kanboard' => '',
);
diff --git a/app/Locales/fr_FR/translations.php b/app/Locales/fr_FR/translations.php
index 5fa689d0..8952c2d1 100644
--- a/app/Locales/fr_FR/translations.php
+++ b/app/Locales/fr_FR/translations.php
@@ -418,4 +418,5 @@ return array(
'[%s][Due tasks]' => '[%s][Tâches expirées]',
'[Kanboard] Notification' => '[Kanboard] Notification',
'I want to receive notifications only for those projects:' => 'Je souhaite reçevoir les notifications uniquement pour les projets sélectionnés :',
+ 'view the task on Kanboard' => 'voir la tâche sur Kanboard',
);
diff --git a/app/Locales/pl_PL/translations.php b/app/Locales/pl_PL/translations.php
index b8893744..11885399 100644
--- a/app/Locales/pl_PL/translations.php
+++ b/app/Locales/pl_PL/translations.php
@@ -422,4 +422,5 @@ return array(
// '[%s][Due tasks]' => '',
// '[Kanboard] Notification' => '',
// 'I want to receive notifications only for those projects:' => '',
+ // 'view the task on Kanboard' => '',
);
diff --git a/app/Locales/pt_BR/translations.php b/app/Locales/pt_BR/translations.php
index 7ba45966..696512f4 100644
--- a/app/Locales/pt_BR/translations.php
+++ b/app/Locales/pt_BR/translations.php
@@ -423,4 +423,5 @@ return array(
// '[%s][Due tasks]' => '',
// '[Kanboard] Notification' => '',
// 'I want to receive notifications only for those projects:' => '',
+ // 'view the task on Kanboard' => '',
);
diff --git a/app/Locales/sv_SE/translations.php b/app/Locales/sv_SE/translations.php
index 1c1bb199..6d656d30 100644
--- a/app/Locales/sv_SE/translations.php
+++ b/app/Locales/sv_SE/translations.php
@@ -421,4 +421,5 @@ return array(
// '[%s][Due tasks]' => '',
// '[Kanboard] Notification' => '',
// 'I want to receive notifications only for those projects:' => '',
+ // 'view the task on Kanboard' => '',
);
diff --git a/app/Locales/zh_CN/translations.php b/app/Locales/zh_CN/translations.php
index c9adf0cd..9509fc52 100644
--- a/app/Locales/zh_CN/translations.php
+++ b/app/Locales/zh_CN/translations.php
@@ -426,4 +426,5 @@ return array(
// '[%s][Task opened] %s (#%d)' => '',
// '[%s][Due tasks]' => '',
// '[Kanboard] Notification' => '',
+ // 'view the task on Kanboard' => '',
);
diff --git a/app/Templates/notification_comment_creation.php b/app/Templates/notification_comment_creation.php
index 79d34f90..44662eca 100644
--- a/app/Templates/notification_comment_creation.php
+++ b/app/Templates/notification_comment_creation.php
@@ -4,5 +4,4 @@
<?= Helper\parse($comment['comment']) ?>
-<hr/>
-<p>Kanboard</p> \ No newline at end of file
+<?= Helper\template('notification_footer', array('task' => $task)) ?> \ No newline at end of file
diff --git a/app/Templates/notification_comment_update.php b/app/Templates/notification_comment_update.php
index 9dbd2332..1c279737 100644
--- a/app/Templates/notification_comment_update.php
+++ b/app/Templates/notification_comment_update.php
@@ -4,5 +4,4 @@
<?= Helper\parse($comment['comment']) ?>
-<hr/>
-<p>Kanboard</p> \ No newline at end of file
+<?= Helper\template('notification_footer', array('task' => $task)) ?> \ No newline at end of file
diff --git a/app/Templates/notification_file_creation.php b/app/Templates/notification_file_creation.php
index 57d69f51..50f4a2d5 100644
--- a/app/Templates/notification_file_creation.php
+++ b/app/Templates/notification_file_creation.php
@@ -2,5 +2,4 @@
<h3><?= t('New attachment added "%s"', $file['name']) ?></h3>
-<hr/>
-<p>Kanboard</p> \ No newline at end of file
+<?= Helper\template('notification_footer', array('task' => $task)) ?> \ No newline at end of file
diff --git a/app/Templates/notification_footer.php b/app/Templates/notification_footer.php
new file mode 100644
index 00000000..f0c9c0d4
--- /dev/null
+++ b/app/Templates/notification_footer.php
@@ -0,0 +1,6 @@
+<hr/>
+Kanboard
+
+<?php if (defined('KANBOARD_URL')): ?>
+ - <a href="<?= KANBOARD_URL.'?controller=task&action=show&task_id='.$task['id'] ?>"><?= t('view the task on Kanboard') ?></a>.
+<?php endif ?>
diff --git a/app/Templates/notification_subtask_creation.php b/app/Templates/notification_subtask_creation.php
index e02ceaf0..c382355c 100644
--- a/app/Templates/notification_subtask_creation.php
+++ b/app/Templates/notification_subtask_creation.php
@@ -14,5 +14,4 @@
</li>
</ul>
-<hr/>
-<p>Kanboard</p>
+<?= Helper\template('notification_footer', array('task' => $task)) ?> \ No newline at end of file
diff --git a/app/Templates/notification_subtask_update.php b/app/Templates/notification_subtask_update.php
index 5ec5ed05..ad6dfdc9 100644
--- a/app/Templates/notification_subtask_update.php
+++ b/app/Templates/notification_subtask_update.php
@@ -18,5 +18,4 @@
</li>
</ul>
-<hr/>
-<p>Kanboard</p> \ No newline at end of file
+<?= Helper\template('notification_footer', array('task' => $task)) ?> \ No newline at end of file
diff --git a/app/Templates/notification_task_close.php b/app/Templates/notification_task_close.php
index 8b8cedb3..d9b2dce6 100644
--- a/app/Templates/notification_task_close.php
+++ b/app/Templates/notification_task_close.php
@@ -2,5 +2,4 @@
<p><?= t('The task #%d have been closed.', $task['id']) ?></p>
-<hr/>
-<p>Kanboard</p> \ No newline at end of file
+<?= Helper\template('notification_footer', array('task' => $task)) ?> \ No newline at end of file
diff --git a/app/Templates/notification_task_creation.php b/app/Templates/notification_task_creation.php
index 69beda92..0ec5bfc6 100644
--- a/app/Templates/notification_task_creation.php
+++ b/app/Templates/notification_task_creation.php
@@ -40,5 +40,4 @@
<?= Helper\parse($task['description']) ?>
<?php endif ?>
-<hr/>
-<p>Kanboard</p> \ No newline at end of file
+<?= Helper\template('notification_footer', array('task' => $task)) ?> \ No newline at end of file
diff --git a/app/Templates/notification_task_due.php b/app/Templates/notification_task_due.php
index 1686c7de..3a7089cf 100644
--- a/app/Templates/notification_task_due.php
+++ b/app/Templates/notification_task_due.php
@@ -6,5 +6,4 @@
<?php endforeach ?>
</ul>
-<hr/>
-<p>Kanboard</p> \ No newline at end of file
+<?= Helper\template('notification_footer', array('task' => $task)) ?> \ No newline at end of file
diff --git a/app/Templates/notification_task_open.php b/app/Templates/notification_task_open.php
index 2ef0f04f..7bf674cc 100644
--- a/app/Templates/notification_task_open.php
+++ b/app/Templates/notification_task_open.php
@@ -2,5 +2,4 @@
<p><?= t('The task #%d have been opened.', $task['id']) ?></p>
-<hr/>
-<p>Kanboard</p> \ No newline at end of file
+<?= Helper\template('notification_footer', array('task' => $task)) ?> \ No newline at end of file
diff --git a/app/Templates/notification_task_update.php b/app/Templates/notification_task_update.php
index 3f61dd2f..21c1c3aa 100644
--- a/app/Templates/notification_task_update.php
+++ b/app/Templates/notification_task_update.php
@@ -40,5 +40,4 @@
<?= Helper\parse($task['description']) ?: t('There is no description.') ?>
<?php endif ?>
-<hr/>
-<p>Kanboard</p> \ No newline at end of file
+<?= Helper\template('notification_footer', array('task' => $task)) ?> \ No newline at end of file
diff --git a/config.default.php b/config.default.php
index 6986cd48..6206f37e 100644
--- a/config.default.php
+++ b/config.default.php
@@ -1,5 +1,8 @@
<?php
+// Your Kanboard base URL, example: http://demo.kanboard.net/ (used by email notifications or CLI scripts)
+define('KANBOARD_URL', '');
+
// E-mail address for the "From" header (notifications)
define('MAIL_FROM', 'notifications@kanboard.net');
diff --git a/docs/email-configuration.markdown b/docs/email-configuration.markdown
index 974f972e..63ed9789 100644
--- a/docs/email-configuration.markdown
+++ b/docs/email-configuration.markdown
@@ -90,3 +90,23 @@ Here a example:
# Everyday at 8am we check for due tasks
0 8 * * * cd /path/to/kanboard && ./kanboard send-notifications-due-tasks >/dev/null 2>&1
```
+
+### How to display a link to the task in notifications?
+
+To do that, you have to specify the URL of your Kanboard installation in your config file.
+By default, nothing is defined, so no links will be displayed.
+
+```php
+// Your Kanboard base URL, example: http://demo.kanboard.net/ (used by email notifications or CLI scripts)
+define('KANBOARD_URL', '');
+```
+
+Examples:
+
+- http://demo.kanboard.net/
+- http://myserver/kanboard/
+- http://kanboard.mydomain.com/
+
+Don't forget the ending `/`.
+
+You need to define that manually because Kanboard can't guess the URL from a command line script and some people have very specific configuration.
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-23 08:50:04 +0000