Add browse filter and light sidebar options

Add overload to force library item art display

lib/class/album.class.php

@@ -808,7 +808,7 @@ class Album extends database_object implements library_item
         return $artist->get_description();
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
         $id   = null;
         $type = null;
@@ -817,7 +817,7 @@ class Album extends database_object implements library_item
             $id   = $this->id;
             $type = 'album';
         } else {
-            if (Art::has_db($this->artist_id, 'artist')) {
+            if (Art::has_db($this->artist_id, 'artist') || $force) {
                 $id   = $this->artist_id;
                 $type = 'artist';
             }

lib/class/artist.class.php

@@ -619,12 +619,12 @@ class Artist extends database_object implements library_item
         return $this->summary;
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
         $id   = null;
         $type = null;
 
-        if (Art::has_db($this->id, 'artist')) {
+        if (Art::has_db($this->id, 'artist') || $force) {
             $id   = $this->id;
             $type = 'artist';
         }

lib/class/broadcast.class.php

@@ -286,9 +286,9 @@ class Broadcast extends database_object implements library_item
         return null;
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
-        if (Art::has_db($this->id, 'broadcast')) {
+        if (Art::has_db($this->id, 'broadcast') || $force) {
             Art::display('broadcast', $this->id, $this->get_fullname(), $thumb, $this->link);
         }
     }

lib/class/channel.class.php

@@ -249,9 +249,9 @@ class Channel extends database_object implements media, library_item
         return $this->description;
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
-        if (Art::has_db($this->id, 'channel')) {
+        if (Art::has_db($this->id, 'channel') || $force) {
             Art::display('channel', $this->id, $this->get_fullname(), $thumb, $this->link);
         }
     }

lib/class/label.class.php

@@ -97,9 +97,9 @@ class Label extends database_object implements library_item
         return true;
     }
 
-    public function display_art($thumb)
+    public function display_art($thumb, $force = false)
     {
-        if (Art::has_db($this->id, 'label')) {
+        if (Art::has_db($this->id, 'label') || $force) {
             Art::display('label', $this->id, $this->get_fullname(), $thumb, $this->link);
         }
     }

lib/class/library_item.interface.php

@@ -37,7 +37,7 @@ interface library_item extends playable_item
 
     public function get_description();
 
-    public function display_art($thumb);
+    public function display_art($thumb, $force = false);
 
     public function update(array $data);
 

lib/class/live_stream.class.php

@@ -165,9 +165,9 @@ class Live_Stream extends database_object implements media, library_item
         return null;
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
-        if (Art::has_db($this->id, 'live_stream')) {
+        if (Art::has_db($this->id, 'live_stream') || $force) {
             Art::display('live_stream', $this->id, $this->get_fullname(), $thumb, $this->link);
         }
     }

lib/class/playlist_object.abstract.php

@@ -157,7 +157,7 @@ abstract class playlist_object extends database_object implements library_item
         return null;
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
         // no art
     }

lib/class/podcast.class.php

@@ -226,9 +226,9 @@ class Podcast extends database_object implements library_item
         return $this->f_description;
     }
     
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
-        if (Art::has_db($this->id, 'podcast')) {
+        if (Art::has_db($this->id, 'podcast') || $force) {
             Art::display('podcast', $this->id, $this->get_fullname(), $thumb, $this->link);
         }
     }

lib/class/podcast_episode.class.php

@@ -206,7 +206,7 @@ class Podcast_Episode extends database_object implements media, library_item
         return $this->f_description;
     }
     
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
         $id   = null;
         $type = null;
@@ -215,7 +215,7 @@ class Podcast_Episode extends database_object implements media, library_item
             $id   = $this->id;
             $type = 'podcast_episode';
         } else {
-            if (Art::has_db($this->podcast, 'podcast')) {
+            if (Art::has_db($this->podcast, 'podcast') || $force) {
                 $id   = $this->podcast;
                 $type = 'podcast';
             }

lib/class/song.class.php

@@ -1592,7 +1592,7 @@ class Song extends database_object implements media, library_item
         return $album->get_description();
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
         $id   = null;
         $type = null;
@@ -1605,7 +1605,7 @@ class Song extends database_object implements media, library_item
                 $id   = $this->album;
                 $type = 'album';
             } else {
-                if (Art::has_db($this->artist, 'artist')) {
+                if (Art::has_db($this->artist, 'artist') || $force) {
                     $id   = $this->artist;
                     $type = 'artist';
                 }

lib/class/tag.class.php

@@ -780,9 +780,9 @@ class Tag extends database_object implements library_item
         return null;
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
-        if (Art::has_db($this->id, 'tag')) {
+        if (Art::has_db($this->id, 'tag') || $force) {
             Art::display('tag', $this->id, $this->get_fullname(), $thumb, $this->link);
         }
     }

lib/class/tvshow.class.php

@@ -262,9 +262,9 @@ class TVShow extends database_object implements library_item
         return $this->summary;
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
-        if (Art::has_db($this->id, 'tvshow')) {
+        if (Art::has_db($this->id, 'tvshow') || $force) {
             Art::display('tvshow', $this->id, $this->get_fullname(), $thumb, $this->link);
         }
     }

lib/class/tvshow_episode.class.php

@@ -213,7 +213,7 @@ class TVShow_Episode extends Video
         return $season->get_description();
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
         $id   = null;
         $type = null;
@@ -227,7 +227,7 @@ class TVShow_Episode extends Video
                 $type = 'tvshow_season';
             } else {
                 $season = new TVShow_Season($this->season);
-                if (Art::has_db($season->tvshow, 'tvshow')) {
+                if (Art::has_db($season->tvshow, 'tvshow') || $force) {
                     $id   = $season->tvshow;
                     $type = 'tvshow';
                 }

lib/class/tvshow_season.class.php

@@ -227,7 +227,7 @@ class TVShow_Season extends database_object implements library_item
         return $tvshow->get_description();
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
         $id   = null;
         $type = null;
@@ -236,7 +236,7 @@ class TVShow_Season extends database_object implements library_item
             $id   = $this->id;
             $type = 'tvshow_season';
         } else {
-            if (Art::has_db($this->tvshow, 'tvshow')) {
+            if (Art::has_db($this->tvshow, 'tvshow') || $force) {
                 $id   = $this->tvshow;
                 $type = 'tvshow';
             }

lib/class/update.class.php

@@ -544,6 +544,9 @@ class Update
         $update_string = "- Add upload rename pattern and ignore duplicate options.<br />";
         $version[]     = array('version' => '380007', 'description' => $update_string);
         
+        $update_string = "- Add browse filter and light sidebar options.<br />";
+        $version[]     = array('version' => '380008', 'description' => $update_string);
+        
         return $version;
     }
 
@@ -3837,14 +3840,40 @@ class Update
         $retval = true;
 
         $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`, `subcatagory`) " .
-            "VALUES ('upload_catalog_pattern','0','Rename uploaded file according to catalog pattern',0,'boolean','system','upload')";
+            "VALUES ('upload_catalog_pattern','0','Rename uploaded file according to catalog pattern',100,'boolean','system','upload')";
         $retval &= Dba::write($sql);
         $id     = Dba::insert_id();
         $sql    = "INSERT INTO `user_preference` VALUES (-1,?,'0')";
         $retval &= Dba::write($sql, array($id));
         
         $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`, `subcatagory`) " .
-            "VALUES ('catalog_check_duplicate','0','Check library item at import time and don\'t import duplicates',0,'boolean','system','catalog')";
+            "VALUES ('catalog_check_duplicate','0','Check library item at import time and don\'t import duplicates',100,'boolean','system','catalog')";
+        $retval &= Dba::write($sql);
+        $id     = Dba::insert_id();
+        $sql    = "INSERT INTO `user_preference` VALUES (-1,?,'0')";
+        $retval &= Dba::write($sql, array($id));
+
+        return $retval;
+    }
+    
+    /**
+     * update_380008
+     *
+     * Add browse filter and light sidebar options
+     */
+    public static function update_380008()
+    {
+        $retval = true;
+
+        $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`, `subcatagory`) " .
+            "VALUES ('browse_filter','1','Show filter box on browse',25,'boolean','interface','library')";
+        $retval &= Dba::write($sql);
+        $id     = Dba::insert_id();
+        $sql    = "INSERT INTO `user_preference` VALUES (-1,?,'1')";
+        $retval &= Dba::write($sql, array($id));
+        
+        $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`, `subcatagory`) " .
+            "VALUES ('sidebar_light','0','Light sidebar by default',25,'boolean','interface','theme')";
         $retval &= Dba::write($sql);
         $id     = Dba::insert_id();
         $sql    = "INSERT INTO `user_preference` VALUES (-1,?,'0')";

lib/class/video.class.php

@@ -393,9 +393,9 @@ class Video extends database_object implements media, library_item
         return '';
     }
 
-    public function display_art($thumb = 2)
+    public function display_art($thumb = 2, $force = false)
     {
-        if (Art::has_db($this->id, 'video')) {
+        if (Art::has_db($this->id, 'video') || $force) {
             Art::display('video', $this->id, $this->get_fullname(), $thumb, $this->link);
         }
     }

lib/class/xml_data.class.php

@@ -195,9 +195,9 @@ class XML_Data
      * This returns the formatted 'playlistTrack' string for an xml document
      *
      */
-    private static function playlist_song_tracks_string($song,$playlist_data)
+    private static function playlist_song_tracks_string($song, $playlist_data)
     {
-        if ($playlist_data == "") {
+        if (empty($playlist_data)) {
             return "";
         }
         $playlist_track = "";
@@ -424,7 +424,7 @@ class XML_Data
      * This returns an xml document from an array of song ids.
      * (Spiffy isn't it!)
      */
-    public static function songs($songs,$playlist_data='')
+    public static function songs($songs, $playlist_data='')
     {
         if (count($songs) > self::$limit or self::$offset > 0) {
             $songs = array_slice($songs, self::$offset, self::$limit);

lib/preferences.php

@@ -202,6 +202,8 @@ function create_preference_input($name,$value)
         case 'libitem_contextmenu':
         case 'upload_catalog_pattern':
         case 'catalogfav_gridview':
+        case 'browse_filter':
+        case 'sidebar_light':
             $is_true  = '';
             $is_false = '';
             if ($value == '1') {

modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php

@@ -126,7 +126,7 @@ class AmpacheCatalogFavorites
 
                     echo '<div style="float: left; margin-right: 20px;">';
                     $thumb = ($this->gridview && UI::is_grid_view('album')) ? 2 : 11;
-                    $item->display_art($thumb);
+                    $item->display_art($thumb, true);
                     echo '</div>';
                     echo '</td>';
                     

templates/header.inc.php

@@ -444,7 +444,13 @@ $_SESSION['login'] = false;
                         <span><?php echo T_('Playlists') ?></span>
                     </a>
                 </div>
-                <?php if (Access::check('interface', '25')) {
+                <div id="topmenu_item">
+                    <a href="<?php echo $web_path ?>/browse.php?action=tag">
+                        <img src="<?php echo $web_path ?>/images/topmenu-tagcloud.png" />
+                        <span><?php echo T_('Tag Cloud') ?></span>
+                    </a>
+                </div>
+                <?php if (AmpConfig::get('userflags') && Access::check('interface', '25')) {
     ?>
                 <div id="topmenu_item">
                     <a href="<?php echo $web_path ?>/stats.php?action=userflag">
@@ -453,12 +459,23 @@ $_SESSION['login'] = false;
                     </a>
                 </div>
                 <?php 
+}
+    ?>
+                <?php if (AmpConfig::get('allow_upload') && Access::check('interface', '25')) {
+    ?>
+                <div id="topmenu_item">
+                    <a href="<?php echo $web_path ?>/upload.php">
+                        <img src="<?php echo $web_path ?>/images/topmenu-upload.png" />
+                        <span><?php echo T_('Upload') ?></span>
+                    </a>
+                </div>
+                <?php 
 }
     ?>
             </div>
         <?php 
 } ?>
-            <?php $isCollapsed = $_COOKIE['sidebar_state'] == "collapsed"; ?>
+            <?php $isCollapsed = ((AmpConfig::get('sidebar_light') && $_COOKIE['sidebar_state'] != "expanded") || $_COOKIE['sidebar_state'] == "collapsed"); ?>
             <div id="sidebar" class="sidebar-<?php echo AmpConfig::get('ui_fixed') ? 'fixed' : 'float'; ?>">
                 <div id="sidebar-header" class="<?php echo $isCollapsed ? 'sidebar-header-collapsed' : ''; ?>" ><span id="sidebar-header-content"><?php echo $isCollapsed ? '>>>' : '<<<'; ?></span></div>
                 <div id="sidebar-content" class="<?php echo $isCollapsed ? 'sidebar-content-collapsed' : ''; ?>" >

templates/sidebar.light.inc.php

@@ -24,15 +24,17 @@ $web_path = AmpConfig::get('web_path');
 ?>
 
 <ul id="sidebar-light">
-    <li><a href="<?php echo $web_path; ?>/index.php"><img src="<?php echo $web_path; ?>/images/topmenu-home.png" title="<?php echo T_('Home'); ?>" /></a></li>
+    <li><a href="<?php echo $web_path ?>/browse.php?action=artist"><img src="<?php echo $web_path ?>/images/topmenu-music.png" title="<?php echo T_('Artists') ?>" /><br /><?php echo T_('Artists') ?></a></li>
-    <li><a href="<?php echo $web_path; ?>/browse.php?action=artist"><img src="<?php echo $web_path; ?>/images/topmenu-music.png" title="<?php echo T_('Artists'); ?>" /></a></li>
+    <li><a href="<?php echo $web_path ?>/browse.php?action=playlist"><img src="<?php echo $web_path ?>/images/topmenu-playlist.png" title="<?php echo T_('Playlists') ?>" /><br /><?php echo T_('Playlists') ?></a></li>
-    <li><a href="<?php echo $web_path; ?>/browse.php?action=playlist"><img src="<?php echo $web_path; ?>/images/topmenu-playlist.png" title="<?php echo T_('Playlists'); ?>" /></a></li>
+    <li><a href="<?php echo $web_path ?>/browse.php?action=tag"><img src="<?php echo $web_path ?>/images/topmenu-tagcloud.png" title="<?php echo T_('Tag Cloud') ?>" /><br /><?php echo T_('Tag Cloud') ?></a></li>
-    <?php if (AmpConfig::get('userflags')) {
+    <?php if (AmpConfig::get('userflags') && Access::check('interface', 25)) {
     ?>
-    <li><a href="<?php echo $web_path;
+    <li><a href="<?php echo $web_path ?>/stats.php?action=userflag"><img src="<?php echo $web_path ?>/images/topmenu-favorite.png" title="<?php echo T_('Favorites') ?>" /><br /><?php echo T_('Favorites') ?></a></li>
-    ?>/stats.php?action=userflag"><img src="<?php echo $web_path;
+    <?php 
-    ?>/images/topmenu-favorite.png" title="<?php echo T_('Favorites');
+} ?>
-    ?>" /></a></li>
+    <?php if (AmpConfig::get('allow_upload') && Access::check('interface', 25)) {
+    ?>
+    <li><a href="<?php echo $web_path ?>/upload.php"><img src="<?php echo $web_path ?>/images/topmenu-upload.png" title="<?php echo T_('Upload') ?>" /><br /><?php echo T_('Upload') ?></a></li>
     <?php 
 } ?>
 </ul>

templates/sidebar_home.inc.php

@@ -21,7 +21,7 @@
  */
 ?>
 <ul class="sb2" id="sb_home">
-    <li><h4 class="header"><span class="sidebar-header-title" title="<?php echo T_('Browse Music'); ?>"><?php echo T_('Browse Music'); ?></span><img src="<?php echo AmpConfig::get('web_path') . AmpConfig::get('theme_path'); ?>/images/icons/icon_all.png" class="header-img <?php echo isset($_COOKIE['sb_home_browse_music']) ? $_COOKIE['sb_home_browse_music'] : 'expanded'; ?>" id="browse_music" lt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>" /></h4>
+    <li><h4 class="header"><span class="sidebar-header-title" title="<?php echo T_('Browse Music'); ?>"><?php echo T_('Music'); ?></span><img src="<?php echo AmpConfig::get('web_path') . AmpConfig::get('theme_path'); ?>/images/icons/icon_all.png" class="header-img <?php echo isset($_COOKIE['sb_browse_music']) ? $_COOKIE['sb_browse_music'] : 'expanded'; ?>" id="browse_music" lt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>" /></h4>
         <?php
         if (isset($_REQUEST['action'])) {
             $text    = scrub_in($_REQUEST['action']) . '_ac';
@@ -34,9 +34,7 @@
             <li id="sb_home_browse_music_artist"><a href="<?php echo $web_path; ?>/browse.php?action=artist"><?php echo T_('Artists'); ?></a></li>
             <?php if (AmpConfig::get('label')) {
     ?>
-            <li id="sb_home_browse_music_label"><a href="<?php echo $web_path;
+            <li id="sb_home_browse_music_label"><a href="<?php echo $web_path ?>/browse.php?action=label"><?php echo T_('Labels') ?></a></li>
-    ?>/browse.php?action=label"><?php echo T_('Labels');
-    ?></a></li>
             <?php 
 } ?>
             <li id="sb_home_browse_music_tags"><a href="<?php echo $web_path; ?>/browse.php?action=tag"><?php echo T_('Tag Cloud'); ?></a></li>
@@ -44,71 +42,54 @@
             <li id="sb_home_browse_music_smartPlaylist"><a href="<?php echo $web_path; ?>/browse.php?action=smartplaylist"><?php echo T_('Smart Playlists'); ?></a></li>
             <?php if (AmpConfig::get('channel')) {
     ?>
-            <li id="sb_home_browse_music_channel"><a href="<?php echo $web_path;
+            <li id="sb_home_browse_music_channel"><a href="<?php echo $web_path ?>/browse.php?action=channel"><?php echo T_('Channels') ?></a></li>
-    ?>/browse.php?action=channel"><?php echo T_('Channels');
-    ?></a></li>
             <?php 
 } ?>
             <?php if (AmpConfig::get('broadcast')) {
     ?>
-            <li id="sb_home_browse_music_broadcast"><a href="<?php echo $web_path;
+            <li id="sb_home_browse_music_broadcast"><a href="<?php echo $web_path ?>/browse.php?action=broadcast"><?php echo T_('Broadcasts') ?></a></li>
-    ?>/browse.php?action=broadcast"><?php echo T_('Broadcasts');
-    ?></a></li>
             <?php 
 } ?>
             <?php if (AmpConfig::get('live_stream')) {
     ?>
-            <li id="sb_home_browse_music_radioStation"><a href="<?php echo $web_path;
+            <li id="sb_home_browse_music_radioStation"><a href="<?php echo $web_path ?>/browse.php?action=live_stream"><?php echo T_('Radio Stations') ?></a></li>
-    ?>/browse.php?action=live_stream"><?php echo T_('Radio Stations');
-    ?></a></li>
             <?php 
 } ?>
             <?php if (AmpConfig::get('podcast')) {
     ?>
-            <li id="sb_home_browse_music_podcast"><a href="<?php echo $web_path;
+            <li id="sb_home_browse_music_podcast"><a href="<?php echo $web_path ?>/browse.php?action=podcast"><?php echo T_('Podcasts') ?></a></li>
-    ?>/browse.php?action=podcast"><?php echo T_('Podcasts');
-    ?></a></li>
             <?php 
 } ?>
             <?php if (AmpConfig::get('allow_upload') && Access::check('interface', '25')) {
     ?>
-            <li id="sb_home_browse_music_upload"><a href="<?php echo $web_path;
+            <li id="sb_home_browse_music_upload"><a href="<?php echo $web_path ?>/upload.php"><?php echo T_('Upload') ?></a></li>
-    ?>/upload.php"><?php echo T_('Upload');
-    ?></a></li>
             <?php 
 } ?>
         </ul>
     </li>
     <?php if (AmpConfig::get('allow_video')) {
     ?>
-        <li><h4 class="header"><span class="sidebar-header-title"><?php echo T_('Browse Video');
+        <li><h4 class="header"><span class="sidebar-header-title"><?php echo T_('Video') ?></span><img src="<?php echo AmpConfig::get('web_path') . AmpConfig::get('theme_path');
-    ?></span><img src="<?php echo AmpConfig::get('web_path') . AmpConfig::get('theme_path');
+    ?>/images/icons/icon_all.png" class="header-img <?php echo isset($_COOKIE['sb_browse_video']) ? $_COOKIE['sb_browse_video'] : 'expanded';
-    ?>/images/icons/icon_all.png" class="header-img <?php echo isset($_COOKIE['sb_home_browse_video']) ? $_COOKIE['sb_home_browse_video'] : 'expanded';
     ?>" id="browse_video" lt="<?php echo T_('Expand/Collapse');
     ?>" title="<?php echo T_('Expand/Collapse');
     ?>" /></h4>
             <ul class="sb3" id="sb_home_browse_video">
-                <li id="sb_home_browse_video_clip"><a href="<?php echo $web_path;
+                <li id="sb_home_browse_video_clip"><a href="<?php echo $web_path ?>/browse.php?action=clip"><?php echo T_('Music Clips') ?></a></li>
-    ?>/browse.php?action=clip"><?php echo T_('Music Clips');
+                <li id="sb_home_browse_video_tvShow"><a href="<?php echo $web_path ?>/browse.php?action=tvshow"><?php echo T_('TV Shows') ?></a></li>
-    ?></a></li>
+                <li id="sb_home_browse_video_movie"><a href="<?php echo $web_path ?>/browse.php?action=movie"><?php echo T_('Movies') ?></a></li>
-                <li id="sb_home_browse_video_tvShow"><a href="<?php echo $web_path;
+                <li id="sb_home_browse_video_video"><a href="<?php echo $web_path ?>/browse.php?action=personal_video"><?php echo T_('Personal Videos') ?></a></li>
-    ?>/browse.php?action=tvshow"><?php echo T_('TV Shows');
+                <li id="sb_home_browse_video_tagsVideo"><a href="<?php echo $web_path ?>/browse.php?action=tag&type=video"><?php echo T_('Tag Cloud') ?></a></li>
-    ?></a></li>
-                <li id="sb_home_browse_video_movie"><a href="<?php echo $web_path;
-    ?>/browse.php?action=movie"><?php echo T_('Movies');
-    ?></a></li>
-                <li id="sb_home_browse_video_video"><a href="<?php echo $web_path;
-    ?>/browse.php?action=personal_video"><?php echo T_('Personal Videos');
-    ?></a></li>
-                <li id="sb_home_browse_video_tagsVideo"><a href="<?php echo $web_path;
-    ?>/browse.php?action=tag&type=video"><?php echo T_('Tag Cloud');
-    ?></a></li>
             </ul>
         </li>
     <?php 
 } ?>
-    <?php Ajax::start_container('browse_filters'); ?>
+    <?php
-    <?php Ajax::end_container(); ?>
+    if (AmpConfig::get('browse_filter')) {
+        Ajax::start_container('browse_filters');
+        Ajax::end_container();
+    }
+    ?>
     <?php if (Access::check('interface', '25')) {
     ?>
     <li>
@@ -119,20 +100,18 @@
     ?>" id="playlist" alt="<?php echo T_('Expand/Collapse');
     ?>" title="<?php echo T_('Expand/Collapse');
     ?>" /></h4>
+        <?php if (AmpConfig::get('home_now_playing') || AmpConfig::get('allow_democratic_playback') || Access::check('interface', '50')) {
+    ?>
         <ul class="sb3" id="sb_home_playlist">
             <?php if (AmpConfig::get('home_now_playing')) {
     ?>
-            <li id="sb_home_playlist_currentlyPlaying"><a href="<?php echo AmpConfig::get('web_path');
+            <li id="sb_home_playlist_currentlyPlaying"><a href="<?php echo AmpConfig::get('web_path') ?>/index.php"><?php echo T_('Currently Playing') ?></a></li>
-    ?>/index.php"><?php echo T_('Currently Playing');
-    ?></a></li>
             <?php 
 }
     ?>
             <?php if (AmpConfig::get('allow_democratic_playback')) {
     ?>
-            <li id="sb_home_playlist_playlist"><a href="<?php echo $web_path;
+            <li id="sb_home_playlist_playlist"><a href="<?php echo $web_path ?>/democratic.php?action=show_playlist"><?php echo T_('Democratic') ?></a></li>
-    ?>/democratic.php?action=show_playlist"><?php echo T_('Democratic');
-    ?></a></li>
             <?php 
 }
     ?>
@@ -144,31 +123,25 @@
     $current_instance      = $localplay->current_instance();
     $class                 = $current_instance ? '' : ' class="active_instance"';
     ?>
-            <li id="sb_home_playlist_show"><a href="<?php echo $web_path;
+            <li id="sb_home_playlist_show"><a href="<?php echo $web_path ?>/localplay.php?action=show_playlist"><?php echo T_('Localplay') ?></a></li>
-    ?>/localplay.php?action=show_playlist"><?php echo T_('Localplay');
+            <?php 
-    ?></a></li>
+}
+    ?>
+            <?php if (Access::check('interface', '50')) {
+    ?>
+            <li id="sb_home_playlist_playlist"><a href="<?php echo $web_path ?>/playlist.php?action=show_import_playlist"><?php echo T_('Import') ?></a></li>
             <?php 
 }
     ?>
-            <li id="sb_home_playlist_playlist"><a href="<?php echo $web_path;
-    ?>/playlist.php?action=show_import_playlist"><?php echo T_('Import');
-    ?></a></li>
         </ul>
+        <?php 
+}
+    ?>
     </li>
     <?php 
 } ?>
     <li>
-        <h4 class="header"><span class="sidebar-header-title" title="<?php echo T_('Random'); ?>"><?php echo T_('Random'); ?></span><img src="<?php echo AmpConfig::get('web_path') . AmpConfig::get('theme_path'); ?>/images/icons/icon_all.png" class="header-img <?php echo isset($_COOKIE['sb_home_random']) ? $_COOKIE['sb_home_random'] : 'expanded'; ?>" id="random" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>" /></h4>
+        <h4 class="header"><span class="sidebar-header-title" title="<?php echo T_('Information'); ?>"><?php echo T_('Information'); ?></span><img src="<?php echo AmpConfig::get('web_path') . AmpConfig::get('theme_path'); ?>/images/icons/icon_all.png" class="header-img <?php echo isset($_COOKIE['sb_info']) ? $_COOKIE['sb_info'] : 'expanded'; ?>" id="information" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>" /></h4>
-        <ul class="sb3" id="sb_home_random">
-            <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=song', T_('Song'),'home_random_song'); ?></li>
-            <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=album', T_('Album'),'home_random_album'); ?></li>
-            <li id="sb_home_random_artist"><?php echo Ajax::text('?page=random&action=artist', T_('Artist'),'home_random_artist'); ?></li>
-            <li id="sb_home_random_playlist"><?php echo Ajax::text('?page=random&action=playlist', T_('Playlist'),'home_random_playlist'); ?></li>
-            <li id="sb_home_random_advanced"><a href="<?php echo $web_path; ?>/random.php?action=advanced&type=song"><?php echo T_('Advanced'); ?></a></li>
-        </ul>
-    </li>
-    <li>
-        <h4 class="header"><span class="sidebar-header-title" title="<?php echo T_('Information'); ?>"><?php echo T_('Information'); ?></span><img src="<?php echo AmpConfig::get('web_path') . AmpConfig::get('theme_path'); ?>/images/icons/icon_all.png" class="header-img <?php echo isset($_COOKIE['sb_home_info']) ? $_COOKIE['sb_home_info'] : 'expanded'; ?>" id="information" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>" /></h4>
         <ul class="sb3" id="sb_home_info">
             <li id="sb_home_info_recent"><a href="<?php echo $web_path; ?>/stats.php?action=recent"><?php echo T_('Recent'); ?></a></li>
             <li id="sb_home_info_newest"><a href="<?php echo $web_path; ?>/stats.php?action=newest"><?php echo T_('Newest'); ?></a></li>
@@ -177,49 +150,37 @@
     ?>
                 <?php if (AmpConfig::get('ratings')) {
     ?>
-                <li id="sb_home_info_highest"><a href="<?php echo $web_path;
+                <li id="sb_home_info_highest"><a href="<?php echo $web_path ?>/stats.php?action=highest"><?php echo T_('Top Rated') ?></a></li>
-    ?>/stats.php?action=highest"><?php echo T_('Top Rated');
-    ?></a></li>
                 <?php 
 }
     ?>
                 <?php if (AmpConfig::get('userflags')) {
     ?>
-                <li id="sb_home_info_userFlag"><a href="<?php echo $web_path;
+                <li id="sb_home_info_userFlag"><a href="<?php echo $web_path?>/stats.php?action=userflag"><?php echo T_('Favorites') ?></a></li>
-    ?>/stats.php?action=userflag"><?php echo T_('Favorites');
-    ?></a></li>
                 <?php 
 }
     ?>
                 <?php if (AmpConfig::get('wanted')) {
     ?>
-                <li id="sb_home_info_wanted"><a href="<?php echo $web_path;
+                <li id="sb_home_info_wanted"><a href="<?php echo $web_path ?>/stats.php?action=wanted"><?php echo T_('Wanted List') ?></a></li>
-    ?>/stats.php?action=wanted"><?php echo T_('Wanted List');
-    ?></a></li>
                 <?php 
 }
     ?>
                 <?php if (AmpConfig::get('share')) {
     ?>
-                <li id="sb_home_info_share"><a href="<?php echo $web_path;
+                <li id="sb_home_info_share"><a href="<?php echo $web_path ?>/stats.php?action=share"><?php echo T_('Shared Objects') ?></a></li>
-    ?>/stats.php?action=share"><?php echo T_('Shared Objects');
-    ?></a></li>
                 <?php 
 }
     ?>
                 <?php if (AmpConfig::get('allow_upload')) {
     ?>
-                <li id="sb_home_info_upload"><a href="<?php echo $web_path;
+                <li id="sb_home_info_upload"><a href="<?php echo $web_path ?>/stats.php?action=upload"><?php echo T_('Uploads') ?></a></li>
-    ?>/stats.php?action=upload"><?php echo T_('Uploads');
-    ?></a></li>
                 <?php 
 }
     ?>
                 <?php if (Access::check('interface','50')) {
     ?>
-                    <li id="sb_home_info_statistic"><a href="<?php echo $web_path;
+                    <li id="sb_home_info_statistic"><a href="<?php echo $web_path ?>/stats.php?action=show"><?php echo T_('Statistics') ?></a></li>
-    ?>/stats.php?action=show"><?php echo T_('Statistics');
-    ?></a></li>
                 <?php 
 }
     ?>
@@ -228,17 +189,29 @@
         </ul>
     </li>
     <li>
-        <h4 class="header"><span class="sidebar-header-title" title="<?php echo T_('Search'); ?>"><?php echo T_('Search'); ?></span><img src="<?php echo AmpConfig::get('web_path') . AmpConfig::get('theme_path'); ?>/images/icons/icon_all.png" class="header-img <?php echo isset($_COOKIE['sb_home_search']) ? $_COOKIE['sb_home_search'] : 'expanded'; ?>" id="search" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>" /></h4>
+        <h4 class="header"><span class="sidebar-header-title" title="<?php echo T_('Random'); ?>"><?php echo T_('Random'); ?></span><img src="<?php echo AmpConfig::get('web_path') . AmpConfig::get('theme_path'); ?>/images/icons/icon_all.png" class="header-img <?php echo isset($_COOKIE['sb_random']) ? $_COOKIE['sb_random'] : 'collapsed'; ?>" id="random" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>" /></h4>
-        <ul class="sb3" id="sb_home_search">
+        <ul class="sb3" id="sb_home_random" style="<?php if (!isset($_COOKIE['sb_random'])) {
+    echo 'display: none;';
+} ?>">
+            <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=song', T_('Song'),'home_random_song'); ?></li>
+            <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=album', T_('Album'),'home_random_album'); ?></li>
+            <li id="sb_home_random_artist"><?php echo Ajax::text('?page=random&action=artist', T_('Artist'),'home_random_artist'); ?></li>
+            <li id="sb_home_random_playlist"><?php echo Ajax::text('?page=random&action=playlist', T_('Playlist'),'home_random_playlist'); ?></li>
+            <li id="sb_home_random_advanced"><a href="<?php echo $web_path; ?>/random.php?action=advanced&type=song"><?php echo T_('Advanced'); ?></a></li>
+        </ul>
+    </li>
+    <li>
+        <h4 class="header"><span class="sidebar-header-title" title="<?php echo T_('Search'); ?>"><?php echo T_('Search'); ?></span><img src="<?php echo AmpConfig::get('web_path') . AmpConfig::get('theme_path'); ?>/images/icons/icon_all.png" class="header-img <?php echo isset($_COOKIE['sb_search']) ? $_COOKIE['sb_search'] : 'collapsed'; ?>" id="search" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>" /></h4>
+        <ul class="sb3" id="sb_home_search" style="<?php if (!isset($_COOKIE['sb_search'])) {
+    echo 'display: none;';
+} ?>">
           <li id="sb_home_search_song"><a href="<?php echo $web_path; ?>/search.php?type=song"><?php echo T_('Songs'); ?></a></li>
           <li id="sb_home_search_album"><a href="<?php echo $web_path; ?>/search.php?type=album"><?php echo T_('Albums'); ?></a></li>
           <li id="sb_home_search_artist"><a href="<?php echo $web_path; ?>/search.php?type=artist"><?php echo T_('Artists'); ?></a></li>
           <li id="sb_home_search_playlist"><a href="<?php echo $web_path; ?>/search.php?type=playlist"><?php echo T_('Playlists'); ?></a></li>
           <?php if (AmpConfig::get('allow_video')) {
     ?>
-            <li id="sb_home_search_video"><a href="<?php echo $web_path;
+            <li id="sb_home_search_video"><a href="<?php echo $web_path ?>/search.php?type=video"><?php echo T_('Videos') ?></a></li>
-    ?>/search.php?type=video"><?php echo T_('Videos');
-    ?></a></li>
           <?php 
 } ?>
         </ul>

themes/reborn/templates/default.css

@@ -437,7 +437,7 @@ input[type=button]:focus:active, input[type=submit]:focus:active {
 }
 
 .sidebar-collapsed {
-    width: 50px !important;
+    width: 70px !important;
 }
 
 .sidebar-header-title {
@@ -471,7 +471,7 @@ input[type=button]:focus:active, input[type=submit]:focus:active {
 }
 
 .sidebar-header-collapsed {
-    width: 50px !important;
+    width: 70px !important;
     position: fixed;
 }
 
@@ -495,11 +495,11 @@ input[type=button]:focus:active, input[type=submit]:focus:active {
 #sidebar-content-light {
     padding: 0px;
     display: none;
-    width: 50px;
+    width: 70px;
 }
 
 #sidebar-light {
-    width: 50px;
+    width: 70px;
     position: fixed;
     left: 0px;
     margin: 17px auto 5px 5px;
@@ -507,6 +507,10 @@ input[type=button]:focus:active, input[type=submit]:focus:active {
     text-align: center;
 }
 
+#sidebar-light li {
+	padding-top: 10px;
+}
+
 #sidebar-light img {
     margin: auto;
     height: 32px;
@@ -777,7 +781,7 @@ input[type=button]:focus:active, input[type=submit]:focus:active {
 }
 
 .content-left-wild {
-    margin-left: 70px !important;
+    margin-left: 90px !important;
 }
 
 .content-fixed {