diff options
author | xgizzmo <xgizzmo@ampache> | 2006-12-10 01:15:58 +0000 |
---|---|---|
committer | xgizzmo <xgizzmo@ampache> | 2006-12-10 01:15:58 +0000 |
commit | 71febbd440d5d1a3d980891af5ca9e093d79d10e (patch) | |
tree | 9b3760d22126fdf46208f8f7df9b558560d31ba6 | |
parent | 7b573c10178323578a0f882d78d90f2bf0a229f8 (diff) | |
download | ampache-71febbd440d5d1a3d980891af5ca9e093d79d10e.tar.gz ampache-71febbd440d5d1a3d980891af5ca9e093d79d10e.tar.bz2 ampache-71febbd440d5d1a3d980891af5ca9e093d79d10e.zip |
small fixups and tweakage
-rw-r--r-- | templates/header.inc | 4 | ||||
-rw-r--r-- | templates/show_admin_tools.inc.php | 2 | ||||
-rw-r--r-- | templates/show_install.inc | 6 | ||||
-rw-r--r-- | templates/show_install_account.inc.php | 2 | ||||
-rw-r--r-- | templates/show_install_config.inc | 2 | ||||
-rw-r--r-- | templates/show_install_lang.inc.php | 4 | ||||
-rw-r--r-- | templates/show_preference_admin.inc.php | 3 |
7 files changed, 12 insertions, 11 deletions
diff --git a/templates/header.inc b/templates/header.inc index 2e11c5d1..cc184748 100644 --- a/templates/header.inc +++ b/templates/header.inc @@ -22,7 +22,7 @@ $web_path = conf('web_path'); $htmllang = str_replace("_","-",conf('lang')); $location = get_location(); ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>"> <head> @@ -36,7 +36,7 @@ if (conf('use_rss')) { ?> <link rel="alternate" type="application/rss+xml" title="Ampache Most Popular Artists" href="<?php echo $web_path; ?>/rss.php?type=popularalbum" /> <link rel="alternate" type="application/rss+xml" title="Ampache Most Popular Songs" href="<?php echo $web_path; ?>/rss.php?type=popularsong" /> <?php } ?> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo conf('site_charset'); ?>" /> +<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=<?php echo conf('site_charset'); ?>" /> <title><?php echo conf('site_title'); ?> - <?php echo $location['title']; ?></title> <link rel="stylesheet" href="<?php echo $web_path; ?>/templates/default.css" type="text/css" media="screen" /> <link rel="stylesheet" href="<?php echo $web_path; ?>/templates/print.css" type="text/css" media="print" /> diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php index 3cfad0f6..5513d74f 100644 --- a/templates/show_admin_tools.inc.php +++ b/templates/show_admin_tools.inc.php @@ -79,7 +79,7 @@ $users = $GLOBALS['user']->get_recent(10); <a href="<?php echo $web_path; ?>/admin/system.php?action=generate_config"><?php echo _('Generate New Config'); ?></a> <a href="<?php echo $web_path; ?>/admin/preferences.php?action=show_set_preferences"><?php echo _('Preferences Permissions'); ?></a> <hr noshade="noshade" size="3" /> - <a href="<?php echo $web_path; ?>/admin/system.php?action=export&export=itunes"><?php echo _('Export To Itunes DB'); ?></a> + <a href="<?php echo $web_path; ?>/admin/system.php?action=export&export=itunes"><?php echo _('Export To Itunes DB'); ?></a> <!-- <a href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo _('Check for New Version'); ?></a>--> </div> <?php show_box_bottom(); ?> diff --git a/templates/show_install.inc b/templates/show_install.inc index 92c649b3..29f1570d 100644 --- a/templates/show_install.inc +++ b/templates/show_install.inc @@ -1,8 +1,8 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <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> -<?php //require_once(conf('prefix') . "/templates/install.css"); ?> +<?php require_once(conf('prefix') . "/templates/install.css"); ?> </head> <body> <script src="lib/javascript-base.js" language="javascript" type="text/javascript"></script> @@ -56,7 +56,7 @@ </tr> <tr> <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');" /></td> + <td><input type="checkbox" value="create_db_user" name="db_user" onclick="flipField('db_username');flipField('db_password');" /></td> </tr> <tr> <td class="align"><?php echo _("Ampache Database Username"); ?></td> diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php index e6257688..30a63247 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -25,7 +25,7 @@ */ ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <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> diff --git a/templates/show_install_config.inc b/templates/show_install_config.inc index 1cd287c7..e39c92f9 100644 --- a/templates/show_install_config.inc +++ b/templates/show_install_config.inc @@ -25,7 +25,7 @@ */ ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <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> diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index 5d87c1be..264683c7 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="$htmllang" lang="$htmllang"> <head> <title>Ampache :: Pour l'Amour de la Musique - Install</title> @@ -32,7 +32,7 @@ </p> <form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . "?action=init"; ?>" enctype="multipart/form-data" > -<? +<?php $languages = get_languages(); $var_name = $value . "_lang"; ${$var_name} = "selected=\"selected\""; diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php index 203ffe57..6fa4de4a 100644 --- a/templates/show_preference_admin.inc.php +++ b/templates/show_preference_admin.inc.php @@ -45,7 +45,8 @@ <td colspan="2"> <input type="hidden" name="action" value="set_preferences" /> <input type="submit" value="<?php echo _('Update'); ?>" /> - </td> + </td> +</tr> </table> </form> <?php show_box_bottom(); ?> |