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 

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);