diff options
author | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-03-22 14:26:54 +0300 |
---|---|---|
committer | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-03-22 14:26:54 +0300 |
commit | ff01ac4df1e88950bcdec82c75c90fa084044ac5 (patch) | |
tree | 361fcb6d0eb1a6b81af455f2028a1f2b7c75de95 /plugins/Dashboard | |
parent | 103c1f33a13babcbce01b51f2e9e93e3568209ea (diff) |
Fixes #43
- modify websites admin UI, API to add a column Exclude IPs
- IPs contain wildcards, unlimited IPs per website
- below the website table, added a "Global IP exclude" list. Ips there are excluded from all websites automatically.
- IPs are stored in the tracker cache file for fast access at Tracking time.
- added new field in website table "excluded_ips"
- refactored the ajax loading/error display to allow multiple loading/error div per page
Diffstat (limited to 'plugins/Dashboard')
-rw-r--r-- | plugins/Dashboard/templates/Dashboard.js | 3 | ||||
-rw-r--r-- | plugins/Dashboard/templates/widgetMenu.js | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/plugins/Dashboard/templates/Dashboard.js b/plugins/Dashboard/templates/Dashboard.js index 4554611230..5fce2afdb9 100644 --- a/plugins/Dashboard/templates/Dashboard.js +++ b/plugins/Dashboard/templates/Dashboard.js @@ -120,13 +120,14 @@ dashboard.prototype = } columnElement = $(self.dashboardColumnsElement[columnNumber]); emptyWidgetContent = '<div class="sortable">'+ - widgetsHelper.getEmptyWidgetHtml(uniqueId, widgetName, _pk_translate('Dashboard_LoadingWidget_js'))+ + widgetsHelper.getEmptyWidgetHtml(uniqueId, widgetName)+ '</div>'; if(addWidgetOnTop) { columnElement.prepend(emptyWidgetContent); } else { columnElement.append(emptyWidgetContent); } + widgetElement = $('#'+ uniqueId); widgetElement .hover( function() { diff --git a/plugins/Dashboard/templates/widgetMenu.js b/plugins/Dashboard/templates/widgetMenu.js index 6feaa59f64..997c87158f 100644 --- a/plugins/Dashboard/templates/widgetMenu.js +++ b/plugins/Dashboard/templates/widgetMenu.js @@ -55,7 +55,7 @@ widgetsHelper.getLoadWidgetAjaxRequest = function (widgetUniqueId, widgetParamet return ajaxRequest; }; -widgetsHelper.getEmptyWidgetHtml = function (uniqueId, widgetName, widgetLoadingString) +widgetsHelper.getEmptyWidgetHtml = function (uniqueId, widgetName) { return '<div id="'+uniqueId+'" class="widget">'+ '<div class="widgetTop">'+ @@ -66,7 +66,7 @@ widgetsHelper.getEmptyWidgetHtml = function (uniqueId, widgetName, widgetLoading '</div>'+ '<div class="widgetContent">'+ '<div class="widgetLoading">'+ - widgetLoadingString + + _pk_translate('Dashboard_LoadingWidget_js') + '</div>'+ '</div>'+ '</div>'; @@ -194,10 +194,7 @@ widgetMenu.prototype = widgetUniqueId, '<div title="'+_pk_translate("Dashboard_AddPreviewedWidget_js")+'">'+ _pk_translate('Dashboard_WidgetPreview_js')+ - '</div>', - '<span id="loadingPiwik">'+ - '<img src="themes/default/images/loading-blue.gif" /> ' +_pk_translate('Dashboard_LoadingWidget_js') + - '</span>' + '</div>' ); $('#sub3').html(emptyWidgetHtml); |