diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-09-18 07:37:40 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-09-18 07:37:40 +0400 |
| commit | 19e201afd35b541a96d8666ed463703abc3446df (patch) | |
| tree | e485a4487b15529780596eb8997e7b1a6eebf138 | |
| parent | 0663dbf9ab6ce87d0822d765edee2ca99bf00ddb (diff) | |
consistent div name for errors
+ fix regression where errors were not displayed when updating a website
| -rw-r--r-- | plugins/CoreAdminHome/templates/generalSettings.twig | 2 | ||||
| -rw-r--r-- | plugins/PDFReports/PDFReports.php | 2 | ||||
| -rw-r--r-- | plugins/SegmentEditor/stylesheets/segmentation.less | 7 | ||||
| -rw-r--r-- | plugins/Zeitgeist/templates/ajaxMacros.twig | 2 |
4 files changed, 3 insertions, 10 deletions
diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index 5edf171b12..15df9d9b08 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -7,7 +7,7 @@ {% if isSuperUser %} <h2>{{ 'General_GeneralSettings'|translate }}</h2> - {{ ajax.errorDiv('ajaxError') }} + {{ ajax.errorDiv() }} {{ ajax.loadingDiv() }} <table class="adminTable" style='width:900px;'> <tr> diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php index 0cda86fb68..94096541e0 100644 --- a/plugins/PDFReports/PDFReports.php +++ b/plugins/PDFReports/PDFReports.php @@ -102,7 +102,7 @@ class PDFReports extends \Piwik\Plugin /** * Delete reports for the website */ - public function deleteSiteReport(&$idSite) + public function deleteSiteReport($idSite) { $idReports = API::getInstance()->getReports($idSite); diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less index 28f68fccda..41b4db894a 100644 --- a/plugins/SegmentEditor/stylesheets/segmentation.less +++ b/plugins/SegmentEditor/stylesheets/segmentation.less @@ -630,13 +630,6 @@ a.metric_category { padding: 8px !important; } -.ajaxError { - border: 0 !important; - width: auto !important; - margin: 0 !important; - padding: 0 !important; -} - .segmentationContainer { z-index: 99 !important; } diff --git a/plugins/Zeitgeist/templates/ajaxMacros.twig b/plugins/Zeitgeist/templates/ajaxMacros.twig index 7b0d8ff796..c38561a1b1 100644 --- a/plugins/Zeitgeist/templates/ajaxMacros.twig +++ b/plugins/Zeitgeist/templates/ajaxMacros.twig @@ -1,4 +1,4 @@ -{% macro errorDiv(id) %} +{% macro errorDiv(id='ajaxError') %} <div class="ajaxError" id="{{ id }}" style="display:none;"></div> {% endmacro %} |