fixed the acl issue... sigh

2 files changed, 27 insertions, 3 deletions

diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php
index cce0857d..7059cebe 100644
--- a/templates/show_create_democratic.inc.php
+++ b/templates/show_create_democratic.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) 2001 - 2008 Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -31,6 +31,20 @@ show_box_top(_('Create Democratic Playlist')); ?>
 	<td><?php show_playlist_select('democratic'); ?></td>
 </tr>
 <tr>
+	<td><?php echo _('Cooldown Time'); ?></td>	
+	<td><input type="textbox" size="4" maxlength="6" name="cooldown" value="5" /><?php echo _('minutes'); ?></td>
+</tr>
+<tr>
+	<td><?php echo _('Level'); ?></td>
+	<td>
+		<select name="level">
+                <option value="25"><?php echo _('User'); ?></option>
+                <option value="50"><?php echo _('Content Manager'); ?></option>
+                <option value="75"><?php echo _('Catalog Manager'); ?></option>
+                <option value="100"><?php echo _('Admin'); ?></option>
+                </select>
+
+<tr>
 	<td><?php echo _('Make Default'); ?></td>
 	<td><input type="checkbox" name="make_default" value="1" /></td>
 </tr>
diff --git a/templates/show_manage_democratic.inc.php b/templates/show_manage_democratic.inc.php
index 8c5a88c0..8361e525 100644
--- a/templates/show_manage_democratic.inc.php
+++ b/templates/show_manage_democratic.inc.php
@@ -25,23 +25,33 @@ show_box_top(_('Manage Democratic Playlists'));  ?>
 	<col id="col_number" />
 	<col id="col_base_playlist" />
 	<col id="col_vote_count" />
+	<col id="col_cooldown" />
+	<col id="col_level" />
+	<col id="col_default" />
 	<col id="col_action" />
 </colgroup>
 <tr class="th-top">
 	<th class="cel_number"><?php echo _('Playlist'); ?></th>
 	<th class="cel_base_playlist"><?php echo _('Base Playlist'); ?></th>
+	<th class="cel_cooldown"><?php echo _('Cooldown'); ?></th>
+	<th class="cel_level"><?php echo _('Level'); ?></th>
+	<th class="cel_default"><?php echo _('Default'); ?></th>
 	<th class="cel_vote_count"><?php echo _('Songs'); ?></th>
 	<th class="cel_action"><?php echo _('Action'); ?></th>
 </tr>
 <?php
 	foreach ($playlists as $democratic_id) { 
 		$democratic = new Democratic($democratic_id); 
+		$democratic->format(); 
 		$playlist = new Playlist($democratic->base_playlist); 
 		$playlist->format(); 
 ?>
 <tr class="<?php echo flip_class(); ?>">
-	<td><?php echo abs($democratic->id); ?></td>
+	<td><?php echo scrub_out($democratic->name); ?></td>
 	<td><?php echo $playlist->f_link; ?></td>
+	<td><?php echo $democratic->f_cooldown; ?></td>
+	<td><?php echo $democratic->f_level; ?></td>
+	<td><?php echo $democratic->f_primary; ?></td>
 	<td><?php echo $democratic->count_items(); ?></td>
 	<td>
 	<?php echo Ajax::button('?page=democratic&action=send_playlist','all',_('Play'),'play_democratic'); ?>
@@ -49,7 +59,7 @@ show_box_top(_('Manage Democratic Playlists'));  ?>
 </tr>
 <?php } if (!count($playlists)) { ?>
 <tr>
-	<td colspan="4"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td>
+	<td colspan="7"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td>
 </tr>
 <?php } ?>
 </table>