From: Jan Schneider Date: Mon, 12 Apr 2010 12:04:33 +0000 (+0100) Subject: Add link to default notification settings. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d3080eb411edee98cd7eda4102227ed18cf7098c;p=horde.git Add link to default notification settings. --- diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js index a57a2d8b1..ecbf958cc 100644 --- a/kronolith/js/kronolith.js +++ b/kronolith/js/kronolith.js @@ -477,12 +477,15 @@ KronolithCore = { break; case 'options': + var url = Kronolith.conf.prefs_url; + if (data) { + url += (url.include('?') ? '&' : '?') + $H(data).toQueryString(); + } this.closeView('iframe'); - this.iframeContent(Kronolith.conf.prefs_url); + this.iframeContent(url); this.setTitle(Kronolith.text.prefs); this.updateMinical(this.date); this.addHistory(loc); - this.view = 'iframe'; break; case 'app': @@ -3342,6 +3345,20 @@ KronolithCore = { this.disableAlarmMethods(); break; + case 'kronolithEventAlarmPrefs': + this.closeRedBox(); + window.history.back(); + this.go('options', { app: 'kronolith', group: 'notification' }); + e.stop(); + break; + + case 'kronolithTaskAlarmPrefs': + this.closeRedBox(); + window.history.back(); + this.go('options', { app: 'nag', group: 'notification' }); + e.stop(); + break; + case 'kronolithEventLinkNone': case 'kronolithEventLinkDaily': case 'kronolithEventLinkWeekly': diff --git a/kronolith/templates/index/edit.inc b/kronolith/templates/index/edit.inc index 21d9870fe..bb5d8e5c3 100644 --- a/kronolith/templates/index/edit.inc +++ b/kronolith/templates/index/edit.inc @@ -89,6 +89,7 @@