yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 17:59:21 +02:00
Code Issues Releases Wiki Activity

Syntax update

Browse source 
Table filters are displayed on link click
This commit is contained in:
SUTJael 2014-02-02 17:11:45 +01:00
parent 339acb2931
commit 017c164f62
20 changed files with 142 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/javascript/tools.js
View file

@ -18,6 +18,17 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// //
/***********/
/* Filters */
/***********/
function showFilters(element) {
var link = $('.browse-options-link');
link.hide();
var content = $('.browse-options-content');
content.show();
}
/************************************************************/ /************************************************************/
/* Dialog selection to add song to an existing/new playlist */ /* Dialog selection to add song to an existing/new playlist */
/************************************************************/ /************************************************************/

3
templates/list_header.inc.php
View file

@ -175,6 +175,8 @@ if ($pages > 1 && $start > -1) {
?> ?>
   
<span class="browse-options"> <span class="browse-options">
<a href="#" onClick="showFilters(this);" class="browse-options-link"><?php echo T_("Filters"); ?></a>
<span class="browse-options-content">
<span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_use_pages_<?php echo $is_header; ?>" value="true" <?php echo (($browse->get_use_pages()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=use_pages&value=' + $('#browse_" . $browse->id . "_use_pages_" . $is_header . "').is(':checked') + '", "browse_" . $browse->id . "_use_pages_" . $is_header); ?>">Pages</span> <span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_use_pages_<?php echo $is_header; ?>" value="true" <?php echo (($browse->get_use_pages()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=use_pages&value=' + $('#browse_" . $browse->id . "_use_pages_" . $is_header . "').is(':checked') + '", "browse_" . $browse->id . "_use_pages_" . $is_header); ?>">Pages</span>
<span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_use_scroll_<?php echo $is_header; ?>" value="true" <?php echo ((!$browse->get_use_pages()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=use_pages&value=' + !($('#browse_" . $browse->id . "_use_scroll_" . $is_header . "').is(':checked')) + '", "browse_" . $browse->id . "_use_scroll_" . $is_header); ?>">Infinite Scroll</span> <span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_use_scroll_<?php echo $is_header; ?>" value="true" <?php echo ((!$browse->get_use_pages()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=use_pages&value=' + !($('#browse_" . $browse->id . "_use_scroll_" . $is_header . "').is(':checked')) + '", "browse_" . $browse->id . "_use_scroll_" . $is_header); ?>">Infinite Scroll</span>
<span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_use_alpha_<?php echo $is_header; ?>" value="true" <?php echo (($browse->get_use_alpha()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=use_alpha&value=' + $('#browse_" . $browse->id . "_use_alpha_" . $is_header . "').is(':checked') + '", "browse_" . $browse->id . "_use_alpha_" . $is_header); ?>">Alphabet</span> <span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_use_alpha_<?php echo $is_header; ?>" value="true" <?php echo (($browse->get_use_alpha()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=use_alpha&value=' + $('#browse_" . $browse->id . "_use_alpha_" . $is_header . "').is(':checked') + '", "browse_" . $browse->id . "_use_alpha_" . $is_header); ?>">Alphabet</span>
@ -188,6 +190,7 @@ if ($pages > 1 && $start > -1) {
</span> </span>
<?php } ?> <?php } ?>
</span> </span>
</span>
</div> </div>
<?php if (!$browse->get_use_pages() && $is_header) { ?> <?php if (!$browse->get_use_pages() && $is_header) { ?>
<div id="browse_<?php echo $browse->id; ?>_scroll"> <div id="browse_<?php echo $browse->id; ?>_scroll">

16
templates/show_album.inc.php
View file

@ -65,23 +65,23 @@ if (AmpConfig::get('show_played_times')) {
<ul> <ul>
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<li> <li>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=album&album_id=' . $album->id,'play', T_('Play album'),'directplay_full_' . $album->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=album&album_id=' . $album->id,'play', T_('Play'),'directplay_full_' . $album->id); ?>
<?php echo Ajax::text('?page=stream&action=directplay&playtype=album&album_id=' . $album->id, T_('Play Album'),'directplay_full_text_' . $album->id); ?> <?php echo Ajax::text('?page=stream&action=directplay&playtype=album&album_id=' . $album->id, T_('Play'),'directplay_full_text_' . $album->id); ?>
</li> </li>
<?php } ?> <?php } ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<li> <li>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=album&album_id=' . $album->id . '&append=true','play_add', T_('Play Add Album'),'addplay_album_' . $album->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=album&album_id=' . $album->id . '&append=true','play_add', T_('Play last'),'addplay_album_' . $album->id); ?>
<?php echo Ajax::text('?page=stream&action=directplay&playtype=album&album_id=' . $album->id . '&append=true', T_('Play Add Album'),'addplay_album_text_' . $album->id); ?> <?php echo Ajax::text('?page=stream&action=directplay&playtype=album&album_id=' . $album->id . '&append=true', T_('Play last'),'addplay_album_text_' . $album->id); ?>
</li> </li>
<?php } ?> <?php } ?>
<li> <li>
<?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Add'),'play_full_' . $album->id); ?> <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Add to temporary playlist'),'play_full_' . $album->id); ?>
<?php echo Ajax::text('?action=basket&type=album&id=' . $album->id, T_('Add Album'), 'play_full_text_' . $album->id); ?> <?php echo Ajax::text('?action=basket&type=album&id=' . $album->id, T_('Add to temporary playlist'), 'play_full_text_' . $album->id); ?>
</li> </li>
<li> <li>
<?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random', T_('Random'),'play_random_' . $album->id); ?> <?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random', T_('Random to temporary playlist'),'play_random_' . $album->id); ?>
<?php echo Ajax::text('?action=basket&type=album_random&id=' . $album->id, T_('Add Random from Album'), 'play_random_text_' . $album->id); ?> <?php echo Ajax::text('?action=basket&type=album_random&id=' . $album->id, T_('Random to temporary playlist'), 'play_random_text_' . $album->id); ?>
</li> </li>
<li> <li>
<a onclick="submitNewItemsOrder('<?php echo $album->id; ?>', 'reorder_songs_table', 'song_', <a onclick="submitNewItemsOrder('<?php echo $album->id; ?>', 'reorder_songs_table', 'song_',

4
templates/show_album_row.inc.php
View file

@ -24,9 +24,9 @@
<span class="cel_play_content">&nbsp;</span> <span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover"> <div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=album&album_id=' . $album->id,'play', T_('Play album'),'play_album_' . $album->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=album&album_id=' . $album->id,'play', T_('Play'),'play_album_' . $album->id); ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=album&album_id=' . $album->id . '&append=true','play_add', T_('Play add album'),'addplay_album_' . $album->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=album&album_id=' . $album->id . '&append=true','play_add', T_('Play last'),'addplay_album_' . $album->id); ?>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
</div> </div>

25
templates/show_artist.inc.php
View file

@ -63,37 +63,38 @@ if (AmpConfig::get('show_played_times')) {
<li> <li>
<?php if ($object_type == 'album') { ?> <?php if ($object_type == 'album') { ?>
<a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&amp;artist=<?php echo $artist->id; ?>"> <a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&amp;artist=<?php echo $artist->id; ?>">
<?php echo UI::get_icon('view', T_("Show All Songs By %s")); ?></a> <?php echo UI::get_icon('view', T_("Show all")); ?></a>
<a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&amp;artist=<?php echo $artist->id; ?>"> <a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&amp;artist=<?php echo $artist->id; ?>">
<?php printf(T_("Show All Songs By %s"), $artist->f_name); ?></a> <?php echo T_("Show all"); ?>
</a>
<?php } else { ?> <?php } else { ?>
<a href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $artist->id; ?>"> <a href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $artist->id; ?>">
<?php echo UI::get_icon('view', T_("Show Albums By %s")); ?></a> <?php echo UI::get_icon('view', T_("Show albums")); ?></a>
<a href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $artist->id; ?>"> <a href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $artist->id; ?>">
<?php printf(T_("Show Albums By %s"), $artist->f_name); ?></a> <?php echo T_("Show albums"); ?></a>
<?php } ?> <?php } ?>
</li> </li>
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<li> <li>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id,'play', T_('Play artist'),'directplay_full_' . $artist->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id,'play', T_('Play all'),'directplay_full_' . $artist->id); ?>
<?php echo Ajax::text('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id, sprintf(T_('Play All Songs By %s'), $artist->f_name),'directplay_full_text_' . $artist->id); ?> <?php echo Ajax::text('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id, T_('Play all'),'directplay_full_text_' . $artist->id); ?>
</li> </li>
<?php } ?> <?php } ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<li> <li>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id . '&append=true','play_add', T_('Play add artist'),'addplay_artist_' . $artist->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id . '&append=true','play_add', T_('Play all last'),'addplay_artist_' . $artist->id); ?>
<?php echo Ajax::text('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id . '&append=true', sprintf(T_('Play Add All Songs By %s'), $artist->f_name),'addplay_artist_text_' . $artist->id); ?> <?php echo Ajax::text('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id . '&append=true', T_('Play all last'),'addplay_artist_text_' . $artist->id); ?>
</li> </li>
<?php } ?> <?php } ?>
<li> <li>
<?php /* HINT: Artist Fullname */ ?> <?php /* HINT: Artist Fullname */ ?>
<?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add', T_('Add'),'add_' . $artist->id); ?> <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add', T_('Add all to temporary playlist'),'add_' . $artist->id); ?>
<?php echo Ajax::text('?action=basket&type=artist&id=' . $artist->id, sprintf(T_('Add All Songs By %s'), $artist->f_name),'add_text_' . $artist->id); ?> <?php echo Ajax::text('?action=basket&type=artist&id=' . $artist->id, T_('Add all to temporary playlist'),'add_text_' . $artist->id); ?>
</li> </li>
<li> <li>
<?php /* HINT: Artist Fullname */ ?> <?php /* HINT: Artist Fullname */ ?>
<?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random', T_('Random'),'random_' . $artist->id); ?> <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random', T_('Random all to temporary playlist'),'random_' . $artist->id); ?>
<?php echo Ajax::text('?action=basket&type=artist_random&id=' . $artist->id, sprintf(T_('Add Random Songs By %s'), $artist->f_name),'random_text_' . $artist->id); ?> <?php echo Ajax::text('?action=basket&type=artist_random&id=' . $artist->id, T_('Random all to temporary playlist'),'random_text_' . $artist->id); ?>
</li> </li>
<?php if (Access::check('interface','50')) { ?> <?php if (Access::check('interface','50')) { ?>
<li> <li>

4
templates/show_artist_row.inc.php
View file

@ -24,9 +24,9 @@
<span class="cel_play_content">&nbsp;</span> <span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover"> <div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id,'play', T_('Play artist'),'play_artist_' . $artist->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id,'play', T_('Play'),'play_artist_' . $artist->id); ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id . '&append=true','play_add', T_('Play add artist'),'addplay_artist_' . $artist->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=artist&artist_id=' . $artist->id . '&append=true','play_add', T_('Play last'),'addplay_artist_' . $artist->id); ?>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
</div> </div>

12
templates/show_missing_album.inc.php
View file

@ -53,19 +53,19 @@ if (count($images) > 0 && !empty($images[0]['url'])) {
<?php if (AmpConfig::get('echonest_api_key')) { ?> <?php if (AmpConfig::get('echonest_api_key')) { ?>
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<li> <li>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=album_preview&mbid=' . $walbum->mbid,'play_preview', T_('Play Album Preview'),'directplay_full_' . $walbum->mbid); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=album_preview&mbid=' . $walbum->mbid,'play_preview', T_('Play'),'directplay_full_' . $walbum->mbid); ?>
<?php echo Ajax::text('?page=stream&action=directplay&playtype=album_preview&mbid=' . $walbum->mbid, T_('Play Album Preview'),'directplay_full_text_' . $walbum->mbid); ?> <?php echo Ajax::text('?page=stream&action=directplay&playtype=album_preview&mbid=' . $walbum->mbid, T_('Play'),'directplay_full_text_' . $walbum->mbid); ?>
</li> </li>
<?php } ?> <?php } ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<li> <li>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=album_preview&mbid=' . $walbum->mbid . '&append=true','play_add_preview', T_('Play Add Album Preview'),'addplay_album_' . $walbum->mbid); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=album_preview&mbid=' . $walbum->mbid . '&append=true','play_add_preview', T_('Play last'),'addplay_album_' . $walbum->mbid); ?>
<?php echo Ajax::text('?page=stream&action=directplay&playtype=album_preview&mbid=' . $walbum->mbid . '&append=true', T_('Play Add Album Preview'),'addplay_album_text_' . $walbum->mbid); ?> <?php echo Ajax::text('?page=stream&action=directplay&playtype=album_preview&mbid=' . $walbum->mbid . '&append=true', T_('Play last'),'addplay_album_text_' . $walbum->mbid); ?>
</li> </li>
<?php } ?> <?php } ?>
<li> <li>
<?php echo Ajax::button('?action=basket&type=album_preview&mbid=' . $walbum->mbid,'add', T_('Add Album Preview'),'play_full_' . $walbum->mbid); ?> <?php echo Ajax::button('?action=basket&type=album_preview&mbid=' . $walbum->mbid,'add', T_('Add to temporary playlist'),'play_full_' . $walbum->mbid); ?>
<?php echo Ajax::text('?action=basket&type=album_preview&mbid=' . $walbum->mbid, T_('Add Album Preview'), 'play_full_text_' . $walbum->mbid); ?> <?php echo Ajax::text('?action=basket&type=album_preview&mbid=' . $walbum->mbid, T_('Add to temporary playlist'), 'play_full_text_' . $walbum->mbid); ?>
</li> </li>
<?php } ?> <?php } ?>
<li> <li>

35
templates/show_now_playing_row.inc.php
View file

@ -32,24 +32,6 @@ if ($np_user->f_avatar_medium) {
?> ?>
</a> </a>
</div> </div>
<br />
<?php if (AmpConfig::get('ratings')) { ?>
<div class="np_cell cel_rating">
<label><?php echo T_('Rating'); ?></label>
<div id="rating_<?php echo $media->id; ?>_song">
<?php Rating::show($media->id,'song'); ?>
</div>
</div>
<?php } ?>
<?php if (AmpConfig::get('userflags')) { ?>
<div class="np_cell cel_userflag">
<label><?php echo T_('Flag'); ?></label>
<div id="userflag_<?php echo $media->id; ?>_song">
<?php Userflag::show($media->id,'song'); ?>
</div>
</div>
<?php } ?>
</div> </div>
<div class="np_group" id="np_group_2"> <div class="np_group" id="np_group_2">
@ -102,3 +84,20 @@ $(document).ready(function(){
}); });
</script> </script>
<?php } ?> <?php } ?>
<div class="np_group" id="np_group_4">
<?php if (AmpConfig::get('ratings')) { ?>
<div class="np_cell cel_rating">
<label><?php echo T_('Rating'); ?></label>
<div id="rating_<?php echo $media->id; ?>_song">
<?php Rating::show($media->id,'song'); ?>
</div>
</div>
<div class="np_cell cel_userflag">
<label><?php echo T_('Flag'); ?></label>
<div id="userflag_<?php echo $media->id; ?>_song">
<?php Userflag::show($media->id,'song'); ?>
</div>
</div>
<?php } ?>
</div>

16
templates/show_playlist.inc.php
View file

@ -52,23 +52,23 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
<?php } ?> <?php } ?>
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<li> <li>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id,'play', T_('Play All'),'directplay_full_' . $playlist->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id,'play', T_('Play all'),'directplay_full_' . $playlist->id); ?>
<?php echo Ajax::text('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id, T_('Play All'),'directplay_full_text_' . $playlist->id); ?> <?php echo Ajax::text('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id, T_('Play all'),'directplay_full_text_' . $playlist->id); ?>
</li> </li>
<?php } ?> <?php } ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<li> <li>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id . '&append=true','play_add', T_('Play Add Playlist'),'addplay_playlist_' . $playlist->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id . '&append=true','play_add', T_('Play all last'),'addplay_playlist_' . $playlist->id); ?>
<?php echo Ajax::text('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id . '&append=true', T_('Play Add Playlist'),'addplay_playlist_text_' . $playlist->id); ?> <?php echo Ajax::text('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id . '&append=true', T_('Play all last'),'addplay_playlist_text_' . $playlist->id); ?>
</li> </li>
<?php } ?> <?php } ?>
<li> <li>
<?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add', T_('Add All'),'play_playlist'); ?> <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add', T_('Add all to temporary playlist'),'play_playlist'); ?>
<?php echo Ajax::text('?action=basket&type=playlist&id=' . $playlist->id, T_('Add All'),'play_playlist_text'); ?> <?php echo Ajax::text('?action=basket&type=playlist&id=' . $playlist->id, T_('Add all to temporary playlist'),'play_playlist_text'); ?>
</li> </li>
<li> <li>
<?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random', T_('Add Random'),'play_playlist_random'); ?> <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random', T_('Random all to temporary playlist'),'play_playlist_random'); ?>
<?php echo Ajax::text('?action=basket&type=playlist_random&id=' . $playlist->id, T_('Add Random'),'play_playlist_random_text'); ?> <?php echo Ajax::text('?action=basket&type=playlist_random&id=' . $playlist->id, T_('Random all to temporary playlist'),'play_playlist_random_text'); ?>
</li> </li>
<?php if ($playlist->has_access()) { ?> <?php if ($playlist->has_access()) { ?>
<li> <li>

4
templates/show_playlist_row.inc.php
View file

@ -24,9 +24,9 @@
<span class="cel_play_content">&nbsp;</span> <span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover"> <div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id,'play', T_('Play playlist'),'play_playlist_' . $playlist->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id,'play', T_('Play'),'play_playlist_' . $playlist->id); ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id . '&append=true','play_add', T_('Play add playlist'),'addplay_playlist_' . $playlist->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=playlist&playlist_id=' . $playlist->id . '&append=true','play_add', T_('Play last'),'addplay_playlist_' . $playlist->id); ?>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
</div> </div>

4
templates/show_playlist_song_row.inc.php
View file

@ -24,9 +24,9 @@
<span class="cel_play_content"><?php echo '<b>'.$playlist_track.'</b>'; ?></span> <span class="cel_play_content"><?php echo '<b>'.$playlist_track.'</b>'; ?></span>
<div class="cel_play_hover"> <div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id, 'play', T_('Play song'),'play_playlist_song_' . $song->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id, 'play', T_('Play'),'play_playlist_song_' . $song->id); ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id . '&append=true','play_add', T_('Play add song'),'addplay_song_' . $song->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id . '&append=true','play_add', T_('Play last'),'addplay_song_' . $song->id); ?>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
</div> </div>

4
templates/show_recently_played.inc.php
View file

@ -89,9 +89,9 @@ UI::show_box_top(T_('Recently Played') . $link, 'box box_recently_played');
<span class="cel_play_content">&nbsp;</span> <span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover"> <div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id,'play', T_('Play song'),'play_song_' . $song->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id,'play', T_('Play'),'play_song_' . $song->id); ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id . '&append=true','play_add', T_('Play add song'),'addplay_song_' . $song->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id . '&append=true','play_add', T_('Play last'),'addplay_song_' . $song->id); ?>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
</div> </div>

3
templates/show_recommended_artists.inc.php
View file

@ -60,7 +60,8 @@ $thcount = 8;
foreach ($missing_objects as $missing) { foreach ($missing_objects as $missing) {
?> ?>
<tr id="missing_artist_<?php echo $missing['mbid']; ?>" class="<?php echo UI::flip_class(); ?>"> <tr id="missing_artist_<?php echo $missing['mbid']; ?>" class="<?php echo UI::flip_class(); ?>">
<td colspan="<?php echo $thcount; ?>"><a class="missing_album" href="<?php echo AmpConfig::get('web_path'); ?>/artists.php?action=show_missing&mbid=<?php echo $missing['mbid']; ?>" title="<?php echo scrub_out($missing['name']); ?>"><?php echo scrub_out($missing['name']); ?></a></td> <td></td>
<td colspan="<?php echo ($thcount - 1); ?>"><a class="missing_album" href="<?php echo AmpConfig::get('web_path'); ?>/artists.php?action=show_missing&mbid=<?php echo $missing['mbid']; ?>" title="<?php echo scrub_out($missing['name']); ?>"><?php echo scrub_out($missing['name']); ?></a></td>
</tr> </tr>
<?php } ?> <?php } ?>
<?php if ((!$object_ids || !count($object_ids)) && (!$missing_objects || !count($missing_objects))) { ?> <?php if ((!$object_ids || !count($object_ids)) && (!$missing_objects || !count($missing_objects))) { ?>

4
templates/show_smartplaylist_row.inc.php
View file

@ -24,9 +24,9 @@
<span class="cel_play_content">&nbsp;</span> <span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover"> <div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=smartplaylist&playlist_id=' . $playlist->id,'play', T_('Play playlist'),'play_playlist_' . $playlist->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=smartplaylist&playlist_id=' . $playlist->id,'play', T_('Play'),'play_playlist_' . $playlist->id); ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=smartplaylist&playlist_id=' . $playlist->id . '&append=true','play_add', T_('Play add playlist'),'addplay_playlist_' . $playlist->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=smartplaylist&playlist_id=' . $playlist->id . '&append=true','play_add', T_('Play last'),'addplay_playlist_' . $playlist->id); ?>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
</div> </div>

6
templates/show_song.inc.php
View file

@ -56,12 +56,12 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
<dt class="<?php echo $rowparity; ?>"><?php echo T_('Action'); ?></dt> <dt class="<?php echo $rowparity; ?>"><?php echo T_('Action'); ?></dt>
<dd class="<?php echo $rowparity; ?>"> <dd class="<?php echo $rowparity; ?>">
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id, 'play', T_('Play song'),'play_song_' . $song->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id, 'play', T_('Play'),'play_song_' . $song->id); ?>
<?php } ?> <?php } ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id . '&append=true','play_add', T_('Play add song'),'addplay_song_' . $song->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id . '&append=true','play_add', T_('Play last'),'addplay_song_' . $song->id); ?>
<?php } ?> <?php } ?>
<?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add'),'add_song_' . $song->id); ?> <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add to temporary playlist'),'add_song_' . $song->id); ?>
<?php if (AmpConfig::get('sociable')) { ?> <?php if (AmpConfig::get('sociable')) { ?>
<a href="<?php echo AmpConfig::get('web_path'); ?>/shout.php?action=show_add_shout&type=song&id=<?php echo $song->id; ?>"> <a href="<?php echo AmpConfig::get('web_path'); ?>/shout.php?action=show_add_shout&type=song&id=<?php echo $song->id; ?>">
<?php echo UI::get_icon('comment', T_('Post Shout')); ?> <?php echo UI::get_icon('comment', T_('Post Shout')); ?>

4
templates/show_song_preview_row.inc.php
View file

@ -23,9 +23,9 @@
<?php if (AmpConfig::get('echonest_api_key')) { ?> <?php if (AmpConfig::get('echonest_api_key')) { ?>
<td class="cel_play"> <td class="cel_play">
<?php if (AmpConfig::get('directplay') && !empty($song->file)) { ?> <?php if (AmpConfig::get('directplay') && !empty($song->file)) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=song_preview&id=' . $song->id,'play_preview', T_('Play song Preview'),'play_song_' . $song->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=song_preview&id=' . $song->id,'play_preview', T_('Play'),'play_song_' . $song->id); ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=song_preview&id=' . $song->id . '&append=true','play_add_preview', T_('Play Add Song Preview'),'addplay_song_' . $song->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=song_preview&id=' . $song->id . '&append=true','play_add_preview', T_('Play last'),'addplay_song_' . $song->id); ?>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
</td> </td>

4
templates/show_song_row.inc.php
View file

@ -24,9 +24,9 @@
<span class="cel_play_content"><?php if (isset($argument) && $argument) { echo '<b>'.$song->f_track.'</b>'; } ?></span> <span class="cel_play_content"><?php if (isset($argument) && $argument) { echo '<b>'.$song->f_track.'</b>'; } ?></span>
<div class="cel_play_hover"> <div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id, 'play', T_('Play song'), 'play_song_' . $song->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id, 'play', T_('Play'), 'play_song_' . $song->id); ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id . '&append=true', 'play_add', T_('Play add song'), 'addplay_song_' . $song->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=song&song_id=' . $song->id . '&append=true', 'play_add', T_('Play last'), 'addplay_song_' . $song->id); ?>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
</div> </div>

4
templates/show_video_row.inc.php
View file

@ -24,9 +24,9 @@
<span class="cel_play_content">&nbsp;</span> <span class="cel_play_content">&nbsp;</span>
<div class="cel_play_hover"> <div class="cel_play_hover">
<?php if (AmpConfig::get('directplay')) { ?> <?php if (AmpConfig::get('directplay')) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=video&video_id=' . $video->id,'play', T_('Play video'),'play_video_' . $video->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=video&video_id=' . $video->id,'play', T_('Play'),'play_video_' . $video->id); ?>
<?php if (Stream_Playlist::check_autoplay_append()) { ?> <?php if (Stream_Playlist::check_autoplay_append()) { ?>
<?php echo Ajax::button('?page=stream&action=directplay&playtype=video&video_id=' . $video->id . '&append=true','play_add', T_('Play add video'),'addplay_video_' . $video->id); ?> <?php echo Ajax::button('?page=stream&action=directplay&playtype=video&video_id=' . $video->id . '&append=true','play_add', T_('Play last'),'addplay_video_' . $video->id); ?>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
</div> </div>

10
themes/reborn/templates/default.css
View file

@ -1712,6 +1712,14 @@ ol, ul, #rightbar ul {
width: 50px; width: 50px;
} }
.browse-options-content {
display: none;
}
.browse-options-content span {
margin-right: 5px;
}
.jscroll-next { .jscroll-next {
width:50%; width:50%;
display:block; display:block;
@ -1735,7 +1743,7 @@ ol, ul, #rightbar ul {
.missing_album { .missing_album {
text-decoration: none; text-decoration: none;
border-bottom:1px dotted; border-bottom:1px dotted;
/*color: #DF4949 !important;*/ color: #bbb !important;
} }
.user_avatar { .user_avatar {