From 00d74cac5a20c26017554b5e6eaef624b48f886e Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Tue, 31 Oct 2006 06:55:54 +0000
Subject: fixed something I thought I had already fixed, and fiddled with
 democratic play a tiny bit

---
 templates/show_modules.inc.php     |  2 +-
 templates/show_tv.inc.php          |  6 ++----
 templates/show_tv_adminctl.inc.php | 11 +++++------
 3 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'templates')

diff --git a/templates/show_modules.inc.php b/templates/show_modules.inc.php
index 4530b75e..5f735b61 100644
--- a/templates/show_modules.inc.php
+++ b/templates/show_modules.inc.php
@@ -27,7 +27,7 @@
  */
 
 /* Get Localplay Modules */
-$localplay_modules = get_localplay_controllers(); 
+$localplay_modules = get_localplay_controllers('disabled'); 
 $web_path = conf('web_path'); 
 ?>
 <?php show_box_top(_('Modules')); ?>
diff --git a/templates/show_tv.inc.php b/templates/show_tv.inc.php
index ddd0beea..b891a2ae 100644
--- a/templates/show_tv.inc.php
+++ b/templates/show_tv.inc.php
@@ -5,9 +5,8 @@
  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.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -48,7 +47,6 @@ if ($GLOBALS['user']->has_access(100)) {
 else { 
 
 } 
-
 ?>
 </div>
 <!-- End Control Div -->
diff --git a/templates/show_tv_adminctl.inc.php b/templates/show_tv_adminctl.inc.php
index d3bbcf5e..f2c383f1 100644
--- a/templates/show_tv_adminctl.inc.php
+++ b/templates/show_tv_adminctl.inc.php
@@ -21,14 +21,13 @@
 */
 ?>
 <h3><?php echo _('Admin Controls'); ?></h3>
-<?php if (!$playlist->vote_active()) { ?>
-<form id="form_playlist">
+<?php if (!$tmp_playlist->vote_active()) { ?>
+<form id="form_playlist" method="post" action="<?php echo conf('web_path'); ?>/tv.php" enctype="multipart/form-data" >
 <?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'); ?>" />
+<input type="hidden" name="action" value="create_playlist" />
+<input type="submit" value="<?php echo _('Activate'); ?>" />
 </form>
-
 <?php } else { ?>
-
-
+<?php echo _('Democratic Play Active'); ?>
 <?php } ?>
-- 
cgit