diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2016-08-29 04:30:52 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-29 04:30:52 +0300 |
commit | 0c9c30b731ccbacf47e154b9f7a590af49e3d799 (patch) | |
tree | c5cf2f6437bb2ee7f3675350ee4b0b6acbbae7d3 /plugins/Installation/Controller.php | |
parent | bfdf0bed670f247bf9b1d466e3bcf651e98ab634 (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 'plugins/Installation/Controller.php')
-rw-r--r-- | plugins/Installation/Controller.php | 57 |
1 files changed, 50 insertions, 7 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index e91ab0355c..f201c15616 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -30,6 +30,7 @@ use Piwik\Plugins\UserCountry\LocationProvider; use Piwik\Plugins\UsersManager\API as APIUsersManager; use Piwik\ProxyHeaders; use Piwik\SettingsPiwik; +use Piwik\Theme; use Piwik\Tracker\TrackerCodeGenerator; use Piwik\Translation\Translator; use Piwik\Updater; @@ -403,7 +404,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin */ Piwik::postEvent('Installation.defaultSettingsForm.init', array($form)); - $form->addElement('submit', 'submit', array('value' => Piwik::translate('General_ContinueToPiwik') . ' »', 'class' => 'btn btn-lg')); + $form->addElement('submit', 'submit', array('value' => Piwik::translate('General_ContinueToPiwik') . ' »', 'class' => 'btn')); if ($form->validate()) { try { @@ -480,18 +481,60 @@ class Controller extends \Piwik\Plugin\ControllerAdmin } /** - * Prints out the CSS for installer/updater + * Return the base.less compiled to css * - * During installation and update process, we load a minimal Less file. - * At this point Piwik may not be setup yet to write files in tmp/assets/ - * so in this case we compile and return the string on every request. + * @return string */ - public function getBaseCss() + public function getInstallationCss() { Common::sendHeader('Content-Type: text/css'); - return AssetManager::getInstance()->getCompiledBaseCss()->getContent(); + Common::sendHeader('Cache-Control: max-age=' . (60 * 60)); + + $files = array( + 'plugins/Morpheus/stylesheets/base/bootstrap.css', + 'plugins/Morpheus/stylesheets/base/icons.css', + 'libs/jquery/themes/base/jquery-ui.min.css', + 'libs/bower_components/materialize/dist/css/materialize.min.css', + 'plugins/Morpheus/stylesheets/base.less', + 'plugins/Morpheus/stylesheets/general/_forms.less', + 'plugins/Installation/stylesheets/installation.css' + ); + + return AssetManager::compileCustomStylesheets($files); } + /** + * Return the base.less compiled to css + * + * @return string + */ + public function getInstallationJs() + { + Common::sendHeader('Content-Type: application/javascript; charset=UTF-8'); + Common::sendHeader('Cache-Control: max-age=' . (60 * 60)); + + $files = array( + 'libs/bower_components/jquery/dist/jquery.min.js', + 'libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js', + 'libs/bower_components/materialize/dist/js/materialize.min.js', + 'libs/bower_components/angular/angular.min.js', + 'libs/bower_components/angular-sanitize/angular-sanitize.js', + 'libs/bower_components/angular-animate/angular-animate.js', + 'libs/bower_components/angular-cookies/angular-cookies.js', + 'libs/bower_components/ngDialog/js/ngDialog.min.js', + 'plugins/CoreHome/angularjs/common/services/service.module.js', + 'plugins/CoreHome/angularjs/common/filters/filter.module.js', + 'plugins/CoreHome/angularjs/common/filters/translate.js', + 'plugins/CoreHome/angularjs/common/directives/directive.module.js', + 'plugins/CoreHome/angularjs/common/directives/focus-anywhere-but-here.js', + 'plugins/CoreHome/angularjs/piwikApp.config.js', + 'plugins/CoreHome/angularjs/piwikApp.js', + 'plugins/Installation/javascripts/installation.js', + ); + + return AssetManager::compileCustomJs($files); + } + private function getParam($name) { return Common::getRequestVar($name, false, 'string'); |