few more tweaks and some work on the tv pages

4 files changed, 93 insertions, 87 deletions

diff --git a/templates/javascript_refresh.inc.php b/templates/javascript_refresh.inc.php
index 1da0c76b..5fa45604 100644
--- a/templates/javascript_refresh.inc.php
+++ b/templates/javascript_refresh.inc.php
@@ -20,7 +20,7 @@ function refresh()
 }
 
 // start with page-load
-window.onload=doLoad();
+window.onload=doLoad;
 // End -->
 </script>
 
diff --git a/templates/menu.inc b/templates/menu.inc
deleted file mode 100644
index 54e0ba05..00000000
--- a/templates/menu.inc
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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 
- A template file
-
-*/
-$web_path = conf('web_path');
-$items = array(_("Home") => htmlspecialchars($web_path . "/index.php"));
-
-if ($GLOBALS['user']->prefs['play_type'] == 'mpd' && conf('localplay_menu')) {
-	$items += array(_("Local Play") => htmlspecialchars($web_path . "/mpd.php"));
-}
-
-$items += array(_("Browse")	=> htmlspecialchars($web_path . "/browse.php"),
-//		_("Albums")	=> htmlspecialchars($web_path . "/albums.php"),
-//		_("Artists")	=> htmlspecialchars($web_path . "/artists.php"),
-		_("Playlists")	=> htmlspecialchars($web_path . "/playlist.php"),
-		_("Search")	=> htmlspecialchars($web_path . "/search.php"),
-		_("Preferences") => htmlspecialchars($web_path . "/preferences.php")
-        );
-if ($GLOBALS['user']->prefs['upload']) { 
-	$items = array_merge($items, array(_("Upload") => $web_path . "/upload.php"));
-}
-?>
-
-<ul id="mainmenu">
-<?php
-foreach (array_keys($items) as $item) {
-	if (_($high) == $item) {
-		print("\t\t<li class=\"active\"><a class=\"active\" href=\"$items[$item]\">$item</a></li>\n");
-	}
-	else {
-		print("\t\t<li><a href=\"$items[$item]\">$item</a></li>\n");
-	}
-} // end foreach items
-
-if ((!conf('use_auth')) || ($GLOBALS['user']->has_access(100))) {
-	if ($high == 'Admin') {
-		print("\t\t<li class=\"active\"><a class=\"active\" href=\"" . $web_path . "/admin/\">" . _("Admin") . "</a></li>\n");
-	}
-	else {
-		print("\t\t<li><a href=\"" . $web_path . "/admin/\">" . _("Admin") . "</a></li>\n");
-	}
-} // if we aren't using auth or 100
-
-// now do the user specific stuff
-if (conf('use_auth')) {
-	if (($high == 'Stats') || ($high == 'Profile')) {
-		print("\t\t<li class=\"active\">".$GLOBALS['user']->username.": <a class=\"active\" href=\"".$web_path."/user.php?action=show_edit_profile\">" . _("Account") . "</a> |".
-		"<a class=\"active\" href=\"".$web_path."/stats.php\">" . _("Stats") . "</a> |".
-		"<a class=\"active\" href=\"".$web_path."/logout.php\">" . _("Logout") . "</a> </li>\n");
-	} // if stats or profile
-	else {
-		echo "\t\t<li>".$GLOBALS['user']->username.": " .
-		"<a href=\"".$web_path."/user.php?action=show_edit_profile\">" . _("Account") . "</a> |".
-		"<a href=\"".$web_path."/stats.php\">" . _("Stats") . "</a> |".
-		"<a href=\"".$web_path."/logout.php\">" . _("Logout") . "</a> </li>\n";
-	} // else
-}  // if use_auth
-elseif ($_SESSION['userdata']['id'] != '-1') { 
-	print("\t\t<li><a href=\"".$web_path."/logout.php\">" . _("Logout") . "</a> </li>\n");
-} // else no user
-?>
-</ul>
-<br />
diff --git a/templates/show_tv.inc.php b/templates/show_tv.inc.php
new file mode 100644
index 00000000..ddd0beea
--- /dev/null
+++ b/templates/show_tv.inc.php
@@ -0,0 +1,58 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 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.
+
+*/
+
+$htmllang = str_replace("_","-",conf('lang'));
+$location = get_location();
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
+
+<head>
+<link rel="shortcut icon" href="<?php echo $web_path; ?>/favicon.ico" />
+<meta http-equiv="Content-Type" content="text/html; 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" />
+<link rel="stylesheet" href="<?php echo $web_path; ?><?php echo conf('theme_path'); ?>/templates/default.css" type="text/css" />
+</head>
+<body>
+<script src="<?php echo $web_path; ?>/lib/general.js" language="javascript" type="text/javascript"></script>
+<script src="<?php echo $web_path; ?>/modules/kajax/ajax.js" language="javascript" type="text/javascript"></script>
+<!-- Control DIV -->
+<div id="tv_control">
+<?php 
+/* If they are a admin */
+if ($GLOBALS['user']->has_access(100)) { 
+	require_once(conf('prefix') . '/templates/show_tv_adminctl.inc.php');	
+} 
+/* Else normal User */
+else { 
+
+} 
+
+?>
+</div>
+<!-- End Control Div -->
+<div id="tv_np">
+</div>
+<div id="tv_playlist">
+</div>
diff --git a/templates/show_tv_adminctl.inc.php b/templates/show_tv_adminctl.inc.php
new file mode 100644
index 00000000..d3bbcf5e
--- /dev/null
+++ b/templates/show_tv_adminctl.inc.php
@@ -0,0 +1,34 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 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.
+
+*/
+?>
+<h3><?php echo _('Admin Controls'); ?></h3>
+<?php if (!$playlist->vote_active()) { ?>
+<form id="form_playlist">
+<?php echo _('Base Playlist'); ?>:
+<?php show_playlist_dropdown(); ?>
+<input type="button" onclick="ajaxPost('<?php conf('ajax_url'); ?>?action=tv_activate<?php echo conf('ajax_info'); ?>','form_playlist');return true;" value="<?php echo _('Activate'); ?>" />
+</form>
+
+<?php } else { ?>
+
+
+<?php } ?>