diff --git a/bin/CronWindow.js b/bin/CronWindow.js index 3d7dc78965823102e27ca7cab35b0108349dd873..e2a33146744c071724d77bfe89472f47fb10b9e5 100644 --- a/bin/CronWindow.js +++ b/bin/CronWindow.js @@ -32,7 +32,7 @@ define('package/quiqqer/cron/bin/CronWindow', [ options: { title : QUILocale.get('quiqqer/cron', 'cron.window.add.cron.title'), - icon : 'icon-time', + icon : 'fa fa-clock-o', maxWidth : 750, maxHeight: 500, @@ -40,11 +40,11 @@ define('package/quiqqer/cron/bin/CronWindow', [ cancel_button : { text : QUILocale.get('quiqqer/system', 'cancel'), - textimage : 'icon-remove fa fa-remove' + textimage : 'fa fa-remove' }, ok_button : { text : QUILocale.get('quiqqer/system', 'ok'), - textimage : 'icon-ok fa fa-check' + textimage : 'fa fa-check' } }, diff --git a/bin/History.js b/bin/History.js index 676d34e2bf77d40aee95e935dcb47ca8faebfe76..e82aed978d47fb5b6afff6dcddd120070065bb3d 100644 --- a/bin/History.js +++ b/bin/History.js @@ -43,7 +43,7 @@ define('package/quiqqer/cron/bin/History', [ options: { title: 'Cron-History', - icon : 'icon-long-arrow-right' + icon : 'fa fa-long-arrow-right' }, initialize: function (options) { diff --git a/bin/Manager.js b/bin/Manager.js index 2394285da1d51c56eae42e13fc7191565211a7e9..a6403fbff0e4b63e62ed80c51299c27a848a3f3e 100644 --- a/bin/Manager.js +++ b/bin/Manager.js @@ -41,7 +41,7 @@ define('package/quiqqer/cron/bin/Manager', [ options: { title: 'Cron-Manager', - icon : 'icon-time' + icon : 'fa fa-clock-o' }, initialize: function (options) { @@ -81,7 +81,7 @@ define('package/quiqqer/cron/bin/Manager', [ for (var i = 0, len = result.length; i < len; i++) { result[i].status = { title : QUILocale.get(lg, 'cron.panel.manager.btn.toggle'), - icon : result[i].active == 1 ? 'icon-ok' : 'icon-remove', + icon : result[i].active == 1 ? 'fa fa-check' : 'fa fa-remove', cronId: result[i].id, events: { onClick: toggleCron @@ -91,7 +91,7 @@ define('package/quiqqer/cron/bin/Manager', [ result[i].play = { name : 'cron-play-button-' + result[i].id, title : QUILocale.get(lg, 'cron.panel.manager.btn.execute'), - icon : 'icon-play', + icon : 'fa fa-play', cronId: result[i].id, events: { onClick: execCron @@ -120,7 +120,7 @@ define('package/quiqqer/cron/bin/Manager', [ new QUIButton({ name : 'add', text : QUILocale.get(lg, 'cron.panel.manager.btn.add'), - textimage: 'icon-plus', + textimage: 'fa fa-plus', events : { onClick: function () { self.openAddCronWindow(); @@ -135,7 +135,7 @@ define('package/quiqqer/cron/bin/Manager', [ new QUIButton({ name : 'edit', text : QUILocale.get(lg, 'cron.panel.manager.btn.edit'), - textimage: 'icon-pencil', + textimage: 'fa fa-edit', events : { onClick: function () { self.editMarkedCron(); @@ -148,7 +148,7 @@ define('package/quiqqer/cron/bin/Manager', [ new QUIButton({ name : 'delete', text : QUILocale.get(lg, 'cron.panel.manager.btn.delete'), - textimage: 'icon-trash', + textimage: 'fa fa-trash', events : { onClick: function () { self.deleteMarkedCrons(); @@ -163,7 +163,7 @@ define('package/quiqqer/cron/bin/Manager', [ new QUIButton({ name : 'history', text : QUILocale.get(lg, 'cron.panel.manager.btn.history'), - textimage: 'icon-long-arrow-right', + textimage: 'fa fa-long-arrow-right', events : { onClick: function () { self.showHistory(); @@ -322,7 +322,7 @@ define('package/quiqqer/cron/bin/Manager', [ }); new QUIConfirm({ - icon : 'icon-remove', + icon : 'fa fa-remove', title : QUILocale.get(lg, 'cron.window.delete.cron.title'), text : QUILocale.get(lg, 'cron.window.delete.cron.text'), information: QUILocale.get(lg, 'cron.window.delete.cron.information', { @@ -442,12 +442,12 @@ define('package/quiqqer/cron/bin/Manager', [ } for (i = 0, len = buttons.length; i < len; i++) { - buttons[i].setAttribute('icon', 'icon-refresh icon-spin'); + buttons[i].setAttribute('icon', 'fa fa-spinner fa-spin'); } Ajax.post('package_quiqqer_cron_ajax_cron_executeCron', function () { for (i = 0, len = buttons.length; i < len; i++) { - buttons[i].setAttribute('icon', 'icon-play'); + buttons[i].setAttribute('icon', 'fa fa-play'); } }, { diff --git a/bin/cron.php b/bin/cron.php index 226b53b80e6d2f0be9d232ca3d97792710767812..707a3d731118d212cb64ad592c5ff652103a9bc6 100644 --- a/bin/cron.php +++ b/bin/cron.php @@ -43,7 +43,9 @@ try { $Response->send(); } catch (QUI\Exception $Exception) { - QUI\System\Log::addAlert($Exception->getMessage()); + QUI\System\Log::addAlert($Exception->getMessage(), array( + 'type' => 'cron execution' + )); $Response->setStatusCode(Response::HTTP_SERVICE_UNAVAILABLE); $Response->send(); diff --git a/menu.xml b/menu.xml index 99e711399fa40fa0c036228120175e4268525ddb..f317d42deb0c0be35ea431214f926bbe1b320371 100644 --- a/menu.xml +++ b/menu.xml @@ -2,7 +2,7 @@ <menu> <item parent="/extras/" name="crons" - icon="icon-time" + icon="fa fa-clock-o" > Crons </item> @@ -10,7 +10,7 @@ <item parent="/extras/crons/" name="manager" require="package/quiqqer/cron/bin/Manager" - icon="icon-time" + icon="fa fa-clock-o" > Cron-Manager </item> @@ -18,7 +18,7 @@ <item parent="/extras/crons/" name="history" require="package/quiqqer/cron/bin/History" - icon="icon-long-arrow-right" + icon="fa fa-long-arrow-right" > Cron-History </item> diff --git a/settings.xml b/settings.xml index 7a4c4999dcd511c22d1fd1be3fe8d307c9fd5095..c4dc553962bf46969b8f4a69417636657115b4aa 100644 --- a/settings.xml +++ b/settings.xml @@ -20,7 +20,7 @@ <locale group="quiqqer/cron" var="settings.title" /> </title> <params> - <icon>icon-time</icon> + <icon>fa fa-clock-o</icon> </params> <categories> @@ -28,7 +28,7 @@ <text> <locale group="quiqqer/cron" var="settings.title" /> </text> - <icon>icon-time</icon> + <icon>fa fa-clock-o</icon> <settings title="settings" name="settings"> <title>