1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 09:49:30 +02:00

Add browse filter and light sidebar options

Add overload to force library item art display
This commit is contained in:
Afterster 2016-02-29 22:51:42 +01:00
parent 5f3d59ed74
commit 0630676eb6
26 changed files with 163 additions and 136 deletions

View file

@ -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' : ''; ?>" >

View file

@ -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'); ?>" /></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>
<?php if (AmpConfig::get('userflags')) {
<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=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=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') && Access::check('interface', 25)) {
?>
<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');
?>" /></a></li>
<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>
<?php
} ?>
<?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>

View file

@ -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;
?>/browse.php?action=label"><?php echo T_('Labels');
?></a></li>
<li id="sb_home_browse_music_label"><a href="<?php echo $web_path ?>/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;
?>/browse.php?action=channel"><?php echo T_('Channels');
?></a></li>
<li id="sb_home_browse_music_channel"><a href="<?php echo $web_path ?>/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;
?>/browse.php?action=broadcast"><?php echo T_('Broadcasts');
?></a></li>
<li id="sb_home_browse_music_broadcast"><a href="<?php echo $web_path ?>/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;
?>/browse.php?action=live_stream"><?php echo T_('Radio Stations');
?></a></li>
<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>
<?php
} ?>
<?php if (AmpConfig::get('podcast')) {
?>
<li id="sb_home_browse_music_podcast"><a href="<?php echo $web_path;
?>/browse.php?action=podcast"><?php echo T_('Podcasts');
?></a></li>
<li id="sb_home_browse_music_podcast"><a href="<?php echo $web_path ?>/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;
?>/upload.php"><?php echo T_('Upload');
?></a></li>
<li id="sb_home_browse_music_upload"><a href="<?php echo $web_path ?>/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');
?></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_video']) ? $_COOKIE['sb_home_browse_video'] : 'expanded';
<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');
?>/images/icons/icon_all.png" class="header-img <?php echo isset($_COOKIE['sb_browse_video']) ? $_COOKIE['sb_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;
?>/browse.php?action=clip"><?php echo T_('Music Clips');
?></a></li>
<li id="sb_home_browse_video_tvShow"><a href="<?php echo $web_path;
?>/browse.php?action=tvshow"><?php echo T_('TV Shows');
?></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>
<li id="sb_home_browse_video_clip"><a href="<?php echo $web_path ?>/browse.php?action=clip"><?php echo T_('Music Clips') ?></a></li>
<li id="sb_home_browse_video_tvShow"><a href="<?php echo $web_path ?>/browse.php?action=tvshow"><?php echo T_('TV Shows') ?></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 Ajax::end_container(); ?>
<?php
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');
?>/index.php"><?php echo T_('Currently Playing');
?></a></li>
<li id="sb_home_playlist_currentlyPlaying"><a href="<?php echo AmpConfig::get('web_path') ?>/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;
?>/democratic.php?action=show_playlist"><?php echo T_('Democratic');
?></a></li>
<li id="sb_home_playlist_playlist"><a href="<?php echo $web_path ?>/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;
?>/localplay.php?action=show_playlist"><?php echo T_('Localplay');
?></a></li>
<li id="sb_home_playlist_show"><a href="<?php echo $web_path ?>/localplay.php?action=show_playlist"><?php echo T_('Localplay') ?></a></li>
<?php
}
?>
<?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>
<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>
<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_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;
?>/stats.php?action=highest"><?php echo T_('Top Rated');
?></a></li>
<li id="sb_home_info_highest"><a href="<?php echo $web_path ?>/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;
?>/stats.php?action=userflag"><?php echo T_('Favorites');
?></a></li>
<li id="sb_home_info_userFlag"><a href="<?php echo $web_path?>/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;
?>/stats.php?action=wanted"><?php echo T_('Wanted List');
?></a></li>
<li id="sb_home_info_wanted"><a href="<?php echo $web_path ?>/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;
?>/stats.php?action=share"><?php echo T_('Shared Objects');
?></a></li>
<li id="sb_home_info_share"><a href="<?php echo $web_path ?>/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;
?>/stats.php?action=upload"><?php echo T_('Uploads');
?></a></li>
<li id="sb_home_info_upload"><a href="<?php echo $web_path ?>/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;
?>/stats.php?action=show"><?php echo T_('Statistics');
?></a></li>
<li id="sb_home_info_statistic"><a href="<?php echo $web_path ?>/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>
<ul class="sb3" id="sb_home_search">
<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_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;
?>/search.php?type=video"><?php echo T_('Videos');
?></a></li>
<li id="sb_home_search_video"><a href="<?php echo $web_path ?>/search.php?type=video"><?php echo T_('Videos') ?></a></li>
<?php
} ?>
</ul>