removed random space on lastfm prefs, started work on managing shout and flagged items, cleaned up shoutbox css a bit

4 files changed, 24 insertions, 42 deletions

diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php
index e8eb0b72..39c93c0e 100644
--- a/templates/show_flagged.inc.php
+++ b/templates/show_flagged.inc.php
@@ -24,7 +24,6 @@ $web_path = Config::get('web_path');
 <form id="songs" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=reject_flags">
 <table class="tabledata" cellpadding="0" cellspacing="0">
 <colgroup>
-  <col id="col_select" />
   <col id="col_object" />
   <col id="col_username" />
   <col id="col_flag" />
@@ -33,7 +32,6 @@ $web_path = Config::get('web_path');
   <col id="col_action" />
 </colgroup>
 <tr class="th-top">
-	<th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th>
 	<th class="cel_object"><?php echo _('Object'); ?></th>
 	<th class="cel_username"><?php echo _('User'); ?></th>
 	<th class="cel_flag"><?php echo _('Flag'); ?></th>
@@ -43,9 +41,6 @@ $web_path = Config::get('web_path');
 </tr>
 <?php foreach ($flagged as $data) { $flag = new Flag($data); ?>
 <tr class="<?php echo flip_class(); ?>">
-	<td class="cel_select">
-		<input type="checkbox" name="song[]" value="<?php echo $flag->id; ?>" id="song_<?php echo $flag->id; ?>" />
-	</td>
 	<td class="cel_object"><a href="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=show_edit_song&song=<?php echo $flag->object_id; ?>"><?php $flag->print_name(); ?></a></td>
 	<td class="cel_username"><?php echo scrub_out($flag->f_user_username); ?></td>
 	<td class="cel_flag"><?php $flag->print_flag(); ?></td>
@@ -69,7 +64,6 @@ $web_path = Config::get('web_path');
 </tr>
 <?php } ?>
 <tr class="th-bottom">
-	<th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th>
 	<th class="cel_object"><?php echo _('Object'); ?></th>
 	<th class="cel_username"><?php echo _('User'); ?></th>
 	<th class="cel_flag"><?php echo _('Flag'); ?></th>
@@ -78,16 +72,4 @@ $web_path = Config::get('web_path');
 	<th class="cel_action"><?php echo _('Action'); ?></th>
 </tr>
 </table>
-<div class="formValidation">
-		<select name="update_action">
-			<option value="reject"><?php echo _('Reject'); ?></option>
-			<option value="approve"><?php echo _('Approve'); ?></option>
-		</select>
-		<input class="button" type="submit" value="<?php echo _('Update'); ?>" />
-</div>
 </form>
-<div>
-  <a class="button" href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged">
-  	<?php echo _('Show All'); ?>...
-  </a>
-</div>
diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php
index 5dbdf08b..50637547 100644
--- a/templates/show_index.inc.php
+++ b/templates/show_index.inc.php
@@ -28,17 +28,6 @@ if (isset($_REQUEST['xspf']) && isset ($_REQUEST['play_info'])){
 <div id="now_playing">
         <?php show_now_playing(); ?>
 </div> <!-- Close Now Playing Div -->
-<!-- Sticky Objects, if sticky is enabled --> 
-<?php if (Config::get('shoutbox')) { ?>
-<div id="shout_objects">
-	<?php 
-		$shouts = shoutBox::get_top('5'); 
-		if (count($shouts)) { 
-			require_once Config::get('prefix') . '/templates/show_shoutbox.inc.php'; 
-		} 
-	?>
-</div>
-<?php } ?>
 <!-- Randomly selected albums of the moment --> 
 <div id="random_selection">
 	<?php
@@ -55,3 +44,15 @@ if (isset($_REQUEST['xspf']) && isset ($_REQUEST['play_info'])){
 		show_box_bottom(); 
         ?>
 </div>
+<!-- Shoutbox Objects, if shoutbox is enabled --> 
+<?php if (Config::get('shoutbox')) { ?>
+<div id="shout_objects">
+	<?php 
+		$shouts = shoutBox::get_top('5'); 
+		if (count($shouts)) { 
+			require_once Config::get('prefix') . '/templates/show_shoutbox.inc.php'; 
+		} 
+	?>
+</div>
+<?php } ?>
+
diff --git a/templates/show_shoutbox.inc.php b/templates/show_shoutbox.inc.php
index 8274f716..72da5ac1 100644
--- a/templates/show_shoutbox.inc.php
+++ b/templates/show_shoutbox.inc.php
@@ -20,7 +20,7 @@
 */
 ?>
 <?php show_box_top(_('Shoutbox')); ?>
-<table class="tabledata" cellpadding="0" cellspacing="0">
+<div id="shoutbox">
 <?php foreach ($shouts as $shout_id) { 
 	$shout = new shoutBox($shout_id); 
 	$object = shoutBox::get_object($shout->object_type,$shout->object_id); 
@@ -28,17 +28,12 @@
 	$client = new User($shout->user); 
 	$client->format(); 
 ?>
-<tr>
-	<td class="cel_image">
-	<?php echo $shout->get_image(); ?><br />
+<div class="shout">
 	<strong><?php echo ucfirst($shout->object_type); ?>:</strong> <?php echo $object->f_link; ?><br />
-	</td>
-	<td valign="top" class="cel_comment">
-		<?php echo scrub_out($shout->text); ?>
-		<br />
-		<span class="information">- <?php echo $client->f_link; ?> <?php echo date("d/m/Y H:i",$shout->date); ?></span>
-	</td>
-</tr>
+	<?php echo $shout->get_image(); ?><br />
+	<?php echo scrub_out($shout->text); ?><br />
+	<span class="information"><?php echo $client->f_link; ?> <?php echo date("d/m H:i",$shout->date); ?></span>
+</div>
 <?php } ?>
-</table>
+</div>
 <?php show_box_bottom(); ?>
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index af1be577..843a1de3 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -23,7 +23,11 @@
       <li id="sb_admin_ot_Duplicates"><a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Find Duplicates'); ?></a></li>
       <li id="sb_admin_ot_Mail"><a href="<?php echo $web_path; ?>/admin/mail.php"><?php echo _('Mail Users'); ?></a></li>
       <li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></li>
-      <li id="sb_admin_ot_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Catalog Stats'); ?></a></li>
+      <li id="sb_admin_ot_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Stats'); ?></a></li>
+      <li id="sb_admin_ot_ManageFlagged"><a href="<?php echo $web_path; ?>/admin/flag.php"><?php echo _('Manage Flagged'); ?></a></li>
+      <?php if (Config::get('shoutbox')) { ?>
+      <li id="sb_admin_ot_ManageShoutbox"><a href="<?php echo $web_path; ?>/admin/shout.php?action=show_manage"><?php echo _('Manage Shoutbox'); ?></a></li>
+      <?php } ?>
     </ul>
   </li>