[Linpha-cvs] SF.net SVN: linpha: [4755] trunk/linpha2

[<bz...@us...>]

Revision: 4755
          http://svn.sourceforge.net/linpha/?rev=4755&view=rev
Author:   bzrudi
Date:     2007-07-13 10:20:47 -0700 (Fri, 13 Jul 2007)

Log Message:
-----------
Installer rework and lots of eyecandy ;-)

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/install/gnu.css
    trunk/linpha2/install/header.php
    trunk/linpha2/install/header_html.php
    trunk/linpha2/install/index.php
    trunk/linpha2/install/layout.css
    trunk/linpha2/install/lib.install.php
    trunk/linpha2/install/look.css
    trunk/linpha2/install/step2_requirements.php
    trunk/linpha2/install/step3_dbtype.php
    trunk/linpha2/install/step4_selectdirectories.php
    trunk/linpha2/install/step5_getlogin.php
    trunk/linpha2/install/step6_selectdatabase.php
    trunk/linpha2/install/step7_selectprefix.php
    trunk/linpha2/install/step8_testing.php
    trunk/linpha2/install/step9_createtables.php

Added Paths:
-----------
    trunk/linpha2/install/graphics/createtables.png
    trunk/linpha2/install/graphics/dbtest.png
    trunk/linpha2/install/graphics/directories.png
    trunk/linpha2/install/graphics/finish.png
    trunk/linpha2/install/graphics/gnu.png
    trunk/linpha2/install/graphics/important.png
    trunk/linpha2/install/graphics/login.png
    trunk/linpha2/install/graphics/phppg.png
    trunk/linpha2/install/graphics/settings.png
    trunk/linpha2/install/graphics/start.png

Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/ChangeLog	2007-07-13 17:20:47 UTC (rev 4755)
@@ -1,4 +1,6 @@
 2007-07-13 bzrudi
+ * Major redesign and cleanups in Installer and a lot of eyecandy.
+   Please test and report any issues, errors, warnings, layout quirks!
  * Make installer really abort when detecting serious problem. No longer 
    support "Continue at own risk", as it make absolutely no sense.
  * Hopefully fixed some install issues on MySQL windows (strict mode)

Modified: trunk/linpha2/install/gnu.css
===================================================================
--- trunk/linpha2/install/gnu.css	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/gnu.css	2007-07-13 17:20:47 UTC (rev 4755)
@@ -1,4 +1,5 @@
 html, body { 
+    font-size: 80%;
 	background-color: #FFFFFF; 
 	color: #000000;
 	font-family: sans-serif;

Added: trunk/linpha2/install/graphics/createtables.png
===================================================================
(Binary files differ)


Property changes on: trunk/linpha2/install/graphics/createtables.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/linpha2/install/graphics/dbtest.png
===================================================================
(Binary files differ)


Property changes on: trunk/linpha2/install/graphics/dbtest.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/linpha2/install/graphics/directories.png
===================================================================
(Binary files differ)


Property changes on: trunk/linpha2/install/graphics/directories.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/linpha2/install/graphics/finish.png
===================================================================
(Binary files differ)


Property changes on: trunk/linpha2/install/graphics/finish.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/linpha2/install/graphics/gnu.png
===================================================================
(Binary files differ)


Property changes on: trunk/linpha2/install/graphics/gnu.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/linpha2/install/graphics/important.png
===================================================================
(Binary files differ)


Property changes on: trunk/linpha2/install/graphics/important.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/linpha2/install/graphics/login.png
===================================================================
(Binary files differ)


Property changes on: trunk/linpha2/install/graphics/login.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/linpha2/install/graphics/phppg.png
===================================================================
(Binary files differ)


Property changes on: trunk/linpha2/install/graphics/phppg.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/linpha2/install/graphics/settings.png
===================================================================
(Binary files differ)


Property changes on: trunk/linpha2/install/graphics/settings.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/linpha2/install/graphics/start.png
===================================================================
(Binary files differ)


Property changes on: trunk/linpha2/install/graphics/start.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/linpha2/install/header.php
===================================================================
--- trunk/linpha2/install/header.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/header.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -88,7 +88,7 @@
 
 $title_str[0] = i18n_install("Welcome");
 $title_str[1] = i18n_install("Accept GPL");
-$title_str[2] = i18n_install("Requirements Check");
+$title_str[2] = i18n_install("Requirements");
 $title_str[3] = i18n_install("Database Type");
 $title_str[4] = i18n_install("Directories");
 $title_str[5] = i18n_install("Database Login");

Modified: trunk/linpha2/install/header_html.php
===================================================================
--- trunk/linpha2/install/header_html.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/header_html.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -37,10 +37,118 @@
 <body>
 
 <div class="main">
+<div class="header">
+<?php
+$end = count($files)-1;
+$step = $key+1;
+$finalstep = $end+1;
+switch($step)
+{
+    case '1':
+        
+        echo "<img class='header_icons' src='./graphics/start.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Welcome To LinPHA2 Installation Wizzard");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";
+    break;
+    case '2':
+        echo "<img class='header_icons' src='./graphics/gnu.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Accept The GNU General Public License");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";
+    break;
+    case '3':
+        echo "<img class='header_icons' src='./graphics/important.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Checking for Required Software");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";
+    break;
+    case '4':
+        echo "<img class='header_icons' src='./graphics/phppg.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Select Type Of Database To Use");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";
+    break;
+    case '5':
+        echo "<img class='header_icons' src='./graphics/directories.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Define LinPHA Storage And Album Directories");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";
+    break;
+    case '6':
+        echo "<img class='header_icons' src='./graphics/login.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Directories Testing And Database Login");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";                
+    break;
+    case '7':
+        echo "<img class='header_icons' src='./graphics/phppg.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Connection Test And Database Selection");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";
+    break;
+    case '8':
+        echo "<img class='header_icons' src='./graphics/phppg.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Database Table Prefix Selection");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";
+    break;
+    case '9':
+        echo "<img class='header_icons' src='./graphics/phppg.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Running Database Tests And Checking Permissions");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";
+    break;
+    case '10':
+        echo "<img class='header_icons' src='./graphics/createtables.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Creating Database Tables And Writing Config Files");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";
+    break;
+    case '11':
+        echo "<img class='header_icons' src='./graphics/settings.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Setup LinPHA Admin And Initial Settings");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";
+    break;
+    case '12':
+        echo "<img class='header_icons' src='./graphics/finish.png'>";
+        echo "<p class='header_info'>";
+        echo i18n_install("Finishing LinPHA2 Setup");
+        echo "</p><p class='header_subinfo'>";
+        echo i18n_install("Step $step of $finalstep");
+        echo "</p>";
+    break;
+        
+}
+?>
+
+</div>
 <div class="leftside">
-<br /><br />
 <?php
-$end = count($files)-1;
+
 for($i = 0; $i <= $end; $i++ )
 {
 	if($i == $key)
@@ -53,7 +161,8 @@
 	}
 	
 	echo '<div class="leftsidebox'.$style.'">';
-	switch($i)
+			echo $title_str[$i];
+	/*	switch($i)
 	{
 		case 0:
 			echo i18n_install("Welcome");
@@ -65,14 +174,12 @@
 			echo $title_str[$i];
 		break;
 	}
+*/
 	echo "</div>";
 }
 
 ?>
 
-<br /><br />
-
-	
 <div class="button button_back">
 <form method="POST" name="back_form" action="<?php echo $back_file; ?>">
 <input type="submit" name="submit_button" value="<?php echo i18n_install("Back"); ?>"<?php echo $show_back_button ? '' : ' disabled="disabled"'; ?>>
@@ -83,8 +190,7 @@
 </div>
 
 <div class="rightside">
-<h1><?php echo $title_str[$key]; ?></h1>
-<br />
+
 <?php
 
 if($show_next_button)

Modified: trunk/linpha2/install/index.php
===================================================================
--- trunk/linpha2/install/index.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/index.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -28,13 +28,11 @@
 include_once(LINPHA_DIR.'/install/header.php');
 include_once(LINPHA_DIR.'/install/header_html.php');
 
-echo i18n_install("Welcome To LinPHA2 Installation");
+//echo "<br /><br />";
 
-echo "<br /><br /><br />";
-
 echo i18n_install("Please Select Your Preferred Language");
 
-echo "<br /><select name='language' size='1'>";
+echo "<br /><br /><select name='language' size='1'>";
 
 $options = linGetAvailableLanguageFiles('install/lang' , $withEnglish=true);
 if(is_array($options))

Modified: trunk/linpha2/install/layout.css
===================================================================
--- trunk/linpha2/install/layout.css	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/layout.css	2007-07-13 17:20:47 UTC (rev 4755)
@@ -7,36 +7,73 @@
 }
 
 table {
+    width: 605px;
 }
 
 td {
 	text-align: center;
 }
 
+th {
+    background-color: #1e489c;
+    color: #CCCCCC;
+    border: 1px solid #000000;
+}
+
 .main {
-
 }
+.header {
+    background-image: url('./graphics/header_bg.jpg');
+    position: absolute;
+    width: 780px;
+    height: 80px;
+    float: left;
+    border: 1px solid #000000;
+    margin: 0px;
+    padding: 0px;
+   }
 
+.header_icons {
+    position: absolute;
+    margin-top: 8px;
+    margin-left: 45px;
+} 
+
+.header_info {
+    position: absolute;
+    margin-top: 8px;
+    margin-left: 160px;
+} 
+
+.header_subinfo {
+    position: absolute;
+    margin-top: 45px;
+    margin-left: 160px;
+} 
+
 .leftside {
-	position: relative;
+	position: absolute;
+	
 	width: 150px;
-	height: 480px;
+	height: 430px;
 	
 	float: left;
 
-	margin: 0px;
+	margin-top: 82px;
 	padding: 5px;
 }
 
 .rightside {
-	position: relative;
-	width: 600px;
-	min-height: 480px;
+	position: absolute;
+	width: 610px;
+	min-height: 427px;
 
     float: left;
 
-	margin: 0px;
+	margin-top: 82px;
+	margin-left: 160px;
 	padding: 5px;
+	padding-top: 8px;
 }
 
 .button {
@@ -48,13 +85,14 @@
 }
 
 .button_back {
-	text-align: right;
-	right: 10px;
+	text-align: left;
+	left: 10px;
 }
 
 .button_next {
+    float: right;
 	text-align: left;
-	left: 10px;
+	right: 10px;
 }
 
 .leftsidebox {
@@ -81,8 +119,8 @@
 	text-align: left;
 }
 .license {
-	width: 95%;
-	height: 360px;
+	width: 610px;
+	height: 350px;
 }
 
 .boxalign {

Modified: trunk/linpha2/install/lib.install.php
===================================================================
--- trunk/linpha2/install/lib.install.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/lib.install.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -331,7 +331,7 @@
 	try
 	{
 		$init_ok = true;
-		echo "<h2>".i18n_install("Checking Directory Permissions")."</h2><br />";
+		echo "<h1>".i18n_install("Checking Directory Permissions")."</h1><hr>";
 
 		/**
 		 * checking album directory
@@ -342,12 +342,12 @@
 			if( is_writable( $dirs['album'] ) )
 			{
 				echo success_msg();
-				echo '<br /> ('.$_SESSION['album_dir'].' => '.installLinRealpath( $dirs['album'] ).')';
+				//echo '<br /> ('.$_SESSION['album_dir'].' => '.installLinRealpath( $dirs['album'] ).')';
 			}
 			else
 			{
 				echo warning_msg();
-				echo '<br /> ('.$_SESSION['album_dir'].' => '.installLinRealpath( $dirs['album'] ).')';
+				//echo '<br /> ('.$_SESSION['album_dir'].' => '.installLinRealpath( $dirs['album'] ).')';
 				echo "<br />".i18n_install("Album Directory Not Writable. Some Features May Not Work")."<br />";
 			}
 		}
@@ -357,13 +357,13 @@
 		}
 
 
-		echo "<br /><br />";
-		echo i18n_install("Creating Required Directories...").' ';
+		//echo "<br />";
+		//echo i18n_install("Creating Required Directories...").' ';
 
 		$array = array('sql','cache','tmp');
 		foreach($array AS $value)
 		{
-			echo "<br /><br />".i18n_install("Checking Directory:")." ".$value."...";
+			echo "<br />".i18n_install("Checking Directory:")." ".$value."..."." ";
 	
 			if( file_exists( $dirs[$value] ) )
 			{
@@ -373,11 +373,11 @@
 				 */
 				if( $_SESSION[$value.'_dir'] == 'var/'.$value)
 				{
-					echo warning_msg();
-					echo "<br />".i18n_install("Directory Already Exists - Trying To Delete...").' ';
+					//echo warning_msg();
+					//echo "<br />".i18n_install("Directory Already Exists - Trying To Delete...").' ';
 					if( installRm_rf( $dirs[$value] ) )
 					{
-						echo success_msg();
+						//echo success_msg();
 					}
 					else
 					{
@@ -390,7 +390,7 @@
 				}
 			}
 	
-			echo "<br /> ".i18n_install("Trying To Create Directory...").' ';
+			//echo "<br /> ".i18n_install("Trying To Create Directory...").' ';
 			if( installMkdir_p( $dirs[$value] ) )
 			{
 				echo success_msg();
@@ -405,16 +405,16 @@
 				throw new Exception(failed_msg()."<br />".i18n_install("Cannot create folder, please check permissions!"));
 			}
 	
-			echo '<br /> ('.$_SESSION[$value.'_dir'].' => '.installLinRealpath( $dirs[$value] ).')<br />';
+			//echo '<br /> ('.$_SESSION[$value.'_dir'].' => '.installLinRealpath( $dirs[$value] ).')<br />';
 		}
 	}
 	catch(Exception $error)
 	{
 		echo $error -> getMessage();
-		echo '<br /> ('.$_SESSION[$value.'_dir'].' => '.installLinRealpath( $dirs[$value] ).')<br />';
+		//echo '<br /> ('.$_SESSION[$value.'_dir'].' => '.installLinRealpath( $dirs[$value] ).')<br />';
 		$init_ok = false;
 	}
-
+echo "<br /><br />";
 return $init_ok;	
 } 
 

Modified: trunk/linpha2/install/look.css
===================================================================
--- trunk/linpha2/install/look.css	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/look.css	2007-07-13 17:20:47 UTC (rev 4755)
@@ -1,16 +1,16 @@
 body {
-	font-size: 12pt;
+	font-size: 10pt;
 	color: #000000;
 	text-decoration: none;
 }
 
 h1 {
-	font-size: 16pt;
+	font-size: 14pt;
 	text-decoration: bold;
 }
 
 h2 {
-	font-size: 14pt;
+	font-size: 12pt;
 	text-decoration: bold;
 }
 
@@ -31,6 +31,18 @@
 .main {
 }
 
+.header_info {
+	font-size: 14pt;
+	text-decoration: bold;
+    color: #CCCCCC;
+}
+
+.header_subinfo {
+	font-size: 10pt;
+	text-decoration: bold;
+    color: #CCCCCC;
+}
+
 .leftside {
 	background: #e2e2e2;
 	border-right: 0px;

Modified: trunk/linpha2/install/step2_requirements.php
===================================================================
--- trunk/linpha2/install/step2_requirements.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/step2_requirements.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -479,11 +479,11 @@
 ?>
 
 <div align="center">
-<table width="95%">
+<table>
 	<tr>
-		<td>&nbsp;</td>
-		<td><?php echo i18n_install("Result"); ?></td>
-		<td><?php echo i18n_install("Status"); ?></td>
+		<th><?php echo i18n_install("Test"); ?></th>
+		<th><?php echo i18n_install("Result"); ?></th>
+		<th><?php echo i18n_install("Status"); ?></th>
 	</tr>
 <?php
 }

Modified: trunk/linpha2/install/step3_dbtype.php
===================================================================
--- trunk/linpha2/install/step3_dbtype.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/step3_dbtype.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -69,6 +69,10 @@
 	'oci8po' => "Oracle"
 );
 
+$db_support_missing = false;
+
+echo "<h1>"."$title_str[$key]"."</h1>"."<hr>";
+
 /**
  * check for supported databases
  * define disabled and checked variables
@@ -99,23 +103,31 @@
 	}
 
 	echo '<input type="radio" id="sql'.$key.'" name="sql_dbtype" value="'.$key.'"'.$disabled.$checked.'>' .
-		'<label for="sql'.$key.'">'.$array_databases_names[$key].'</label><br />';
+		'<label for="sql'.$key.'">'.$array_databases_names[$key].'</label>';
 
 	if(!function_exists($value))
 	{
-	    echo '<b>'.i18n_install("No Support In PHP Config (php.ini)").'</b><br />';
+	    echo "&nbsp;";
+	    echo "<strong><font color='red'>*</font></strong>";
+        $db_support_missing = true;
 	}
 
 	echo '<br />'."\n\n";
+
+	if($db_support_missing == true)
+	{
+	    echo "<br />"."<strong><font color='red'>*</font></strong>"."&nbsp;";
+	    echo i18n_install("Not Activated In PHP Configuration (php.ini)");
+	}
 }
 
 ?>
 <br /><br />
-<h1><?php echo i18n_install("Select Installation Mode"); ?></h1>
-<br />
+<h1><?php echo i18n_install("Select Installation Mode"); ?></h1><hr>
+
 <input type='radio' name='install_mode' value='automatic' checked="checked">
 <?php echo i18n_install("Automatic mode"); ?>
-<br /><br />
+<br />
 <input type='radio' name='install_mode' value='manual'>
 <?php echo i18n_install("Manual Mode (Experts Only)"); ?>
 

Modified: trunk/linpha2/install/step4_selectdirectories.php
===================================================================
--- trunk/linpha2/install/step4_selectdirectories.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/step4_selectdirectories.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -74,7 +74,7 @@
 <br /><br />
 
 <br />
-<h2 style="color: red;"><?php echo i18n_install("Warning: All directories below will be deleted if they exists !!"); ?></h2>
+<h2 style="color: red;"><?php echo i18n_install("Warning: All Directories Below Will Be Deleted If Exists !"); ?></h2><hr>
 <br />
 
 <div class="boxalign">

Modified: trunk/linpha2/install/step5_getlogin.php
===================================================================
--- trunk/linpha2/install/step5_getlogin.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/step5_getlogin.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -82,9 +82,9 @@
 		}
 }
 ?>
-<br /><br />
+
+<h1><?php echo $title_str[$key]; ?></h1>
 <hr />
-<h1><?php echo $title_str[$key]; ?></h1>
 <br />
 <?php 
 if($_SESSION['sql_dbtype'] == 'mysql') 

Modified: trunk/linpha2/install/step6_selectdatabase.php
===================================================================
--- trunk/linpha2/install/step6_selectdatabase.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/step6_selectdatabase.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -64,7 +64,7 @@
 {
 case "mysql":
 	echo i18n_install("Testing Server Connection")."<br /><br />";
-	echo i18n_install("Connecting MySQL-Server...");
+	echo i18n_install("Connecting MySQL-Server... ");
 
 	$link = @mysql_connect($_SESSION['sql_hostname'].":".$_SESSION['sql_dbport'], 
 			$_SESSION['sql_username'], $_SESSION['sql_password']);
@@ -164,7 +164,7 @@
 	 	$checked_dontcreate = '';
 	}
 	
-	echo i18n_install("You Are Allowed To Create A New Database (Recommended)");
+	echo i18n_install("Create A New Database (Recommended)");
 	?>
 	<br />
 	<input type="radio" id="radio_db1" name="create_database" 
@@ -187,7 +187,7 @@
 {
 	echo i18n_install("Install Into Existing Database:").' ';
 	?>
-	<br />
+	&nbsp;
 	<select name="sql_dbname_installinto"<?php
 		if($_SESSION['allowed_to_create_db'] == true)
 		{
@@ -220,7 +220,7 @@
 	}
 	else
 	{
-		echo i18n_install("Name Of Database To Use (Must Allready Exist):");
+		echo i18n_install("Name Of Database To Use (Must Already Exist):");
 	}	
 	?>
 	<br />

Modified: trunk/linpha2/install/step7_selectprefix.php
===================================================================
--- trunk/linpha2/install/step7_selectprefix.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/step7_selectprefix.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -68,7 +68,7 @@
 switch($_SESSION['sql_dbtype'])
 {
 case "mysql":
-	echo "<h2>".i18n_install("Checking Database")."</h2><br />";
+	echo i18n_install("Connecting MySQL Server")."<br />";
 
 	$link = @mysql_connect($_SESSION['sql_hostname'].":".$_SESSION['sql_dbport'], 
 			$_SESSION['sql_username'], $_SESSION['sql_password']);
@@ -109,7 +109,6 @@
 
 break;
 case "postgres":
-	echo i18n_install("Testing Server Connection")."<br /><br />";
 	echo i18n_install("Connecting PostgreSQL-Server...").' ';
 
 	$link = pg_connect("host=".$_SESSION['sql_hostname']." " .
@@ -142,7 +141,6 @@
 			exit();
 		}
 	
-	echo i18n_install("Testing File Connection")."<br /><br />";
 	echo i18n_install("Connecting SQLite Database...").' ';
 	
 	if(file_exists(LINPHA_DIR.'/'.$_SESSION['sql_dir'].'/'.$_SESSION['sql_dbname']))
@@ -171,7 +169,6 @@
 	}
 break;
 case "oci8po":
-	echo i18n_install("Testing Server Connection")."<br /><br />";
 	echo i18n_install("Connecting ORACLE-Server...").' ';
 	/**
 	 * make already use of ADBDO as native oci_connet() sucks
@@ -211,13 +208,12 @@
 if($_SESSION['sql_dbtype'] != "sqlite")
 {
 	?>
-	<br /><br />
 	<hr>
 	<br />
-	<?php echo i18n_install("Please Enter Database Prefix For Linpha Tables (Default: linpha_)").": <br />" ?>
+	<?php echo i18n_install("Please Enter Database Prefix For Linpha Tables (Default: linpha2_)").": <br />" ?>
 	<input type="text" id="check01" onKeyup="checkForm()" name="sql_prefix" 
 		value="<?php echo isset($_SESSION['sql_prefix']) ? 
-		$_SESSION['sql_prefix'] : 'linpha_' ; ?>">
+		$_SESSION['sql_prefix'] : 'linpha2_' ; ?>">
 	
 	<?php
 	$array_check = array(

Modified: trunk/linpha2/install/step8_testing.php
===================================================================
--- trunk/linpha2/install/step8_testing.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/step8_testing.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -61,7 +61,7 @@
  * switching to AdoDB
  * connect to db and check if connection was succesfull
  */  
-	echo i18n_install("Switching To AdoDB...").' ';
+	echo i18n_install("Switching To AdoDB..").' ';
 	$_SESSION['installmode1'] = true;
 	$_SESSION['installmode2'] = true;
 
@@ -70,19 +70,18 @@
 	$linpha = new Linpha();
 	$linpha->sql->dbConnect();
 	
-	echo success_msg();
+	echo success_msg();	
 
 
-echo '<br /><br /><hr /><br />';
 
+echo '<br />';
+
 /**
  * checking prefix if not any table already exists
  */
 if($_SESSION['sql_dbtype'] != "sqlite")
 {
 	?>
-	<h2><?php echo i18n_install("Checking Table Prefix"); ?></h2><br />
-	
 	<?php echo i18n_install("Checking For Existing Tables...").' '; ?>
 	<?php
 	$array_tables = $linpha->db->MetaTables(); 
@@ -121,7 +120,7 @@
 			echo success_msg();
 		}
  	}
- 	echo '<br /><hr /><br />';
+ 	echo '<br />';
 }
 
 /**
@@ -146,7 +145,7 @@
 	{
 		echo warning_msg();
 		echo "<br />".i18n_install("Failed To Create New LinPHA User");
-		echo "<br />".i18n_install("Seems you are not allowed to create new Database users using given defaults.");
+		echo "<br />".i18n_install("Seems you are not allowed to create new Database users using given defaults.")."<br />";
 		echo ' ('.i18n_install("NOTE: Installation should still work").')';
 	}
 	else
@@ -155,7 +154,7 @@
 		{
 			echo warning_msg();
 			echo "<br />".i18n_install("Failed To Create New LinPHA User");
-			echo "<br />".i18n_install("Seems you are not allowed to create new Database users using given defaults.");
+			echo "<br />".i18n_install("Seems you are not allowed to create new Database users using given defaults.")."<br />";
 			echo ' ('.i18n_install("NOTE: Installation should still work").')';
 		}
 		else
@@ -168,7 +167,7 @@
 			{
 				echo warning_msg();
 				echo "<br />".i18n_install("Failed To Create New LinPHA User");
-				echo "<br />".i18n_install("Seems you are not allowed to create new Database users using given defaults.");
+				echo "<br />".i18n_install("Seems you are not allowed to create new Database users using given defaults.")."<br />";
 				echo ' ('.i18n_install("NOTE: Installation should still work").')';
 			}
 			else

Modified: trunk/linpha2/install/step9_createtables.php
===================================================================
--- trunk/linpha2/install/step9_createtables.php	2007-07-13 09:06:52 UTC (rev 4754)
+++ trunk/linpha2/install/step9_createtables.php	2007-07-13 17:20:47 UTC (rev 4755)
@@ -124,7 +124,7 @@
 /**
  * insert data
  */
- 	echo "<br /><br />".i18n_install("Inserting Table Data...").' ';
+ 	echo "<br />".i18n_install("Inserting Table Data...").' ';
 	include_once(LINPHA_DIR.'/install/sql/sql.data.php');
 	foreach($sql_queries AS $value)
 	{
@@ -154,7 +154,7 @@
 	/**
 	 * create cache directories
 	 */
-	echo "<br /><br />".i18n_install("Creating Cache Directories...").' ';
+	echo "<br />".i18n_install("Creating Cache Directories...").' ';
 	mkdir(installGetFullPath( $_SESSION['cache_dir'] ).'/img', 0700);
 	mkdir(installGetFullPath( $_SESSION['cache_dir'] ).'/thumb', 0700);
 	
@@ -166,7 +166,7 @@
 	/**
 	 * create config.dir.php file
 	 */
-		echo "<br /><br />".sprintf( i18n_install("Creating %s File..."),'config.dir.php').' ';
+		echo "<br />".sprintf( i18n_install("Creating %s File..."),'config.dir.php').' ';
 		$fp = fopen(LINPHA_DIR."/var/config.dir.php","w+");
 		if($fp)
 		{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.