From d7f75d16b5ef190eb0bad3c7e9fcbd1e248c5a41 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Tue, 24 Jul 2007 05:02:50 +0000
Subject: added album and artist dynamic options, tweaked display and how you
 add em... still not happy with it, but good enough for now

---
 templates/rightbar.inc.php | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'templates/rightbar.inc.php')

diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php
index 6dbdabe0..73104e3c 100644
--- a/templates/rightbar.inc.php
+++ b/templates/rightbar.inc.php
@@ -29,9 +29,6 @@
         </a>
 	</li>
 <?php } ?>
-	<li>
-	<?php echo Ajax::button('?action=basket&type=dynamic','cog',_('Add Dynamic Item'),'rightbar_dynamic_playlist'); ?>
-	</li>
 	<li>
 	<?php echo Ajax::button('?action=basket&type=clear_all','delete',_('Clear Playlist'),'rightbar_clear_playlist'); ?>
 	</li>
@@ -42,13 +39,13 @@
 	//FIXME :: this feels kludgy
 	$objects = $GLOBALS['user']->playlist->get_items(); 
 	foreach ($objects as $uid=>$object_data) { 
-		if ($object_data['1'] == 'special') { 
-			$object->f_link = _('Dynamic Playlist Item'); 
-		} 
-		else { 
+		if ($object_data['1'] == 'radio' || $object_data['1'] == 'song') { 
 			$object = new $object_data['1']($object_data['0']); 
 			$object->format(); 
 		} 
+		else { 
+			$object->f_link = Random::get_type_name($object_data['1']); 
+		} 
 ?>
 <tr class="<?php echo flip_class(); ?>">
 	<td>
@@ -63,4 +60,18 @@
 <?php } ?>
 </table>
 </div>
+<div id="rightbar-bottom">
+<h4><?php echo _('Add Dynamic Items'); ?></h4>
+<span><?php echo Ajax::button('?action=basket&type=dynamic&random_type=default','add',_('Add'),'rightbar_pure_random'); ?>
+<?php echo _('Pure Random'); ?></span>
+
+<span><?php echo Ajax::button('?action=basket&type=dynamic&random_type=artist','add',_('Add'),'rightbar_related_artist'); ?>
+<?php echo _('Related Artist'); ?></span>
+
+<span><?php echo Ajax::button('?action=basket&type=dynamic&random_type=album','add',_('Add'),'rightbar_related_album'); ?>
+<?php echo _('Related Album'); ?></span>
+
+<span><?php echo Ajax::button('?action=basket&type=dynamic&random_type=genre','add',_('Add'),'rightbar_related_genre'); ?>
+<?php echo _('Related Genre'); ?></span>
+</div>
 <?php show_box_bottom(); ?> 
-- 
cgit