new install theme and fixed jpeg resize issues

author: Karl 'vollmerk' Vollmer <vollmer@ampache.org> 2006-04-18 08:47:08 +0000
committer: Karl 'vollmerk' Vollmer <vollmer@ampache.org> 2006-04-18 08:47:08 +0000
commit: 4632a09466e986b311136fd0150bd4004b003c16 (patch)
tree: abcf4a6bd0f8763634b3924b4e538eccdad9731c /templates
parent: a8aff4f67f9cc15e93bcd46668ae8e698d778acf (diff)
download: ampache-4632a09466e986b311136fd0150bd4004b003c16.tar.gz
ampache-4632a09466e986b311136fd0150bd4004b003c16.tar.bz2
ampache-4632a09466e986b311136fd0150bd4004b003c16.zip
3 files changed, 142 insertions, 138 deletions
diff --git a/templates/show_install.inc b/templates/show_install.inc
index 8203af62..3db12278 100644
--- a/templates/show_install.inc
+++ b/templates/show_install.inc
@@ -1,87 +1,68 @@
-<?php
-/*
-
- Copyright (c) 2001 - 2005 Ampache.org
- All rights reserved.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-/*!
- @header Show Install Form and instructions
-
-*/
-?>
 <html>
 <head>
 <title>Ampache :: For The Love Of Music - Install</title>
 </head>
 <body>
 <script src="lib/general.js" language="javascript" type="text/javascript"></script>
-<?php require_once(conf('prefix') . "/templates/style.inc"); ?>
-<div class="text-box"> 
-<span class="header1"><?php echo _("Ampache Installation"); ?></span>
-<p>
-<?php echo _("This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites"); ?>
-</br />
-<ul>
-	<li><?php echo _("A MySQL Server with a username and password that can create/modify databases"); ?></li>
-	<li><?php echo _("Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.php.dist file"); ?></li>
-</ul>
-<?php echo _("Once you have ensured that you have the above requirements please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your ampache install at a later date simply edit /config/ampache.cfg.php"); ?>
-</p>
+<?php require_once(conf('prefix') . "/templates/install.css"); ?>
+<div id="header"> 
+<h1><?php echo _("Ampache Installation"); ?></h1>
+<p>For the love of Music</p>
 </div>
-<div class="text-box">
-<b><?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?></b><br />
-<dl>
-	<dd><?php echo _("This step creates and inserts the Ampache database, as such please provide a mysql account with database creation rights. This step may take a while depending upon the speed of your computer"); ?></dd>
-</dl>
-<?php echo _("Step 2 - Creating the Ampache.cfg.php file"); ?><br />
-<?php echo _("Step 3 - Setup Initial Account"); ?><br />
-<br /><br />
-<span class="header2">Insert Ampache Database</span>
-<?php echo $GLOBALS['error']->print_error('general'); ?>
-<form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] .  $_SERVER['PHP_SELF'] . "?action=create_db"; ?>" enctype="multipart/form-data" >
-<table cellpadding="5" cellspacing="0" border="0">
+<div id="text-box">
+
+	<div class="notify">
+		<b><?php echo _("Requirements"); ?></b>
+		<p>
+		<?php echo _("This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites"); ?>
+		<br />
+		<ul>
+			<li><?php echo _("A MySQL Server with a username and password that can create/modify databases"); ?></li>
+			<li><?php echo _("Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.php.dist file"); ?></li>
+		</ul>
+<?php echo _("Once you have ensured that you have the above requirements please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your ampache install at a later date simply edit /config/ampache.cfg.php"); ?>
+		</p>
+	</div>
+	
+	<div class="content">
+		<b><?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?></b><br />
+		<dl>
+			<dd><?php echo _("This step creates and inserts the Ampache database, as such please provide a mysql account with database creation rights. This step may take a while depending upon the speed of your computer"); ?></dd>
+		</dl>
+		<?php echo _("Step 2 - Creating the Ampache.cfg.php file"); ?><br />
+		<?php echo _("Step 3 - Setup Initial Account"); ?><br />
+		<br /><br />
+		<span class="header2">Insert Ampache Database</span>
+		<?php echo $GLOBALS['error']->print_error('general'); ?>
+		<form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] .  $_SERVER['PHP_SELF'] . "?action=create_db"; ?>" enctype="multipart/form-data" >
+<table>
 <tr>
-	<td><?php echo _("Desired Database Name"); ?></td>
+	<td class="align"><?php echo _("Desired Database Name"); ?></td>
 	<td><input type="textbox" name="local_db" value="ampache" /></td>
 </tr>
 <tr>
-	<td><?php echo _("MySQL Hostname"); ?></td>
+	<td class="align"><?php echo _("MySQL Hostname"); ?></td>
 	<td><input type="textbox" name="local_host" value="localhost" /></td>
 </tr>
 <tr>
-	<td><?php echo _("MySQL Administrative Username"); ?></td>
+	<td class="align"><?php echo _("MySQL Administrative Username"); ?></td>
 	<td><input type="textbox" name="local_username" value="root" /></td>
 </tr>
 <tr>
-	<td><?php echo _("MySQL Administrative Password"); ?></td>
+	<td class="align"><?php echo _("MySQL Administrative Password"); ?></td>
 	<td><input type="password" name="local_pass" /></td>
 </tr>
 <tr>
-	<td><?php echo _("Create Database User for New Database"); ?>? </td>
+	<td class="align"><?php echo _("Create Database User for New Database"); ?>? </td>
 	<td>
-		<input type="checkbox" value="create_db_user" name="db_user" onclick="flipField('db_username');flipField('db_password');">
+		<input type="checkbox" value="create_db_user" name="db_user" onClick="flipField('db_username');flipField('db_password');">
 	</td>
 <tr>
-	<td><?php echo _("Ampache Database Username"); ?></td>
+	<td class="align"><?php echo _("Ampache Database Username"); ?></td>
 	<td><input type="textbox" id="db_username" name="db_username" value="ampache" disabled="disabled" /></td>
 </tr>
 <tr>
-	<td><?php echo _("Ampache Database User Password"); ?></td>
+	<td class="align"><?php echo _("Ampache Database User Password"); ?></td>
 	<td><input type="password" id="db_password" name="db_password" value="" disabled="disabled" /></td>
 </tr>
 <tr>
@@ -89,8 +70,14 @@
 	<td><input type="submit" value="<?php echo _("Insert Database"); ?>" /></td>
 </tr>
 	
-</table>
-</form>
+		</table>
+		</form>
+		
+	</div>
+	<div id="bottom">
+    	<p><b>Ampache Installation.</b><br />
+    	For the love of Music.</p>
+   </div>
 </div>
 
 </body>
diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php
index 0206eacf..71ce402c 100644
--- a/templates/show_install_account.inc.php
+++ b/templates/show_install_account.inc.php
@@ -30,48 +30,57 @@
 <title>Ampache :: For The Love Of Music - Install</title>
 </head>
 <body>
-<?php require_once(conf('prefix') . "/templates/style.inc"); ?>
-<div class="text-box">
-<span class="header1"><?php echo _("Ampache Installation"); ?></span>
-<p>
-<?php echo _("This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites"); ?>
-</br />
-<ul>
+<?php require_once(conf('prefix') . "/templates/install.css"); ?>
+<div id="header"> 
+<h1><?php echo _("Ampache Installation"); ?></h1>
+<p>For the love of Music</p>
+</div>
+
+<div id="text-box">
+
+	<div class="notify">
+	<?php echo _("This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites"); ?>
+	<br />
+	<ul>
         <li><?php echo _("A MySQL Server with a username and password that can create/modify databases"); ?></li>
         <li><?php echo _("Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.dist.php file"); ?></li>
-</ul>
+	</ul>
 <?php echo _("Once you have ensured that you have the above requirements please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your ampache install at a later date simply edit /config/ampache.cfg.php"); ?>
-</p>
-</div>
+	</div>
 
-<div class="text-box">
-<?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?><br />
-<?php echo _("Step 2 - Creating the ampache.cfg.php file"); ?><br />
-<b><?php echo _("Step 3 - Setup Initial Account"); ?></b><br />
-<dl>
+	<div class="content">
+	<?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?><br />
+	<?php echo _("Step 2 - Creating the ampache.cfg.php file"); ?><br />
+	<b><?php echo _("Step 3 - Setup Initial Account"); ?></b><br />
+	<dl>
 	<dd><?php echo _("This step creates your initial Ampache admin account. Once your admin account has been created you will be directed to the login page"); ?></dd>
-</dl>
-<br /><br />
-<span class="header2"><?php echo _('Create Admin Account'); ?></span>
-<?php echo $GLOBALS['error']->print_error('general'); ?>
-<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=create_account"; ?>" enctype="multipart/form-data" >
-<table cellpadding="5" cellspacing="0" border="0">
+	</dl>
+	<br /><br />
+	<span class="header2"><?php echo _('Create Admin Account'); ?></span>
+	<?php echo $GLOBALS['error']->print_error('general'); ?>
+	<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=create_account"; ?>" enctype="multipart/form-data" >
+<table>
 <tr>
-	<td><?php echo _("Username"); ?></td>
+	<td class="align"><?php echo _("Username"); ?></td>
 	<td><input type="textbox" name="local_username" value="admin" /></td>
 </tr>
 <tr>
-	<td><?php echo _("Password"); ?></td>
+	<td class="align"><?php echo _("Password"); ?></td>
 	<td><input type="password" name="local_pass" value="" /></td>
 </tr>
 <tr>
 	<td>&nbsp;</td>
 	<td><input type="submit" value="<?php echo _("Create Account"); ?>" /></td>
 </tr>
-</table>
-</form>
-</div>
+	</table>
+	</form>
+	</div>
+	<div id="bottom">
+    	<p><b>Ampache Installation.</b><br />
+    	For the love of Music.</p>
+   </div>
 
+</div>
 </body>
 </html>
 
diff --git a/templates/show_install_config.inc b/templates/show_install_config.inc
index a5c926f3..82ba6679 100644
--- a/templates/show_install_config.inc
+++ b/templates/show_install_config.inc
@@ -30,90 +30,93 @@
 <title>Ampache :: For The Love Of Music - Install</title>
 </head>
 <body>
-<?php require_once(conf('prefix') . "/templates/style.inc"); ?>
-<div class="text-box">
-<span class="header1"><?php echo _("Ampache Installation"); ?></span>
-<p>
-<?php echo _("This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites"); ?>
-</br />
-<ul>
-        <li><?php echo _("A MySQL Server with a username and password that can create/modify databases"); ?></li>
-        <li><?php echo _("Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.php.dist file"); ?></li>
-</ul>
-<?php echo _("Once you have ensured that you have the above requirements please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your ampache install at a later date simply edit /config/ampache.cfg.php"); ?>
-</p>
+<?php require_once(conf('prefix') . "/templates/install.css"); ?>
+<div id="header"> 
+<h1><?php echo _("Ampache Installation"); ?></h1>
+<p>For the love of Music</p>
 </div>
+<div id="text-box">
 
-<div class="text-box">
-<?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?><br />
-<b><?php echo _("Step 2 - Creating the Ampache.cfg.php file"); ?></b><br />
-<dl>
-	<dd><?php echo _("This steps takes the basic config values, and first attempts to write them out directly to your webserver. If access is denied it will prompt you to download the config file. Please put the downloaded config file in /config"); ?></dd>
-</dl>
-<?php echo _("Step 3 - Setup Initial Account"); ?></a><br />
-<br /><br />
-<span class="header2">Generate Config File</span>
-<?php echo $GLOBALS['error']->print_error('general'); ?>
-<form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=create_config"; ?>" enctype="multipart/form-data" >
-<table cellpadding="5" cellspacing="0" border="0">
+	<div class="notify">
+		<?php echo _("This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites"); ?>
+		<br />
+		<ul>
+        	<li><?php echo _("A MySQL Server with a username and password that can create/modify databases"); ?></li>
+        	<li><?php echo _("Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.php.dist file"); ?></li>
+		</ul>
+		<?php echo _("Once you have ensured that you have the above requirements please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your ampache install at a later date simply edit /config/ampache.cfg.php"); ?>
+	</div>
+
+	<div class="content">
+		<?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?><br />
+		<b><?php echo _("Step 2 - Creating the Ampache.cfg.php file"); ?></b><br />
+		<dl>
+		<dd><?php echo _("This steps takes the basic config values, and first attempts to write them out directly to your webserver. If access is denied it will prompt you to download the config file. Please put the downloaded config file in /config"); ?></dd>
+		</dl>
+		<?php echo _("Step 3 - Setup Initial Account"); ?></a><br />
+		<br /><br />
+		<span class="header2">Generate Config File</span>
+		<?php echo $GLOBALS['error']->print_error('general'); ?>
+		<form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=create_config"; ?>" enctype="multipart/form-data" >
+		<table>
 <tr>
-	<td><?php echo _("Web Path"); ?></td>
-	<td><input type="textbox" name="web_path" value="<?php echo $web_path; ?>" /></td>
+	<td class="align"><?php echo _("Web Path"); ?></td>
+	<td class="align"><input type="textbox" name="web_path" value="<?php echo $web_path; ?>" /></td>
 </tr>
 <tr>
-	<td><?php echo _("Desired Database Name"); ?></td>
-	<td><input type="textbox" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td>
+	<td class="align"><?php echo _("Desired Database Name"); ?></td>
+	<td class="align"><input type="textbox" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td>
 </tr>
 <tr>
-	<td><?php echo _("MySQL Hostname"); ?></td>
-	<td><input type="textbox" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td>
+	<td class="align"><?php echo _("MySQL Hostname"); ?></td>
+	<td class="align"><input type="textbox" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td>
 </tr>
 <tr>
-	<td><?php echo _("MySQL Username"); ?></td>
-	<td><input type="textbox" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td>
+	<td class="align"><?php echo _("MySQL Username"); ?></td>
+	<td class="align"><input type="textbox" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td>
 </tr>
 <tr>
-	<td><?php echo _("MySQL Password"); ?></td>
-	<td><input type="password" name="local_pass" value="" /></td>
+	<td class="align"><?php echo _("MySQL Password"); ?></td>
+	<td class="align"><input type="password" name="local_pass" value="" /></td>
 </tr>
 <tr>
 	<td>&nbsp;</td>
 	<td><input type="submit" value="<?php echo _("Write Config"); ?>" /></td>
 </tr>
-</table>
-</form>
-<br />
-<table border="0" cellpadding="0">
+		</table>
+		</form>
+		<br />
+		<table>
 <tr>
-        <td valign="top"><?php echo _("Ampache.cfg.php Exists"); ?></td>
-        <td valign="top">[ 
+        <td class="align"><?php echo _("Ampache.cfg.php Exists"); ?></td>
+        <td>[ 
         <?php
                 if (!read_config_file($configfile)) {
                         $status['read_config'] = 'false';
-                        echo " <font color=\"red\">ERROR</font> "; 
+                        echo " <span class=\"notok\">ERROR</span> "; 
                 }
                 else {
                         $status['read_config'] = 'true';
-                        echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp&nbsp;&nbsp;</font> ";
+                        echo " <span class=\"ok\">OK</span> ";
                 }
         ?>
         ]
         </td>
 </tr>
 <tr>
-        <td valign="top">
+        <td class="align">
                 <?php echo _("Ampache.cfg.php Configured?"); ?>
         </td>
-        <td valign="top">[ 
+        <td>[ 
         <?php
                 $results = read_config($configfile, 0, 0);
                 if (!check_config_values($results)) { 
                         $status['parse_config'] = 'false';
-                        echo " <font color=\"red\">ERROR</font> ";
+                        echo " <span class=\"notok\">ERROR</span> ";
                 }
                 else {
                         $status['parse_config'] = 'true';
-                        echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+                        echo " <span class=\"ok\">OK</span> ";
                 }
         ?>
         ]
@@ -124,12 +127,17 @@
 	<td>
 	<a href="<?php echo $GLOBALS['php_self']; ?>?action=show_create_config&local_db=<?php echo $_REQUEST['local_db']; ?>&local_host=<?php echo $_REQUEST['local_host']; ?>">[<?php echo _("Check for Config"); ?>]</a>
 	</td>
-</tr>
-</table>
-<br />
-<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=show_create_account"; ?>" enctype="multipart/form-data">
-<input type="Submit" value="Continue to Step 3" />
-</form>
+		</tr>
+		</table>
+		<br />
+		<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=show_create_account"; ?>" enctype="multipart/form-data">
+		<input type="Submit" value="Continue to Step 3" />
+		</form>
+	</div>
+	<div id="bottom">
+    	<p><b>Ampache Installation.</b><br />
+    	For the love of Music.</p>
+	</div>
 </div>
 
 </body>
author	Karl 'vollmerk' Vollmer <vollmer@ampache.org>	2006-04-18 08:47:08 +0000
committer	Karl 'vollmerk' Vollmer <vollmer@ampache.org>	2006-04-18 08:47:08 +0000
commit	4632a09466e986b311136fd0150bd4004b003c16 (patch)
tree	abcf4a6bd0f8763634b3924b4e538eccdad9731c /templates
parent	a8aff4f67f9cc15e93bcd46668ae8e698d778acf (diff)
download	ampache-4632a09466e986b311136fd0150bd4004b003c16.tar.gz ampache-4632a09466e986b311136fd0150bd4004b003c16.tar.bz2 ampache-4632a09466e986b311136fd0150bd4004b003c16.zip