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:
authorThomas Steur <tsteur@users.noreply.github.com>2016-08-29 04:30:52 +0300
committerGitHub <noreply@github.com>2016-08-29 04:30:52 +0300
commit0c9c30b731ccbacf47e154b9f7a590af49e3d799 (patch)
treec5cf2f6437bb2ee7f3675350ee4b0b6acbbae7d3 /core/Plugin
parentbfdf0bed670f247bf9b1d466e3bcf651e98ab634 (diff)
Better UI for Piwik 3, more responsive, faster, lots of other fixes (#10397)
* improved ui and responsiveness * improve rss widget * commit changes for ui again, got lost after the last commit * fix more tests * restoring files * fix fonts * fix more tests * more test fixes * fix some system tests * fix tests * fix system and ui tests * fix updater tests * make a page as loaded once the callback is called * enable verbose * more verbose output * enable phantomjs debug flag * debug should be a phantomjs option * trying to fix installation tests * fixes #10173 to not compile css files as less * trying to minimize js/css requests to hopefully prevent random ui test fails * disable verbose mode * fix updater and installation * lots of bugfixes and ui tweaks * fix reset dashboard * various bugfixes * fix integration tests * fix text color * hoping to fix installation tests this way * cache css/js resources for an hour, should speed up tests and prevent some random issues * we need to avoid installing plugins multiple times at the same time when requesting resources * finally getting the colors right again * fix most tests, more tests for theme * use an h2 element for titles for better accessibility * fix headline color * use actual theme text color (piwik-black) * fix small font size was applied on all p elements * fix tests * now improving all the datatables * trying to ignore images for visitor log * Revert "trying to ignore images for visitor log" This reverts commit ad1ff7267aae14ad905bef130e956c8593c4fb22. * fix tests * fix we had always ignored a max label width * trying to fix file permissions * fix more file permissions * Improved plugins update API (#10028) * refs #7983 let plugins add or remove fields to websites and better settings api * * Hide CorePluginsAdmin API methods * More documentation * Added some more tests * improved updates API for plugins * better error code as duplicate column cannot really happen when not actually renaming a colum Conflicts: core/Updates/3.0.0-b1.php plugins/CoreUpdater/Commands/Update/CliUpdateObserver.php * fix DB field piwik_log_visit.location_provider too small (#10003) * fixes #9564 fix DB field piwik_log_visit.location_provider too small * use new plugins updater API * DB field piwik_log_visit.visit_total_actions too small (#10002) * fixes #9565 DB field piwik_log_visit.visit_total_actions too small * change type of some db columns that are too small * fix tests (#10040) Conflicts: plugins/CoreAdminHome/Menu.php plugins/Goals/Menu.php plugins/MobileMessaging/Menu.php plugins/SitesManager/Menu.php plugins/UsersManager/Menu.php tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml * fix more file permissions * repair more file permissions * repair more file permissions * trying to make ui tests work again, the table was missing * fix some encoding issues * cross browser fixes and usability improvement * move back the config icon, need to find a better solution later * more cross browser fixes * bugfixes * fix ui tests * fix encoding issue * fix various issues with the ui tests when a test gets aborted * also skip this visitor log test when aborted * there were 3 css files that were loaded separately, merge them instead into one css * forgot to add the actual manifest * do not add manifest if custom logo is specified * load font css files first as it was before merging them into big css * fix link icon was not aligned anymore * minor fixes * setting it back to 4px * in popovers the font variable was always ignored and a different font loaded * forgot to update screenshots * fix remaining tests * this should fix an update error * added 3 new widgets system check, system summary and plugin updates * tweak new widgets content * no page reload when changing date or segment * in admin home show only enabled widgets * refs #10295 use getMockBuilder instead of deprecated getMock * fix some ui tests * fix various bugs * fix more tests * fix ui tests * add a space between loading image and loading message * fix docs so they appear on developer.piwik.org * improved documentation * introduce new Widget::renderTemplate method for consistency with controllers * remove no longer needed files * testing system fonts * fix strong was not really bold * more useful system summary * remove ubuntu font * fix most tests and removed most em elements * fix tests * fix headline was very thin * update submodule * update submodules * update submodule * fix failing ui tests * update submodules
Diffstat (limited to 'core/Plugin')
-rw-r--r--core/Plugin/ControllerAdmin.php5
-rw-r--r--core/Plugin/ReleaseChannels.php11
-rw-r--r--core/Plugin/Report.php1
-rw-r--r--core/Plugin/ViewDataTable.php9
-rw-r--r--core/Plugin/Visualization.php6
5 files changed, 17 insertions, 15 deletions
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index 51ff540b98..89fc082199 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -97,10 +97,13 @@ abstract class ControllerAdmin extends Controller
return;
}
- if(Url::isLocalHost(Url::getCurrentHost())) {
+ if (Url::isLocalHost(Url::getCurrentHost())) {
return;
}
+ if (Development::isEnabled()) {
+ return;
+ }
$message = Piwik::translate('General_CurrentlyUsingUnsecureHttp');
diff --git a/core/Plugin/ReleaseChannels.php b/core/Plugin/ReleaseChannels.php
index 7ee127ce79..f108a32cdf 100644
--- a/core/Plugin/ReleaseChannels.php
+++ b/core/Plugin/ReleaseChannels.php
@@ -68,17 +68,6 @@ class ReleaseChannels
return reset($channels);
}
- /**
- * Sets the given release channel in config but does not save id. $config->forceSave() still needs to be called
- * @param string $channel
- */
- public function setActiveReleaseChannelId($channel)
- {
- $general = Config::getInstance()->General;
- $general['release_channel'] = $channel;
- Config::getInstance()->General = $general;
- }
-
public function isValidReleaseChannelId($releaseChannelId)
{
$channel = $this->factory($releaseChannelId);
diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php
index 38e4857498..ac8b401363 100644
--- a/core/Plugin/Report.php
+++ b/core/Plugin/Report.php
@@ -20,7 +20,6 @@ use Piwik\Cache as PiwikCache;
use Piwik\Piwik;
use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution;
-use Piwik\Plugin\ReportsProvider;
use Piwik\ViewDataTable\Factory as ViewDataTableFactory;
use Exception;
use Piwik\Widget\WidgetsList;
diff --git a/core/Plugin/ViewDataTable.php b/core/Plugin/ViewDataTable.php
index 3b7bcf4ff8..da3e43363b 100644
--- a/core/Plugin/ViewDataTable.php
+++ b/core/Plugin/ViewDataTable.php
@@ -178,7 +178,12 @@ abstract class ViewDataTable implements ViewInterface
*/
public function __construct($controllerAction, $apiMethodToRequestDataTable, $overrideParams = array())
{
- list($controllerName, $controllerAction) = explode('.', $controllerAction);
+ if (strpos($controllerAction, '.') === false) {
+ $controllerName = '';
+ $controllerAction = '';
+ } else {
+ list($controllerName, $controllerAction) = explode('.', $controllerAction);
+ }
$this->requestConfig = static::getDefaultRequestConfig();
$this->config = static::getDefaultConfig();
@@ -223,6 +228,8 @@ abstract class ViewDataTable implements ViewInterface
$this->config->addTranslations($processedMetrics);
}
+ $this->config->title = $report->getName();
+
$report->configureView($this);
}
diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php
index e19da81d9a..6ac18ea67e 100644
--- a/core/Plugin/Visualization.php
+++ b/core/Plugin/Visualization.php
@@ -227,7 +227,11 @@ class Visualization extends ViewDataTable
}
$view->idSubtable = $this->requestConfig->idSubtable;
- $view->clientSideParameters = $this->getClientSideParametersToSet();
+ $clientSideParameters = $this->getClientSideParametersToSet();
+ if (isset($clientSideParameters['showtitle'])) {
+ unset($clientSideParameters['showtitle']);
+ }
+ $view->clientSideParameters = $clientSideParameters;
$view->clientSideProperties = $this->getClientSidePropertiesToSet();
$view->properties = array_merge($this->requestConfig->getProperties(), $this->config->getProperties());
$view->reportLastUpdatedMessage = $this->reportLastUpdatedMessage;