summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-05-01 07:22:07 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-05-01 07:22:07 +0000
commita02b8ce20746ef5449e661ac8ffdb4e1974e65c2 (patch)
treedb1e0b2a6ef1b9fa7bfaa65e2fdb8eb22286f063 /templates
parentaf554e6296eff9ee08ad59597f27378e4b2a8db8 (diff)
downloadampache-a02b8ce20746ef5449e661ac8ffdb4e1974e65c2.tar.gz
ampache-a02b8ce20746ef5449e661ac8ffdb4e1974e65c2.tar.bz2
ampache-a02b8ce20746ef5449e661ac8ffdb4e1974e65c2.zip
fixed clean, added lang to installer (thx ros) and cleaned up catalog display a bit and mojoed lang list
Diffstat (limited to 'templates')
-rw-r--r--templates/show_install.inc4
-rw-r--r--templates/show_install_account.inc.php2
-rw-r--r--templates/show_install_config.inc9
-rw-r--r--templates/show_install_lang.inc.php60
-rw-r--r--templates/show_localplay.inc.php10
-rw-r--r--templates/show_modules.inc.php2
-rw-r--r--templates/sidebar.inc.php4
7 files changed, 80 insertions, 11 deletions
diff --git a/templates/show_install.inc b/templates/show_install.inc
index 3db12278..a1f0c574 100644
--- a/templates/show_install.inc
+++ b/templates/show_install.inc
@@ -1,4 +1,4 @@
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
<head>
<title>Ampache :: For The Love Of Music - Install</title>
</head>
@@ -34,7 +34,7 @@
<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" >
+ <form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . "?action=create_db&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" >
<table>
<tr>
<td class="align"><?php echo _("Desired Database Name"); ?></td>
diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php
index 71ce402c..b2e580b1 100644
--- a/templates/show_install_account.inc.php
+++ b/templates/show_install_account.inc.php
@@ -25,7 +25,7 @@
*/
?>
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
<head>
<title>Ampache :: For The Love Of Music - Install</title>
</head>
diff --git a/templates/show_install_config.inc b/templates/show_install_config.inc
index 82ba6679..28296c84 100644
--- a/templates/show_install_config.inc
+++ b/templates/show_install_config.inc
@@ -6,7 +6,7 @@
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
+1 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,
@@ -25,7 +25,7 @@
*/
?>
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
<head>
<title>Ampache :: For The Love Of Music - Install</title>
</head>
@@ -125,12 +125,13 @@
<tr>
<td>&nbsp;</td>
<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>
+ <?php $check_url = $GLOBALS['php_self'] . "?action=show_create_config&amp;htmllang=$htmllang&amp;charset=$charset&amp;local_db=" . $_REQUEST['local_db'] . "&amp;local_host=" . $_REQUEST['local_host']; ?>
+ <a href="<?php echo $check_url; ?>">[<?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">
+ <form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=show_create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data">
<input type="Submit" value="Continue to Step 3" />
</form>
</div>
diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php
new file mode 100644
index 00000000..e4ccfbf9
--- /dev/null
+++ b/templates/show_install_lang.inc.php
@@ -0,0 +1,60 @@
+<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/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">
+ <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>Choose installation language.</b>
+ <p>
+ <?php echo $GLOBALS['error']->print_error('general'); ?>
+
+<form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . "?action=init"; ?>" enctype="multipart/form-data" >
+
+<?
+$languages = get_languages();
+$var_name = $value . "_lang";
+${$var_name} = "selected=\"selected\"";
+
+echo "<select name=\"htmllang\">\n";
+
+foreach ($languages as $lang=>$name) {
+ $var_name = $lang . "_lang";
+
+ echo "\t<option value=\"$lang\" " . ${$var_name} . ">$name</option>\n";
+} // end foreach
+echo "</select>\n";
+?>
+
+<input type="submit" value="<?php echo _('Start configuration'); ?>">
+
+ </form>
+ </p>
+ </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_localplay.inc.php b/templates/show_localplay.inc.php
index b9d126b9..e73a15cc 100644
--- a/templates/show_localplay.inc.php
+++ b/templates/show_localplay.inc.php
@@ -26,8 +26,12 @@ $songs = $localplay->get();
?>
<div class="text-box">
-<span class="header2"><?php echo _('Localplay'); ?></span>
-<!-- Yea I don't know what to put here... yet.. -->
+<span class="header2"><?php echo ucfirst($localplay->type); ?> <?php echo _('Localplay'); ?></span>
+<ul class="text-action">
+<?php if ($localplay->has_function('delete_all')) { ?>
+ <li><a href="<?php echo $web_path; ?>/localplay.php?action=delete_all"><?php echo _('Clear Playlist'); ?></a></li>
+<?php } ?>
+</ul>
</div>
<br />
<div class="text-box">
@@ -51,7 +55,7 @@ $songs = $localplay->get();
</tr>
<?php } if (!count($songs)) { ?>
<tr class="<?php echo flip_class(); ?>">
- <td colspan="2"><span class="error"><?php echo _('No Records Found'); ?></span></td>
+ <td colspan="3"><span class="error"><?php echo _('No Records Found'); ?></span></td>
</tr>
<?php } ?>
</table>
diff --git a/templates/show_modules.inc.php b/templates/show_modules.inc.php
index 8b0b139f..0fc80bfb 100644
--- a/templates/show_modules.inc.php
+++ b/templates/show_modules.inc.php
@@ -30,7 +30,7 @@
$localplay_modules = get_localplay_controllers();
$web_path = conf('web_path');
?>
-<span class="header2"><?php echo _('Modules'); ?></span>
+<span class="header1"><?php echo _('Modules'); ?></span>
<table class="border" border="0" cellspacing="0">
<tr class="table-header">
<th><?php echo _('Module Name'); ?></th>
diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index 99916072..83ff2c54 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -186,6 +186,10 @@ $web_path = conf('web_path');
<?php require_once(conf('prefix') . '/templates/show_localplay_control.inc.php'); ?>
<br />
<?php $type = conf('play_type'); ${$type} = 'id="pt_active"'; ?>
+ <?php
+ $required_info = "&amp;user_id=" . $GLOBALS['user']->id . "&amp;sessid=" . session_id();
+ $ajax_url = $web_path . '/server/ajax.server.php';
+ ?>
<span class="text-action" style="cursor:pointer;" id="play_type">
<span <?php echo $stream; ?> onclick="ajaxPut('<?php echo $ajax_url; ?>','action=change_play_type&amp;type=stream<?php echo $required_info; ?>','play_type');return true;">
<?php echo _('Stream') ?>