modified sidebar html/css structure

6 files changed, 141 insertions, 111 deletions

diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index 73797e15..7f7f2417 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -21,38 +21,50 @@
 
 if (!$_SESSION['state']['sidebar_tab']) { $_SESSION['state']['sidebar_tab'] = 'home'; } 
 $class_name = 'sidebar_' . $_SESSION['state']['sidebar_tab'];
-${$class_name} = ' class="active" ';
+${$class_name} = ' active';
+
+// List of buttons ( id, title, icon, access level)
+$sidebar_items[] = array('id'=>'home', 'title'=>_('Home'), 'icon'=>'home', 'access'=>5);
+$sidebar_items[] = array('id'=>'browse', 'title'=>_('Browse'), 'icon'=>'browse', 'access'=>5);
+$sidebar_items[] = array('id'=>'localplay', 'title'=>_('Localplay'), 'icon'=>'volumeup', 'access'=>5);
+$sidebar_items[] = array('id'=>'preferences', 'title'=>_('Preferences'), 'icon'=>'edit', 'access'=>5);
+$sidebar_items[] = array('id'=>'admin', 'title'=>_('Admin'), 'icon'=>'admin', 'access'=>100);
+
 
 $web_path = Config::get('web_path');
 $ajax_url = Config::get('ajax_url'); 
+
 ?>
 <ul id="sidebar-tabs">
-<li <?php echo $sidebar_home; ?>>
-	<?php echo Ajax::button("?action=sidebar&button=home",'home',_('Home'),'sidebar_home'); ?>
-</li>
-<li <?php echo $sidebar_browse; ?>>
-	<?php echo Ajax::button("?action=sidebar&button=browse",'browse',_('Browse'),'sidebar_browse'); ?>
-</li>
-<li <?php echo $sidebar_localplay; ?>>
-	<?php echo Ajax::button("?action=sidebar&button=localplay",'volumeup',_('Localplay'),'sidebar_localplay'); ?>
-</li>
-<li <?php echo $sidebar_preferences; ?>>
-	<?php echo Ajax::button("?action=sidebar&button=preferences",'edit',_('Preferences'),'sidebar_prefs'); ?>
-</li>
-<?php if ($GLOBALS['user']->has_access('100')) { ?>
-<li <?php echo $sidebar_admin; ?>>
-	<?php echo Ajax::button("?action=sidebar&button=admin",'admin',_('Admin'),'sidebar_admin'); ?>
-</li>
-<?php } ?>
+<?php 
+	foreach ($sidebar_items as $item) { 
+	   if ($GLOBALS['user']->has_access($item['access']))
+	   {
+	     $li_params = "id='sb_tab_" . $item['id'] . "' class='sb1" . ${'sidebar_'.$item['id'] } . "'";
+	     ?><li <?php echo $li_params; ?>>
+      	<?php 
+        // Button
+        echo Ajax::button("?action=sidebar&button=".$item['id'],$item['icon'],$item['title'],'sidebar_'.$item['id']);
+      	
+      	// Include subnav if it's the selected one
+      	// so that it's generated inside its parent li
+      	if($item['id']==$_SESSION['state']['sidebar_tab'])
+      	{
+      	  ?><div id="sidebar-page"><?php
+      	  require_once Config::get('prefix') . '/templates/sidebar_' . $_SESSION['state']['sidebar_tab'] . '.inc.php';
+      	  ?></div><?php
+        }
+       ?></li><?php
+     }
+	}
+?>
 <!-- <li <?php echo $sidebar_player; ?> onclick="ajaxPut('<?php echo $ajax_url; ?>?action=sidebar&button=player');" >
 </li>
 -->
-<li>
+<li id="sb_Logout" class="sb1">
 	<a href="<?php echo Config::get('web_path'); ?>/logout.php">
 	<?php echo get_user_icon('logout',_('Logout')); ?>
 	</a>
 </li>
 </ul>
-<div id="sidebar-page">
-<?php require_once Config::get('prefix') . '/templates/sidebar_' . $_SESSION['state']['sidebar_tab'] . '.inc.php'; ?>
-</div>
+
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index c93ca1e0..193776fd 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -1,37 +1,43 @@
-<h4><?php echo _('Catalogs'); ?></h4>
-<span><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a></span>
-<hr />
-<ul id="sb_Catalogs">
-<?php 
-	$catalogs = Catalog::get_catalog_ids(); 
-	foreach ($catalogs as $catalog_id) { 
-		$catalog = new Catalog($catalog_id); 
-?>
-<li>
-<strong><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_customize_catalog"><?php echo $catalog->name; ?></a></strong>
-<a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=show_delete_catalog&amp;catalog_id=<?php echo $catalog->id; ?>">
-		<?php echo get_user_icon('delete',_('Delete Catalog')); ?>
-	</a>
-<br />
-<a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Add'); ?></a>
-| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Verify'); ?></a>
-| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Clean'); ?></a>
-</li>
-<?php } // end foreach catalogs ?>
-</ul>
-<hr />
-<h4><?php echo _('User Tools'); ?></h4>
-<ul id="sb_UserTools">
-<li id="sb_UT_AddUser"><a href="<?php echo $web_path; ?>/admin/users.php?action=show_add_user"><?php echo _('Add User'); ?></a></li>
-<li id="sb_UT_BrowseUsers"><a href="<?php echo $web_path; ?>/admin/users.php"><?php echo _('Browse Users'); ?></a></li>
-</ul>
-<hr />
-<h4><?php echo _('Other Tools'); ?></h4>
-<ul id="sb_OtherTools">
-<li id="sb_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_OT_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Catalog Stats'); ?></a></li>
-<li id="sb_OT_GatherArt"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a></li>
+<ul class="sb2" id="sb_admin">
+  <li><?php echo _('Catalogs'); ?>
+    <div class="sb3"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a></div>
+  </li>
+  <li>
+    <ul class="sb3" id="sb_admin_catalogs">
+    <?php 
+    	$catalogs = Catalog::get_catalog_ids(); 
+    	foreach ($catalogs as $catalog_id) { 
+    		$catalog = new Catalog($catalog_id); 
+    ?>
+      <li>
+        <strong><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_customize_catalog"><?php echo $catalog->name; ?></a></strong>
+        <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=show_delete_catalog&amp;catalog_id=<?php echo $catalog->id; ?>">
+    		  <?php echo get_user_icon('delete',_('Delete Catalog')); ?>
+    	  </a>
+        <br />
+        <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Add'); ?></a>
+        | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Verify'); ?></a>
+        | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Clean'); ?></a>
+      </li>
+      <?php } // end foreach catalogs ?>
+    </ul>
+  </li>
+
+  <li><?php echo _('User Tools'); ?>
+    <ul class="sb3" id="sb_admin_ut">
+      <li id="sb_admin_ut_AddUser"><a href="<?php echo $web_path; ?>/admin/users.php?action=show_add_user"><?php echo _('Add User'); ?></a></li>
+      <li id="sb_admin_ut_BrowseUsers"><a href="<?php echo $web_path; ?>/admin/users.php"><?php echo _('Browse Users'); ?></a></li>
+    </ul>
+  </li>
+
+  <li><?php echo _('Other Tools'); ?>
+    <ul class="sb3" id="sb_admin_ot">
+      <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_GatherArt"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a></li>
+    </ul>
+  </li>
+
 </ul>
-<hr />
 
 
diff --git a/templates/sidebar_browse.inc.php b/templates/sidebar_browse.inc.php
index b7266868..7cb3748c 100644
--- a/templates/sidebar_browse.inc.php
+++ b/templates/sidebar_browse.inc.php
@@ -1,30 +1,34 @@
 <?php $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); ?>
-<h4><?php echo _('Browse By'); ?></h4>
-<?php 
-	// Build the selected dealie
-	$text = scrub_in($_REQUEST['action']) . '_ac';
-	${$text} = ' selected="selected"'; 
-?>
-<ul id="sb_BrowseBy">
-<li id="sb_BB_SongTitle"><a href="<?php echo $web_path; ?>/browse.php?action=song"><?php echo _('Song Title'); ?></a></li>
-<li id="sb_BB_Album"><a href="<?php echo $web_path; ?>/browse.php?action=album"><?php echo _('Albums'); ?></a></li>
-<li id="sb_BB_Artist"><a href="<?php echo $web_path; ?>/browse.php?action=artist"><?php echo _('Artist'); ?></a></li>
-<li id="sb_BB_Genre"><a href="<?php echo $web_path; ?>/browse.php?action=genre"><?php echo _('Genre'); ?></a></li>
-<li id="sb_BB_Playlist"><a href="<?php echo $web_path; ?>/browse.php?action=playlist"><?php echo _('Playlist'); ?></a></li>
-<li id="sb_BB_RadioStation"><a href="<?php echo $web_path; ?>/browse.php?action=live_stream"><?php echo _('Radio Stations'); ?></a></li>
+<ul class="sb2" id="sb_browse">
+  <li><?php echo _('Browse By'); ?>
+  <?php 
+	  // Build the selected dealie
+	  $text = scrub_in($_REQUEST['action']) . '_ac';
+	  ${$text} = ' selected="selected"'; 
+  ?>
+    <ul class="sb3" id="sb_browse_bb">
+      <li id="sb_browse_bb_SongTitle"><a href="<?php echo $web_path; ?>/browse.php?action=song"><?php echo _('Song Title'); ?></a></li>
+      <li id="sb_browse_bb_Album"><a href="<?php echo $web_path; ?>/browse.php?action=album"><?php echo _('Albums'); ?></a></li>
+      <li id="sb_browse_bb_Artist"><a href="<?php echo $web_path; ?>/browse.php?action=artist"><?php echo _('Artist'); ?></a></li>
+      <li id="sb_browse_bb_Genre"><a href="<?php echo $web_path; ?>/browse.php?action=genre"><?php echo _('Genre'); ?></a></li>
+      <li id="sb_browse_bb_Playlist"><a href="<?php echo $web_path; ?>/browse.php?action=playlist"><?php echo _('Playlist'); ?></a></li>
+      <li id="sb_browse_bb_RadioStation"><a href="<?php echo $web_path; ?>/browse.php?action=live_stream"><?php echo _('Radio Stations'); ?></a></li>
+    </ul>
+  </li>
+  <li><?php echo _('Filters'); ?>
+    <div class="sb3">
+      <?php show_alphabet_list($_REQUEST['alpha_match'],$_REQUEST['action']); ?>
+      <hr />
+  <!--
+  <input type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;key=show_art&amp;value=1');return true;" value="1" />
+  	<?php echo _('Show Art'); ?><br />
+  <input type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;key=min_count&amp;value=1');return true;" value="1" />
+  	<?php echo _('Minimum Count'); ?><br />
+  <input type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;key=rated&amp;value=1');return true;" value="1" />
+  	<?php echo _('Rated'); ?><br />
+  -->
+      <input id="unplayedCB" type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;key=unplayed&amp;value=1');return true;" value="1" />
+  	  <label id="unplayedLabel" for="unplayedCB"><?php echo _('Unplayed'); ?></label><br />
+    </div>
+  </li>
 </ul>
-<hr />
-<h4><?php echo _('Filters'); ?></h4>
-<?php show_alphabet_list($_REQUEST['alpha_match'],$_REQUEST['action']); ?>
-<hr />
-<!--
-<input type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;key=show_art&amp;value=1');return true;" value="1" />
-	<?php echo _('Show Art'); ?><br />
-<input type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;key=min_count&amp;value=1');return true;" value="1" />
-	<?php echo _('Minimum Count'); ?><br />
-<input type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;key=rated&amp;value=1');return true;" value="1" />
-	<?php echo _('Rated'); ?><br />
--->
-<input id="unplayedCB" type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&amp;key=unplayed&amp;value=1');return true;" value="1" />
-	<label id="unplayedLabel" for="unplayedCB"><?php echo _('Unplayed'); ?></label><br />
-<hr />
diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php
index ca14c5ea..d980075a 100644
--- a/templates/sidebar_home.inc.php
+++ b/templates/sidebar_home.inc.php
@@ -1,10 +1,14 @@
-<h4><?php echo _('Information'); ?></h4>
-<ul id="sb_Information">
-<li id="sb_Info_CurrentlyPlaying"><a href="<?php echo $web_path; ?>/index.php"><?php echo _('Currently Playing'); ?></a></li>
-<li id="sb_Info_Statistics"><a href="<?php echo $web_path; ?>/stats.php"><?php echo _('Statistics'); ?></a></li>
-<li id="sb_Info_AddStationRadio"><a href="<?php echo $web_path; ?>/radio.php?action=show_create"><?php echo _('Add Radio Station'); ?></a></li>
+<ul class="sb2" id="sb_home">
+  <li><?php echo _('Information'); ?>
+    <ul class="sb3" id="sb_home_info">
+      <li id="sb_home_info_CurrentlyPlaying"><a href="<?php echo $web_path; ?>/index.php"><?php echo _('Currently Playing'); ?></a></li>
+      <li id="sb_home_info_Statistics"><a href="<?php echo $web_path; ?>/stats.php"><?php echo _('Statistics'); ?></a></li>
+      <li id="sb_home_info_AddStationRadio"><a href="<?php echo $web_path; ?>/radio.php?action=show_create"><?php echo _('Add Radio Station'); ?></a></li>
+    </ul>
+  </li>
+  <li><?php echo _('Playlists'); ?>
+    <ul class="sb3" id="sb_home_playlists">
+     <li id="sb_home_playlists_ViewAll"><a id="sb_ViewAll" href="<?php echo $web_path; ?>/playlist.php?action=show_all"><?php echo _('View All'); ?></a></li>
+    </ul>
+  </li>
 </ul>
-<hr />
-<h4><?php echo _('Playlists'); ?></h4>
-<a id="sb_ViewAll" href="<?php echo $web_path; ?>/playlist.php?action=show_all"><?php echo _('View All'); ?></a>
-<hr />
diff --git a/templates/sidebar_localplay.inc.php b/templates/sidebar_localplay.inc.php
index 954454e4..497a0cdd 100644
--- a/templates/sidebar_localplay.inc.php
+++ b/templates/sidebar_localplay.inc.php
@@ -1 +1,3 @@
-<h4><?php echo _('Localplay'); ?></h4>
+<ul class="sb2" id="sb_localplay">
+  <li><?php echo _('Localplay'); ?></li>
+</ul>
diff --git a/templates/sidebar_preferences.inc.php b/templates/sidebar_preferences.inc.php
index 774e5b8a..c8d3dd66 100644
--- a/templates/sidebar_preferences.inc.php
+++ b/templates/sidebar_preferences.inc.php
@@ -1,20 +1,22 @@
-<h4><?php echo _('Sections'); ?></h4>
-<ul id="sb_Preferences">
-<li id="sb_Pref_Interface"><a href="<?php echo $web_path; ?>/preferences.php?tab=interface"><?php echo _('Interface'); ?></a></li>
-<li id="sb_Pref_Playlist"><a href="<?php echo $web_path; ?>/preferences.php?tab=playlist"><?php echo _('Playlist'); ?></a></li>
-<li id="sb_Pref_Streaming"><a href="<?php echo $web_path; ?>/preferences.php?tab=streaming"><?php echo _('Streaming'); ?></a></li>
-<li id="sb_Pref_Options"><a href="<?php echo $web_path; ?>/preferences.php?tab=options"><?php echo _('Options'); ?></a></li>
-<li id="sb_Pref_Account"><a href="<?php echo $web_path; ?>/preferences.php?tab=account"><?php echo _('Account'); ?></a></li>
-</ul>
-<hr />
+<ul class="sb2" id="sb_preferences">
+  <li><?php echo _('Sections'); ?>
+    <ul class="sb3" id="sb_preferences_sections">
+      <li id="sb_preferences_sections_Interface"><a href="<?php echo $web_path; ?>/preferences.php?tab=interface"><?php echo _('Interface'); ?></a></li>
+      <li id="sb_preferences_sections_Playlist"><a href="<?php echo $web_path; ?>/preferences.php?tab=playlist"><?php echo _('Playlist'); ?></a></li>
+      <li id="sb_preferences_sections_Streaming"><a href="<?php echo $web_path; ?>/preferences.php?tab=streaming"><?php echo _('Streaming'); ?></a></li>
+      <li id="sb_preferences_sections_Options"><a href="<?php echo $web_path; ?>/preferences.php?tab=options"><?php echo _('Options'); ?></a></li>
+      <li id="sb_preferences_sections_Account"><a href="<?php echo $web_path; ?>/preferences.php?tab=account"><?php echo _('Account'); ?></a></li>
+    </ul>
+  </li>
 <?php if ($GLOBALS['user']->has_access('100')) { ?>
-<h4><?php echo _('Server Config'); ?></h4>
-<ul id="sb_ServerConfig">
-<li id="sb_SC_Interface"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&amp;tab=interface"><?php echo _('Interface'); ?></a></li>
-<li id="sb_SC_Playlist"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&amp;tab=playlist"><?php echo _('Playlist'); ?></a></li>
-<li id="sb_SC_Streaming"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&amp;tab=streaming"><?php echo _('Streaming'); ?></a></li>
-<li id="sb_SC_Options"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&amp;tab=options"><?php echo _('Options'); ?></a></li>
-<li id="sb_SC_System"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&amp;tab=system"><?php echo _('System'); ?></a></li>
+  <li><?php echo _('Server Config'); ?>
+    <ul class="sb3" id="sb_preferences_sc">
+      <li id="sb_preferences_sc_Interface"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&amp;tab=interface"><?php echo _('Interface'); ?></a></li>
+      <li id="sb_preferences_sc_Playlist"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&amp;tab=playlist"><?php echo _('Playlist'); ?></a></li>
+      <li id="sb_preferences_sc_Streaming"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&amp;tab=streaming"><?php echo _('Streaming'); ?></a></li>
+      <li id="sb_preferences_sc_Options"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&amp;tab=options"><?php echo _('Options'); ?></a></li>
+      <li id="sb_preferences_sc_System"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&amp;tab=system"><?php echo _('System'); ?></a></li>
+    </ul>
+  </li>
 </ul>
-<hr />
 <?php } ?>