From caf61692270eca51525fc0957ec316ad5a1d45bd Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Tue, 14 Aug 2012 06:08:48 +0000
Subject: [PATCH] Small mods to the install

git-svn-id: http://dev.piwik.org/svn/trunk@6750 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
 lang/en.php                                          |  2 ++
 plugins/Installation/templates/firstWebsiteSetup.tpl |  4 +++-
 plugins/Installation/templates/install.css           | 11 +++++++----
 plugins/Installation/templates/structure.tpl         |  2 +-
 themes/default/common.css                            |  1 -
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lang/en.php b/lang/en.php
index 6f8c5fa7c7..f51c77a8f5 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -807,10 +807,12 @@ $translations = array(
 	'Installation_Congratulations' => 'Congratulations',
 	'Installation_CongratulationsHelp' => '<p>Congratulations! Your Piwik installation is complete.</p><p>Make sure your JavaScript code is entered on your pages, and wait for your first visitors!</p>',
 	'Installation_ContinueToPiwik' => 'Continue to Piwik',
+	'Installation_SiteSetup' => 'Please setup the first website you would like to track and analyse with Piwik:',
 	'Installation_SetupWebsite' => 'Setup a Website',
 	'Installation_SetupWebSiteName' => 'website name',
 	'Installation_SetupWebSiteURL' => 'website URL',
 	'Installation_Timezone' => 'website time zone',
+	'Installation_SiteSetupFootnote' => 'Note: once the Piwik Install is finished, you will be able to add more Websites to track!',
 	'Installation_SetupWebsiteError' => 'There was an error when adding the website',
 	'Installation_SetupWebsiteSetupSuccess' => 'Website %s created with success!',
 	'Installation_SuperUser' => 'Super User',
diff --git a/plugins/Installation/templates/firstWebsiteSetup.tpl b/plugins/Installation/templates/firstWebsiteSetup.tpl
index 73e060bf4c..8abd7960dd 100644
--- a/plugins/Installation/templates/firstWebsiteSetup.tpl
+++ b/plugins/Installation/templates/firstWebsiteSetup.tpl
@@ -8,7 +8,7 @@
 {/if}
 
 <h2>{'Installation_SetupWebsite'|translate}</h2>
-
+<br/><p>{'Installation_SiteSetup'|translate}</p>
 {if isset($errorMessage)}
 	<div class="error">
 		<img src="themes/default/images/error_medium.png" />
@@ -21,3 +21,5 @@
 {if isset($form_data)}
 	{include file="default/genericForm.tpl"}
 {/if}
+<br/>
+<p><i>{'Installation_SiteSetupFootnote'|translate}</i></p>
\ No newline at end of file
diff --git a/plugins/Installation/templates/install.css b/plugins/Installation/templates/install.css
index dbce68607c..1489c2809c 100644
--- a/plugins/Installation/templates/install.css
+++ b/plugins/Installation/templates/install.css
@@ -4,7 +4,7 @@ div.both {
 }
 
 body {
-	background-color: #F9F9F9;
+	background-color: #FFFBF9;
 	text-align: center;
 	font-family:Arial,Georgia,"Times New Roman",Times,serif;
 	font-size:17px;
@@ -13,15 +13,17 @@ body {
 #title{
 	font-size:50px;
 	color:#284F92;
+	vertical-align: text-bottom;
 }
 
 #subtitle{
 	font-size:30px;
-	color:#C7D8D2;
+	color: #6B320B;    
+	font-size: 27px;
 }
 
 #logo {
-	padding:30px;
+	padding: 20px 30px 40px;
 }
 
 h2 {
@@ -97,7 +99,7 @@ h3 {
 	font-size: 90%;
 	line-height: 1.4em;
 	width: 860px;
-	border: 1px solid #3B62AF;
+	border: 1px solid #7A5A3F;
 	text-align: $rightouleft;
 	margin: auto;
 	background: #FFFFFF;
@@ -155,6 +157,7 @@ td {
 
 .submit {
 	text-align:center;
+	cursor: pointer;
 }
 .submit input{
 	margin-top:15px;
diff --git a/plugins/Installation/templates/structure.tpl b/plugins/Installation/templates/structure.tpl
index 2090de12f0..54115ca837 100644
--- a/plugins/Installation/templates/structure.tpl
+++ b/plugins/Installation/templates/structure.tpl
@@ -36,7 +36,7 @@ $(document).ready( function(){
 <div id="main">
 	<div id="content">
 		<div id="logo">
-			<img id="title" src="themes/default/images/logo-header.png"/> &nbsp;&nbsp;&nbsp;<span id="subtitle"># {'General_OpenSourceWebAnalytics'|translate}</span>
+			<img id="title" width='160' src="themes/default/images/logo.png"/> &nbsp;&nbsp;&nbsp;<span id="subtitle"># {'General_OpenSourceWebAnalytics'|translate}</span>
 		</div>
 		<div style="float:right" id="topRightBar">
 		<br />
diff --git a/themes/default/common.css b/themes/default/common.css
index ec4a794fda..b3e66720c4 100644
--- a/themes/default/common.css
+++ b/themes/default/common.css
@@ -215,7 +215,6 @@ a {
 
 #logo {
 	display: block;
-	font:32px Georgia, "Times New Roman", Times, serif;
 	height:40px;
 }
 
-- 
GitLab