diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-08-11 13:19:59 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-08-11 13:19:59 +0400 |
| commit | f9b15e948fc9639ada0f925a5d450e6e158b5f56 (patch) | |
| tree | 3d6a25c8a271deee7d1136a11c11926be1d33529 /plugins/Installation | |
| parent | a96ec40e983a8b64f4c25def541a519ff3670e6a (diff) | |
| parent | 64ca5d548c0cf0c4eef9f5f104901fbf14800127 (diff) | |
Merge remote-tracking branch 'origin/master' into plugin_namespaces
Conflicts:
core/Tracker/Request.php
core/ViewDataTable.php
core/ViewDataTable/HtmlTable/Goals.php
plugins/Actions/Actions.php
plugins/Annotations/API.php
plugins/CoreHome/CoreHome.php
plugins/DBStats/DBStats.php
plugins/DevicesDetection/DevicesDetection.php
plugins/Goals/Goals.php
plugins/Live/Live.php
plugins/Referers/Referers.php
plugins/UserSettings/UserSettings.php
plugins/UsersManager/API.php
plugins/VisitTime/VisitTime.php
plugins/VisitorInterest/VisitorInterest.php
Diffstat (limited to 'plugins/Installation')
| -rw-r--r-- | plugins/Installation/Controller.php | 6 | ||||
| -rw-r--r-- | plugins/Installation/FormDatabaseSetup.php | 4 | ||||
| -rw-r--r-- | plugins/Installation/stylesheets/installation.css | 6 | ||||
| -rw-r--r-- | plugins/Installation/templates/layout.twig | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 9160ca4c63..23333872be 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -623,8 +623,8 @@ class Controller extends \Piwik\Controller\Admin /** * Redirect to next step * - * @param string Current step - * @return none + * @param string $currentStep Current step + * @return void */ protected function redirectToNextStep($currentStep) { @@ -637,7 +637,7 @@ class Controller extends \Piwik\Controller\Admin /** * Skip this step (typically to mark the current function as completed) * - * @param string function name + * @param string $step function name */ protected function skipThisStep($step) { diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php index a1f58c6c78..c67d8b8470 100644 --- a/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php @@ -52,7 +52,7 @@ class FormDatabaseSetup extends QuickForm2 $user->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_DatabaseSetupLogin'))); $requiredPrivileges = Rule_checkUserPrivileges::getRequiredPrivilegesPretty(); $user->addRule('checkUserPrivileges', - Piwik_Translate('Installation_InsufficientPrivileges', $requiredPrivileges . '<br/><br/>') . + Piwik_Translate('Installation_InsufficientPrivilegesMain', $requiredPrivileges . '<br/><br/>') . Piwik_Translate('Installation_InsufficientPrivilegesHelp')); $this->addElement('password', 'password') @@ -289,7 +289,7 @@ class Rule_checkUserPrivileges extends HTML_QuickForm2_Rule /** * Drops the tables created by the privilege checking queries, if they exist. * - * @param $db The database object to use. + * @param \Piwik\Db $db The database object to use. */ private function dropExtraTables($db) { diff --git a/plugins/Installation/stylesheets/installation.css b/plugins/Installation/stylesheets/installation.css index 2cdd581b1a..354f74b539 100644 --- a/plugins/Installation/stylesheets/installation.css +++ b/plugins/Installation/stylesheets/installation.css @@ -29,6 +29,10 @@ p { padding: 20px 30px 40px; } +#installationPage #logo { + height: auto; +} + h2 { font-size: 20px; color: #666666; @@ -106,7 +110,7 @@ code { } /* Cadre general */ -#main { +#installationPage { margin: 30px 5px 5px; text-align: left; } diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig index 705b40d492..d7b8fb4ff5 100644 --- a/plugins/Installation/templates/layout.twig +++ b/plugins/Installation/templates/layout.twig @@ -16,7 +16,7 @@ {% endif %} </head> <body> -<div id="main"> +<div id="installationPage"> <div id="content"> <div id="logo"> <img id="title" width='160' src="plugins/Zeitgeist/images/logo.png"/> <span |