- renaming all instances of LogStats to Tracker for clarity

- improving error message to be prettier
- adding footer in all admin pages for consistency

git-svn-id: http://dev.piwik.org/svn/trunk@649 59fd770c-687e-43c8-a1e3-f5a4ff64c105

9 files changed, 22 insertions, 12 deletions

diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 9b70b899d5..66e7199d98 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -93,12 +93,12 @@ class Piwik_Actions extends Piwik_Plugin
 	{

 		$archiveProcessing = $notification->getNotificationObject();

 		

-		require_once "LogStats/Action.php";

+		require_once "Tracker/Action.php";

 		

 		$this->actionsTablesByType = array(

-			Piwik_LogStats_Action::TYPE_ACTION => array(),

-			Piwik_LogStats_Action::TYPE_DOWNLOAD => array(),

-			Piwik_LogStats_Action::TYPE_OUTLINK => array(),

+			Piwik_Tracker_Action::TYPE_ACTION => array(),

+			Piwik_Tracker_Action::TYPE_DOWNLOAD => array(),

+			Piwik_Tracker_Action::TYPE_OUTLINK => array(),

 		);

 		

 		// This row is used in the case where an action is know as an exit_action

@@ -191,15 +191,15 @@ class Piwik_Actions extends Piwik_Plugin
 		$maximumRowsInDataTableLevelZero = 200;
 		$maximumRowsInSubDataTable = 50;
 		

-		$dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_LogStats_Action::TYPE_ACTION]);

+		$dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_Tracker_Action::TYPE_ACTION]);

 		$s = $dataTable->getSerialized( $maximumRowsInDataTableLevelZero, $maximumRowsInSubDataTable );

 		$record = new Piwik_ArchiveProcessing_Record_BlobArray('Actions_actions', $s);

 		

-		$dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_LogStats_Action::TYPE_DOWNLOAD]);

+		$dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_Tracker_Action::TYPE_DOWNLOAD]);

 		$s = $dataTable->getSerialized( $maximumRowsInDataTableLevelZero, $maximumRowsInSubDataTable );

 		$record = new Piwik_ArchiveProcessing_Record_BlobArray('Actions_downloads', $s);

 		

-		$dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_LogStats_Action::TYPE_OUTLINK]);

+		$dataTable = Piwik_ArchiveProcessing_Day::generateDataTable($this->actionsTablesByType[Piwik_Tracker_Action::TYPE_OUTLINK]);

 		$s = $dataTable->getSerialized( $maximumRowsInDataTableLevelZero, $maximumRowsInSubDataTable );

 		$record = new Piwik_ArchiveProcessing_Record_BlobArray('Actions_outlink', $s);

 		
diff --git a/plugins/CoreAdminHome/templates/footer.tpl b/plugins/CoreAdminHome/templates/footer.tpl
new file mode 100644
index 0000000000..51f0116ae5
--- /dev/null
+++ b/plugins/CoreAdminHome/templates/footer.tpl
@@ -0,0 +1,2 @@
+
+{include file="CoreHome/templates/piwik_tag.tpl"}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/templates/index.tpl b/plugins/CoreAdminHome/templates/index.tpl
index 431f768e26..370e1b963f 100644
--- a/plugins/CoreAdminHome/templates/index.tpl
+++ b/plugins/CoreAdminHome/templates/index.tpl
@@ -14,3 +14,5 @@
 <a href='?module=CoreHome'>{'General_BackToHomepage'|translate}</a>

 

 </div>

+

+{include file="CoreAdminHome/templates/footer.tpl"}
\ No newline at end of file
diff --git a/plugins/CoreHome/templates/piwik_tag.tpl b/plugins/CoreHome/templates/piwik_tag.tpl
index 3f207f6bda..7807ceb5bd 100644
--- a/plugins/CoreHome/templates/piwik_tag.tpl
+++ b/plugins/CoreHome/templates/piwik_tag.tpl
@@ -16,4 +16,4 @@ piwik_log(piwik_action_name, piwik_idsite, piwik_url, piwik_vars);
 </noscript></object></a>
 <!-- /Piwik -->
 {/literal}
-{/if}
\ No newline at end of file
+{/if}
diff --git a/plugins/CorePluginsAdmin/templates/manage.tpl b/plugins/CorePluginsAdmin/templates/manage.tpl
index 37b8ac9d85..209007d135 100644
--- a/plugins/CorePluginsAdmin/templates/manage.tpl
+++ b/plugins/CorePluginsAdmin/templates/manage.tpl
@@ -48,4 +48,5 @@
 </tbody>

 </table>

 

-</div>
\ No newline at end of file
+</div>

+{include file="CoreAdminHome/templates/footer.tpl"}
\ No newline at end of file
diff --git a/plugins/DBStats/templates/DBStats.tpl b/plugins/DBStats/templates/DBStats.tpl
index 3b12605793..27f0769dcd 100644
--- a/plugins/DBStats/templates/DBStats.tpl
+++ b/plugins/DBStats/templates/DBStats.tpl
@@ -34,4 +34,6 @@
 	</tbody>

 </table>

 

-</div>
\ No newline at end of file
+</div>

+

+{include file="CoreAdminHome/templates/footer.tpl"}
\ No newline at end of file
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index e42df824b6..81b8090990 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -23,7 +23,7 @@ class Piwik_Provider extends Piwik_Plugin
 			'author' => 'Piwik',
 			'homepage' => 'http://piwik.org/',
 			'version' => '0.1',
-			'LogStatsPlugin' => true, // this plugin must be loaded during the stats logging
+			'TrackerPlugin' => true, // this plugin must be loaded during the stats logging
 		);
 		
 		return $info;
@@ -34,7 +34,7 @@ class Piwik_Provider extends Piwik_Plugin
 		$hooks = array(
 			'ArchiveProcessing_Day.compute' => 'archiveDay',
 			'ArchiveProcessing_Period.compute' => 'archivePeriod',
-			'LogStats.newVisitorInformation' => 'logProviderInfo',
+			'Tracker.newVisitorInformation' => 'logProviderInfo',
 			'WidgetsList.add' => 'addWidget',
 			'Menu.add' => 'addMenu',
 		);
diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl
index 18d0372ddb..e9cec2405a 100644
--- a/plugins/SitesManager/templates/SitesManager.tpl
+++ b/plugins/SitesManager/templates/SitesManager.tpl
@@ -61,3 +61,4 @@
 	<div class="addRowSite"><a href="#"><img src='plugins/UsersManager/images/add.png' alt="" /> {'SitesManager_AddSite'|translate}</a></div>

 {/if}

 

+{include file="CoreAdminHome/templates/footer.tpl"}

diff --git a/plugins/UsersManager/templates/UsersManager.tpl b/plugins/UsersManager/templates/UsersManager.tpl
index 054a269c04..02781df325 100644
--- a/plugins/UsersManager/templates/UsersManager.tpl
+++ b/plugins/UsersManager/templates/UsersManager.tpl
@@ -140,3 +140,5 @@
 

 <div class="addrow"><a href="#"><img src='plugins/UsersManager/images/add.png'> {'UsersManager_AddUser'|translate}</a></div>

 <script type="text/javascript" src="plugins/UsersManager/templates/UsersManager.js"></script>

+

+{include file="CoreAdminHome/templates/footer.tpl"}
\ No newline at end of file