From 8ccb94af38664566dedea5711fad87a21f3601c4 Mon Sep 17 00:00:00 2001 From: Paolo Date: Tue, 5 Feb 2019 12:23:34 +0100 Subject: [PATCH] Last things missing from the missing commits --- application/views/templates/FHC-Header.php | 64 +++++++++++++--------- public/js/infocenter/infocenterDetails.js | 17 +++--- 2 files changed, 44 insertions(+), 37 deletions(-) diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php index 785ac0184..8bde4c019 100644 --- a/application/views/templates/FHC-Header.php +++ b/application/views/templates/FHC-Header.php @@ -18,15 +18,16 @@ $addons = isset($addons) ? $addons : false; $ajaxlib = isset($ajaxlib) ? $ajaxlib : false; $bootstrap = isset($bootstrap) ? $bootstrap : false; + $dialoglib = isset($dialoglib) ? $dialoglib : false; $filterwidget = isset($filterwidget) ? $filterwidget : false; $fontawesome = isset($fontawesome) ? $fontawesome : false; $jquery = isset($jquery) ? $jquery : false; $jqueryui = isset($jqueryui) ? $jqueryui : false; $jquerytreetable = isset($jquerytreetable) ? $jquerytreetable : false; $navigationwidget = isset($navigationwidget) ? $navigationwidget : false; + $pivotui = isset($pivotui) ? $pivotui : false; $sbadmintemplate = isset($sbadmintemplate) ? $sbadmintemplate : false; $tablesorter = isset($tablesorter) ? $tablesorter : false; - $pivotui = isset($pivotui) ? $pivotui : false; $tinymce = isset($tinymce) ? $tinymce : false; ?> @@ -45,22 +46,18 @@ // -------------------------------------------------------------------------------------------------------- // From vendor folder - // jQuery UI CSS - if ($jqueryui === true) generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css'); - // Bootstrap CSS if ($bootstrap === true) generateCSSsInclude('vendor/twbs/bootstrap/dist/css/bootstrap.min.css'); + // jQuery UI CSS + if ($jqueryui === true) generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css'); + + // jQuery treetable + if ($jquerytreetable === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css'); + // Font Awesome CSS if ($fontawesome === true) generateCSSsInclude('vendor/components/font-awesome/css/font-awesome.min.css'); - // Table sorter CSS - if ($tablesorter === true) - { - generateCSSsInclude('vendor/mottie/tablesorter/dist/css/theme.default.min.css'); - generateCSSsInclude('vendor/mottie/tablesorter/dist/css/jquery.tablesorter.pager.min.css'); - } - // PivotUI CSS if ($pivotui === true) { @@ -74,8 +71,12 @@ generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css'); } - // jQuery treetable - if ($jquerytreetable === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css'); + // Table sorter CSS + if ($tablesorter === true) + { + generateCSSsInclude('vendor/mottie/tablesorter/dist/css/theme.default.min.css'); + generateCSSsInclude('vendor/mottie/tablesorter/dist/css/jquery.tablesorter.pager.min.css'); + } // -------------------------------------------------------------------------------------------------------- // From public folder @@ -83,6 +84,9 @@ // AjaxLib CSS if ($ajaxlib === true) generateCSSsInclude('public/css/AjaxLib.css'); + // DialogLib CSS + if ($dialoglib === true) generateCSSsInclude('public/css/DialogLib.css'); + // FilterWidget CSS if ($filterwidget === true) generateCSSsInclude('public/css/FilterWidget.css'); @@ -107,6 +111,9 @@ // -------------------------------------------------------------------------------------------------------- // From vendor folder + // Bootstrap JS + if ($bootstrap === true) generateJSsInclude('vendor/twbs/bootstrap/dist/js/bootstrap.min.js'); + // jQuery V3 if ($jquery === true) generateJSsInclude('vendor/components/jquery/jquery.min.js'); @@ -117,8 +124,15 @@ generateJSsInclude('vendor/components/jqueryui/ui/i18n/datepicker-de.js'); // datepicker german language file } - // Bootstrap JS - if ($bootstrap === true) generateJSsInclude('vendor/twbs/bootstrap/dist/js/bootstrap.min.js'); + // jQuery treetable + // NOTE: keep it after jQuery includes + if ($jquerytreetable === true) generateJSsInclude('vendor/ludo/jquery-treetable/jquery.treetable.js'); + + // PivotUI CSS + if ($pivotui === true) + { + generateJSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.js'); + } // Table sorter JS if ($tablesorter === true) @@ -128,12 +142,6 @@ generateJSsInclude('vendor/mottie/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js'); } - // PivotUI CSS - if ($pivotui === true) - { - generateJSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.js'); - } - // Tinymce JS if ($tinymce === true) generateJSsInclude('vendor/tinymce/tinymce/tinymce.min.js'); @@ -146,29 +154,31 @@ generateBackwardCompatibleJSMsIe('vendor/scottjehl/Respond/dest/respond.min.js'); } - // jQuery treetable - if ($jquerytreetable === true) generateJSsInclude('vendor/ludo/jquery-treetable/jquery.treetable.js'); - // -------------------------------------------------------------------------------------------------------- // From public folder + // DialogLib JS + if ($dialoglib === true) generateJSsInclude('public/js/DialogLib.js'); + // AjaxLib JS // NOTE: must be called before including others JS libraries that use it if ($ajaxlib === true) generateJSsInclude('public/js/AjaxLib.js'); - // PhrasesLib JS - if ($phrases != null) generateJSsInclude('public/js/PhrasesLib.js'); - // FilterWidget JS if ($filterwidget === true) generateJSsInclude('public/js/FilterWidget.js'); // NavigationWidget JS if ($navigationwidget === true) generateJSsInclude('public/js/NavigationWidget.js'); + // PhrasesLib JS + if ($phrases != null) generateJSsInclude('public/js/PhrasesLib.js'); + // Load addon hooks JS + // NOTE: keep it as the latest but one if ($addons === true) generateAddonsJSsInclude($calledPath.'/'.$calledMethod); // Eventually required JS + // NOTE: keep it as the latest generateJSsInclude($customJSs); ?> diff --git a/public/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js index 252647a71..e1b6e0e46 100644 --- a/public/js/infocenter/infocenterDetails.js +++ b/public/js/infocenter/infocenterDetails.js @@ -115,7 +115,7 @@ $(document).ready(function () var InfocenterDetails = { genericSaveError: function() { - alert("error when saving"); + FHC_DialogLib.alertError("error when saving"); }, openZgvInfoForPrestudent: function(prestudent_id) { @@ -170,14 +170,11 @@ var InfocenterDetails = { data, { successCallback: function(data, textStatus, jqXHR) { - if (data === true) + if (data !== true) { - InfocenterDetails._refreshZgv(true); - } - else - { - alert("error when saving zgv Prio"); + FHC_DialogLib.alertError("error when saving ZGV prio"); } + InfocenterDetails._refreshZgv(true); } } ); @@ -260,7 +257,7 @@ var InfocenterDetails = { } else { - alert("error when saving Absage"); + FHC_DialogLib.alertError("error when saving Absage"); } } } @@ -284,13 +281,13 @@ var InfocenterDetails = { } else if (data.error === 2 && parseInt(data.retval.prestudent_id, 10)) { - alert("error when setting accepted documents"); + FHC_DialogLib.alertError("error when setting accepted documents"); InfocenterDetails._refreshZgv(); InfocenterDetails._refreshLog(); } else { - alert("error when saving Freigabe"); + FHC_DialogLib.alertError("error when saving Freigabe"); } } }