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/CoreHome | |
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/CoreHome')
-rw-r--r-- | plugins/CoreHome/Controller.php | 1 | ||||
-rw-r--r-- | plugins/CoreHome/templates/broadcast.js | 7 | ||||
-rw-r--r-- | plugins/CoreHome/templates/index.tpl | 3 | ||||
-rw-r--r-- | plugins/CoreHome/templates/js_css_includes.tpl | 1 | ||||
-rw-r--r-- | plugins/CoreHome/templates/loading.tpl | 4 | ||||
-rw-r--r-- | plugins/CoreHome/templates/menu.js | 2 |
6 files changed, 7 insertions, 11 deletions
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php index 837ad64d85..0ad3be6a33 100644 --- a/plugins/CoreHome/Controller.php +++ b/plugins/CoreHome/Controller.php @@ -37,7 +37,6 @@ class Piwik_CoreHome_Controller extends Piwik_Controller $controllerName = Piwik_Common::getRequestVar('moduleToLoad'); $actionName = Piwik_Common::getRequestVar('actionToLoad', 'index'); $view = $this->getDefaultIndexView(); - $view->basicHtmlView = true; $view->content = Piwik_FrontController::getInstance()->fetchDispatch( $controllerName, $actionName ); echo $view->render(); } diff --git a/plugins/CoreHome/templates/broadcast.js b/plugins/CoreHome/templates/broadcast.js index ce5468fbca..f83441d3df 100644 --- a/plugins/CoreHome/templates/broadcast.js +++ b/plugins/CoreHome/templates/broadcast.js @@ -19,6 +19,8 @@ broadcast.init = function() { // Initialize history plugin. // The callback is called at once by present location.hash $.historyInit(broadcast.pageload); + + piwikHelper.showAjaxLoading(); } /************************************************ @@ -157,8 +159,7 @@ broadcast.loadAjaxContent = function(urlAjax) { urlAjax = urlAjax.match(/^\?/) ? urlAjax : "?" + urlAjax; - // showing loading... - $('#loadingPiwik').show(); + piwikHelper.showAjaxLoading(); $('#content').hide(); $("object").remove(); @@ -174,7 +175,7 @@ broadcast.loadAjaxContent = function(urlAjax) if(urlAjax == broadcast.lastUrlRequested) { $('#content').html( content ).show(); - $('#loadingPiwik').hide(); + piwikHelper.hideAjaxLoading(); broadcast.lastUrlRequested = null; } } diff --git a/plugins/CoreHome/templates/index.tpl b/plugins/CoreHome/templates/index.tpl index 94f1ce2ef4..cba7cbed4d 100644 --- a/plugins/CoreHome/templates/index.tpl +++ b/plugins/CoreHome/templates/index.tpl @@ -4,7 +4,8 @@ {if isset($menu) && $menu}{include file="CoreHome/templates/menu.tpl"}{/if} <div style="clear:both;"></div> -{include file="CoreHome/templates/loading.tpl"} +{ajaxLoadingDiv} +{ajaxRequestErrorDiv} <div id="content"> {if $content}{$content}{/if} diff --git a/plugins/CoreHome/templates/js_css_includes.tpl b/plugins/CoreHome/templates/js_css_includes.tpl index 41315cbe3f..06311092aa 100644 --- a/plugins/CoreHome/templates/js_css_includes.tpl +++ b/plugins/CoreHome/templates/js_css_includes.tpl @@ -4,7 +4,6 @@ <link rel="stylesheet" type="text/css" href="plugins/CoreHome/templates/menu.css" /> <link rel="stylesheet" type="text/css" href="plugins/CoreHome/templates/datatable.css" /> <link rel="stylesheet" type="text/css" href="plugins/CoreHome/templates/cloud.css" /> -<link rel="stylesheet" type="text/css" href="plugins/Dashboard/templates/dashboard.css" /> {postEvent name="template_css_import"} <script type="text/javascript" src="libs/jquery/jquery.js"></script> diff --git a/plugins/CoreHome/templates/loading.tpl b/plugins/CoreHome/templates/loading.tpl deleted file mode 100644 index 4e67871565..0000000000 --- a/plugins/CoreHome/templates/loading.tpl +++ /dev/null @@ -1,4 +0,0 @@ -<div id="loadingPiwik" {if isset($basicHtmlView) && $basicHtmlView}style="display:none;"{/if}> -<img src="themes/default/images/loading-blue.gif" alt="" /> {'General_LoadingData'|translate} -</div> -<div id="loadingError">{'General_ErrorRequest'|translate}</div> diff --git a/plugins/CoreHome/templates/menu.js b/plugins/CoreHome/templates/menu.js index 38187fd857..0eec702309 100644 --- a/plugins/CoreHome/templates/menu.js +++ b/plugins/CoreHome/templates/menu.js @@ -10,7 +10,7 @@ menu.prototype = if(urlLoaded == menu.prototype.lastUrlRequested) { $('#content').html( content ).show(); - $('#loadingPiwik').hide(); + piwikHelper.hideAjaxLoading(); menu.prototype.lastUrlRequested = null; } }, |