Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2011-01-03 08:49:45 +0300
committermattpiwik <matthieu.aubry@gmail.com>2011-01-03 08:49:45 +0300
commit956c25213d771f37f7ed51bd56b0788be05e6603 (patch)
tree83533901bd264f738f77350755112e9b304efe6e /plugins/ExamplePlugin
parent97d410fd5c78155ea744a1b0fe6aae074e5f72bb (diff)
Various code cleanups and small improvements:
* Live! widget shows IP for all users except anonymous * Widgetize displays full URL to the widget + preview link below widget * Live! visitors text change from "Today" to "Last 24 hours" in preview * remove data_push feature introduced in r1330 + removing campaign redirect feature since they are not used * all errors should now display the Piwik header when applicable (or if a php error, prefixed with a sentence suggesting to submit error in piwik forums) * fixing bug with cookie update when a visitor manually converts the same goal in the same second * fixing XML output not valid in Chrome (HTML entities not valid, must use XML entities) * simplifying + refactoring the truncation code in datatables.js (move from JS to small smarty template - hopefully we can fix this truncation and make it nice soon) * removing unnecessary line breaks from translations * refactoring duplicate code in renderers git-svn-id: http://dev.piwik.org/svn/trunk@3565 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/ExamplePlugin')
-rw-r--r--plugins/ExamplePlugin/ExamplePlugin.php10
-rw-r--r--plugins/ExamplePlugin/lang/en.php1
2 files changed, 0 insertions, 11 deletions
diff --git a/plugins/ExamplePlugin/ExamplePlugin.php b/plugins/ExamplePlugin/ExamplePlugin.php
index 46bacb63ab..6f6ab997ed 100644
--- a/plugins/ExamplePlugin/ExamplePlugin.php
+++ b/plugins/ExamplePlugin/ExamplePlugin.php
@@ -63,7 +63,6 @@ class Piwik_ExamplePlugin extends Piwik_Plugin
Piwik_AddWidget('ExamplePlugin_exampleWidgets', 'ExamplePlugin_blogPiwikRss', 'ExamplePlugin', 'blogPiwik');
Piwik_AddWidget('ExamplePlugin_exampleWidgets', 'ExamplePlugin_photostreamMatt', 'ExamplePlugin', 'photostreamMatt');
Piwik_AddWidget('ExamplePlugin_exampleWidgets', 'ExamplePlugin_piwikDownloads', 'ExamplePlugin', 'piwikDownloads');
- Piwik_AddWidget('ExamplePlugin_exampleWidgets', 'ExamplePlugin_websitesAndUsers', 'ExamplePlugin', 'websitesAndUsers');
}
}
@@ -123,15 +122,6 @@ class Piwik_ExamplePlugin_Controller extends Piwik_Controller
echo $view->render();
}
- function websitesAndUsers()
- {
- $view = Piwik_View::factory('websitesAndUsers');
- $view->siteCount = Piwik_FetchOne("SELECT COUNT(*) FROM piwik_site");
- $view->users = Piwik_FetchOne("SELECT COUNT(*) FROM piwik_user")+1; // + 1 for default admin user
- $view->version = Piwik_Version::VERSION;
- echo $view->render();
- }
-
/**
* This method displays a text containing an help about "How to build plugins for Piwik".
* This help is then used on http://dev.piwik.org/trac/wiki/Plugins/GlobalFunctions
diff --git a/plugins/ExamplePlugin/lang/en.php b/plugins/ExamplePlugin/lang/en.php
index a4aa6c0ea0..ee04745181 100644
--- a/plugins/ExamplePlugin/lang/en.php
+++ b/plugins/ExamplePlugin/lang/en.php
@@ -16,7 +16,6 @@ $translations = array(
'ExamplePlugin_exampleWidget' => 'Example widget',
'ExamplePlugin_blogPiwikRss' => 'Blog Piwik RSS',
'ExamplePlugin_photostreamMatt' => 'Matt\'s Photos',
- 'ExamplePlugin_websitesAndUsers' => 'Website and Users',
'ExamplePlugin_piwikDownloads' => 'Piwik Downloads',
'ExamplePlugin_PiwikHasBeenDownloaded' => 'On %s, Piwik was downloaded %s times.'