refs #7090 #4789 Improve the look of data tables, entity tables, forms, ...

3 files changed, 16 insertions, 10 deletions

diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json
index 2ad86e3109..5758213024 100644
--- a/plugins/Installation/lang/en.json
+++ b/plugins/Installation/lang/en.json
@@ -15,7 +15,7 @@
         "DatabaseSetupLogin": "Login",
         "DatabaseSetupServer": "Database Server",
         "DatabaseSetupTablePrefix": "Table Prefix",
-        "Email": "email",
+        "Email": "Email",
         "Extension": "extension",
         "Filesystem": "Filesystem",
         "GetInvolved": "If you like what you see, you can %1$sget involved%2$s.",
@@ -38,9 +38,9 @@
         "NfsFilesystemWarningSuffixInstall": "Using file based sessions on NFS is extremely slow, so Piwik will use database sessions. If you have many concurrent dashboard users, you may need to increase the maximum number of client connections to the database server.",
         "NoConfigFound": "The Piwik configuration file couldn't be found and you are trying to access a Piwik page.<br \/><b>\u00a0\u00a0\u00bb You can <a href='index.php'>install Piwik now<\/a><\/b><br \/><small>If you installed Piwik before and have some tables in your DB, don't worry, you can reuse the same tables and keep your existing data!<\/small>",
         "Optional": "Optional",
-        "Password": "password",
+        "Password": "Password",
         "PasswordDoNotMatch": "password do not match",
-        "PasswordRepeat": "password (repeat)",
+        "PasswordRepeat": "Password (repeat)",
         "PercentDone": "%s %% Done",
         "PleaseFixTheFollowingErrors": "Please fix the following errors",
         "DefaultSettings": "Default Piwik settings",
@@ -53,13 +53,13 @@
         "SeeBelowForMoreInfo": "See below for more information.",
         "SetupWebsite": "Setup a Website",
         "SetupWebsiteError": "There was an error when adding the website",
-        "SetupWebSiteName": "website name",
+        "SetupWebSiteName": "Website name",
         "SetupWebsiteSetupSuccess": "Website %s created successfully!",
-        "SetupWebSiteURL": "website URL",
+        "SetupWebSiteURL": "Website URL",
         "SiteSetup": "Please setup the first website you would like to track and analyse with Piwik:",
         "SiteSetupFootnote": "Note: once the Piwik Install is finished, you will be able to add more Websites to track!",
         "SuperUser": "Super User",
-        "SuperUserLogin": "super user login",
+        "SuperUserLogin": "Super user login",
         "SuperUserSetupError": "There was an error when adding the Super User",
         "SuperUserSetupSuccess": "Super User created successfully!",
         "SystemCheck": "System Check",
@@ -128,7 +128,7 @@
         "TablesUpdatedSuccess": "The database was successfully updated from %1$s to %2$s!",
         "TablesWarningHelp": "Either choose to reuse the existing database tables or select a clean install to erase all existing data in the database.",
         "TablesWithSameNamesFound": "Some %1$s tables in your database %2$s have the same names as the tables Piwik is trying to create",
-        "Timezone": "website time zone",
+        "Timezone": "Website time zone",
         "WeHopeYouWillEnjoyPiwik": "We hope you will enjoy using Piwik as much as we enjoy making it.",
         "Welcome": "Welcome!",
         "WelcomeHelp": "<p>Piwik is a free\/libre web analytics software that makes it easy to get the information you want from your visitors.<\/p><p>This process is split up into %s easy steps and will take around 5 minutes.<\/p>",
diff --git a/plugins/Installation/stylesheets/installation.css b/plugins/Installation/stylesheets/installation.css
index 759461f6b9..6d6b97be5e 100644
--- a/plugins/Installation/stylesheets/installation.css
+++ b/plugins/Installation/stylesheets/installation.css
@@ -41,6 +41,10 @@ body {
     margin-bottom: 0;
 }
 
+.installation-finished .form-group .checkbox {
+    width: 100%;
+}
+
 /* Content */
 h2 {
     font-size: 25px;
diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig
index 9e1f557103..636e8d397c 100644
--- a/plugins/Installation/templates/finished.twig
+++ b/plugins/Installation/templates/finished.twig
@@ -27,8 +27,10 @@
         </div>
     {% endif %}
 
-    {% if form_data is defined %}
-        {% include "genericForm.twig" %}
-    {% endif %}
+    <div class="installation-finished">
+        {% if form_data is defined %}
+            {% include "genericForm.twig" %}
+        {% endif %}
+    </div>
 
 {% endblock %}