diff options
| author | Felix Favre <gnomus@gnomus.de> | 2014-08-24 15:52:25 +0200 |
|---|---|---|
| committer | Felix Favre <gnomus@gnomus.de> | 2014-08-24 15:52:25 +0200 |
| commit | 4faca9864f80dfd90cba248855602ab7680cab53 (patch) | |
| tree | 9f2d5d76adc7d14e89d51c0073103e9d7ad717f4 /includes/pages/user_myshifts.php | |
| parent | efe853246f99c59e48ac66955b40fb7e09da0a5b (diff) | |
| parent | f9e577352dd31f2846c3a340a1de82dd73961568 (diff) | |
Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
themes/theme1.scss
Diffstat (limited to 'includes/pages/user_myshifts.php')
| -rw-r--r-- | includes/pages/user_myshifts.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index 333f9517..3a3f6712 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -23,7 +23,10 @@ function user_myshifts() { success(_("Key changed.")); redirect(page_link_to('user_myshifts')); } - return template_render('../templates/user_myshifts_reset.html', array()); + return page_with_title(_("Reset API key"), array( + error(_("If you reset the key, the url to your iCal- and JSON-export and your atom feed changes! You have to update it in every application using one of these exports."), true), + button(page_link_to('myshifts') . '&reset=ack', _("Continue"), 'btn-danger') + )); } elseif (isset($_REQUEST['edit']) && preg_match("/^[0-9]*$/", $_REQUEST['edit'])) { $id = $_REQUEST['edit']; $shift = sql_select("SELECT |