new icons

32 files changed, 34 insertions, 21 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index c75b4259..b7f85d31 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -3,6 +3,11 @@
 --------------------------------------------------------------------------
 
 --------------------------------------------------------------------------
+  v.3.3.3-Beta3 
+	- Added new Icons from http://www.famfamfam.com from the Silk
+		subset. (Thx kalrnux && Mark James)
+
+--------------------------------------------------------------------------
   v.3.3.3-Beta2 12/18/2006: 
 	- Fixed a bug that prevented adding new songs to the catalog.
 	- Removed a upload preference that I missed.
diff --git a/images/icon_disable.png b/images/icon_disable.png
index c149c2bc..e95b8c5b 100644
--- a/images/icon_disable.png
+++ b/images/icon_disable.png
diff --git a/images/icon_disable_hover.png b/images/icon_disable_hover.png
new file mode 100644
index 00000000..e95b8c5b
--- /dev/null
+++ b/images/icon_disable_hover.png
diff --git a/images/icon_enable.png b/images/icon_enable.png
new file mode 100644
index 00000000..d22fde8b
--- /dev/null
+++ b/images/icon_enable.png
diff --git a/images/icon_enable_hover.png b/images/icon_enable_hover.png
new file mode 100644
index 00000000..0dd848bd
--- /dev/null
+++ b/images/icon_enable_hover.png
diff --git a/images/icon_next.png b/images/icon_next.png
new file mode 100644
index 00000000..31f7fd3a
--- /dev/null
+++ b/images/icon_next.png
diff --git a/images/icon_next_hover.png b/images/icon_next_hover.png
new file mode 100644
index 00000000..4a2f9d4e
--- /dev/null
+++ b/images/icon_next_hover.png
diff --git a/images/icon_pause.png b/images/icon_pause.png
new file mode 100644
index 00000000..2d9ce9c4
--- /dev/null
+++ b/images/icon_pause.png
diff --git a/images/icon_pause_hover.png b/images/icon_pause_hover.png
new file mode 100644
index 00000000..ec61099b
--- /dev/null
+++ b/images/icon_pause_hover.png
diff --git a/images/icon_play.png b/images/icon_play.png
new file mode 100644
index 00000000..0846555d
--- /dev/null
+++ b/images/icon_play.png
diff --git a/images/icon_play_hover.png b/images/icon_play_hover.png
new file mode 100644
index 00000000..f8c8ec68
--- /dev/null
+++ b/images/icon_play_hover.png
diff --git a/images/icon_preferences.png b/images/icon_preferences.png
index af486c94..c02f315d 100644
--- a/images/icon_preferences.png
+++ b/images/icon_preferences.png
diff --git a/images/icon_prev.png b/images/icon_prev.png
new file mode 100644
index 00000000..c0294477
--- /dev/null
+++ b/images/icon_prev.png
diff --git a/images/icon_prev_hover.png b/images/icon_prev_hover.png
new file mode 100644
index 00000000..15d1584b
--- /dev/null
+++ b/images/icon_prev_hover.png
diff --git a/images/icon_stop.png b/images/icon_stop.png
new file mode 100644
index 00000000..893bb60e
--- /dev/null
+++ b/images/icon_stop.png
diff --git a/images/icon_stop_hover.png b/images/icon_stop_hover.png
new file mode 100644
index 00000000..e6f75d23
--- /dev/null
+++ b/images/icon_stop_hover.png
diff --git a/images/icon_volumedn.png b/images/icon_volumedn.png
new file mode 100644
index 00000000..4d918633
--- /dev/null
+++ b/images/icon_volumedn.png
diff --git a/images/icon_volumemute.png b/images/icon_volumemute.png
new file mode 100644
index 00000000..b652d2a7
--- /dev/null
+++ b/images/icon_volumemute.png
diff --git a/images/icon_volumeup.png b/images/icon_volumeup.png
new file mode 100644
index 00000000..6056d234
--- /dev/null
+++ b/images/icon_volumeup.png
diff --git a/images/localplay/next.gif b/images/localplay/next.gif
deleted file mode 100755
index 367b6d90..00000000
--- a/images/localplay/next.gif
+++ /dev/null
diff --git a/images/localplay/pause.gif b/images/localplay/pause.gif
deleted file mode 100755
index ce70915b..00000000
--- a/images/localplay/pause.gif
+++ /dev/null
diff --git a/images/localplay/play.gif b/images/localplay/play.gif
deleted file mode 100755
index 6c106621..00000000
--- a/images/localplay/play.gif
+++ /dev/null
diff --git a/images/localplay/prev.gif b/images/localplay/prev.gif
deleted file mode 100755
index 56700e53..00000000
--- a/images/localplay/prev.gif
+++ /dev/null
diff --git a/images/localplay/stop.gif b/images/localplay/stop.gif
deleted file mode 100755
index 74210c82..00000000
--- a/images/localplay/stop.gif
+++ /dev/null
diff --git a/images/localplay/voldn.gif b/images/localplay/voldn.gif
deleted file mode 100644
index eb6a0ff7..00000000
--- a/images/localplay/voldn.gif
+++ /dev/null
diff --git a/images/localplay/volup.gif b/images/localplay/volup.gif
deleted file mode 100644
index 4e7288e4..00000000
--- a/images/localplay/volup.gif
+++ /dev/null
diff --git a/lib/init.php b/lib/init.php
index 7b834c75..2b45e59e 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -67,7 +67,7 @@ if (!$results = read_config($configfile,0)) {
 } 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.3.3-Beta2';
+$results['version']		= '3.3.3-Beta3 (Build 001)';
 
 $results['raw_web_path']	= $results['web_path'];
 $results['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index 4f8cb3aa..169ce48b 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -1273,10 +1273,11 @@ function show_box_bottom() {
  * this function takes a name and a returns either a text representation
  * or an <img /> tag 
  */
-function get_user_icon($name) { 
+function get_user_icon($name,$hover_name='') { 
 
 	$icon_name = 'icon_' . $name . '.png';
 
+	/* Build the image url */
 	if (file_exists(conf('prefix') . '/themes/' . $GLOBALS['theme']['path'] . '/images/' . $icon_name)) { 
 		$img_url = conf('web_path') . conf('theme_path') . '/images/' . $icon_name;
 	}
@@ -1284,7 +1285,20 @@ function get_user_icon($name) {
 		$img_url = conf('web_path') . '/images/' . $icon_name; 
 	}
 
-	$string = "<img style=\"cursor: pointer;\" src=\"$img_url\" border=\"0\" alt=\"$name\" title=\"$name\" />";
+	/* If Hover, then build its url */
+	if (!empty($hover_name)) { 
+		$hover_icon = 'icon_' . $hover_name . '.png';
+		if (file_exists(conf('prefix') . '/themes/' . $GLOBALS['theme']['path'] . '/images/' . $icon_name)) { 
+			$hov_url = conf('web_path') . conf('theme_path') . '/images/' . $hover_icon;
+		}
+		else { 
+			$hov_url = conf('web_path') . '/images/' . $hover_icon;
+		}
+		
+		$hov_txt = "onMouseOver=\"this.src='$hov_url'; return true;\" onMouseOut=\"this.src='$img_url'; return true;\"";
+	}
+
+	$string = "<img style=\"cursor: pointer;\" src=\"$img_url\" border=\"0\" alt=\"$name\" title=\"$name\" $hov_txt/>";
 
 	return $string;
 
diff --git a/templates/show_localplay_control.inc.php b/templates/show_localplay_control.inc.php
index ee4512be..e3384431 100644
--- a/templates/show_localplay_control.inc.php
+++ b/templates/show_localplay_control.inc.php
@@ -32,23 +32,23 @@ if (is_object($localplay)) {
 <div class="localplaycontrol" style="display:table-cell;cursor:pointer;padding:2px;">
 <?php if ($localplay->has_function('prev')) { ?>
 <span class="prev_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=prev<?php echo $required_info; ?>');return true;">
-	<img src="<?php echo $web_path; ?>/images/localplay/prev.gif" alt="prev" />
+	<?php echo get_user_icon('prev','prev_hover'); ?>
 </span>
 <?php } ?>
 <span class="stop_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=stop<?php echo $required_info; ?>');return true;">
-	<img src="<?php echo $web_path; ?>/images/localplay/stop.gif" alt="stop" />
+	<?php echo get_user_icon('stop','stop_hover'); ?>
 </span>
 <?php if ($localplay->has_function('pause')) { ?>
 <span class="pause_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=pause<?php echo $required_info; ?>');return true;">
-	<img src="<?php echo $web_path; ?>/images/localplay/pause.gif" alt="pause" />
+	<?php echo get_user_icon('pause','pause_hover'); ?>
 </span>
 <?php } ?>
 <span class="play_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=play<?php echo $required_info; ?>');return true;">
-	<img src="<?php echo $web_path; ?>/images/localplay/play.gif" alt="play" />
+	<?php echo get_user_icon('play','play_hover'); ?>
 </span>
 <?php if ($localplay->has_function('next')) { ?>
 <span class="next_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=next<?php echo $required_info; ?>');return true;">
-	<img src="<?php echo $web_path; ?>/images/localplay/next.gif" alt="next" />
+	<?php echo get_user_icon('next','next_hover'); ?>
 </span>
 <?php } ?>
 </div>
diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php
index e7f4dcce..c92d97dd 100644
--- a/templates/show_localplay_status.inc.php
+++ b/templates/show_localplay_status.inc.php
@@ -33,25 +33,19 @@ $status		= $localplay->status();
 &nbsp;&nbsp;<span id="lp_playing"><?php echo $localplay->get_user_playing(); ?></span><br />
 <div align="center"><?php require (conf('prefix') . '/templates/show_localplay_control.inc.php'); ?></div>
 <div align="center">
-	<script type="text/javascript" language="javascript">
-	<!--
-	var lp_v = new Array(1);
-	lp_v[0] = "lp_volume";
-	-->
-	</script>
 	<?php if ($localplay->has_function('volume_up')) { ?>
 	<span class="up_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_up<?php echo $required_info; ?>','lp_v');return true;">
-	        <img src="<?php echo $web_path; ?>/images/localplay/volup.gif" alt="volume up" />
+		<?php echo get_user_icon('volumeup'); ?>
 	</span>
 	<?php } ?>
 	<?php if ($localplay->has_function('volume_down')) { ?>
 	<span class="down_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_down<?php echo $required_info; ?>','lp_v');return true;">
-	        <img src="<?php echo $web_path; ?>/images/localplay/voldn.gif" alt="volume down" />
+		<?php echo get_user_icon('volumedn'); ?>
 	</span>
 	<?php } ?>
 	<?php if ($localplay->has_function('volume_mute')) { ?>
 	<span class="mute_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_mute<?php echo $required_info; ?>','lp_v');return true;">
-	        <img src="<?php echo $web_path; ?>/images/localplay/volmute.gif" alt="volume mute" />
+		<?php echo get_user_icon('volumemute'); ?>
 	</span>
 	<?php } ?>
 	<br />
diff --git a/templates/show_songs.inc b/templates/show_songs.inc
index 8e3c0247..0fa0569c 100644
--- a/templates/show_songs.inc
+++ b/templates/show_songs.inc
@@ -138,11 +138,11 @@ foreach ($song_ids as $song_id) {
 				</a> | 
 				<?php if ($song->enabled) { ?>
 				<a href="<?php echo $web_path; ?>/admin/flag.php?action=disable&amp;song_ids=<?php echo $song->id; ?>">
-					<?php echo get_user_icon('disable'); ?>
+					<?php echo get_user_icon('enable','disable_hover'); ?>
 				</a>
 				<?php } else { ?>
 				<a href="<?php echo $web_path; ?>/admin/flag.php?action=enabled&amp;song_ids=<?php echo $song->id; ?>">
-					<?php echo get_user_icon('enable'); ?>
+					<?php echo get_user_icon('disable','enable_hover'); ?>
 				</a>
 				<?php } //status ?>
 		<?php } //access ?>
diff --git a/templates/show_users.inc b/templates/show_users.inc
index 6b7d3e14..48eb11a3 100644
--- a/templates/show_users.inc
+++ b/templates/show_users.inc
@@ -116,10 +116,10 @@ while ($results = mysql_fetch_object($db_result)) {
 	<?php
 	//FIXME: Fix this for the extra permission levels
 	if ($user->disabled == '1') { 
-		echo "<td><a href=\"".$web_path."/admin/users.php?action=update&amp;user=$user->username&amp;level=enabled\">" . get_user_icon('enable') . "</a></td>";
+		echo "<td><a href=\"".$web_path."/admin/users.php?action=update&amp;user=$user->username&amp;level=enabled\">" . get_user_icon('disable','enable_hover') . "</a></td>";
 	}
 	else {
-		echo "<td><a href=\"".$web_path."/admin/users.php?action=update&amp;user=$user->username&amp;level=disabled\">" . get_user_icon('disable') ."</a></td>";
+		echo "<td><a href=\"".$web_path."/admin/users.php?action=update&amp;user=$user->username&amp;level=disabled\">" . get_user_icon('enable','disable_hover') ."</a></td>";
 	}
 	?>
 	<td>