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

- hardcoded disk# sort order when sort is set to album name

Browse source 
- removed pager from browse table
- added footer to browse tables
- updated browse files for better customization
- modified css
This commit is contained in:
spocky 2007-10-16 20:26:16 +00:00
parent 4b58b3e218
commit 15c56f21f2
13 changed files with 189 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/class/browse.class.php
View file

@ -428,7 +428,7 @@ class Browse {
case 'album':
switch($field) {
case 'name':
$sql = "`album`.`name`";
$sql = "`album`.`name`, `album`.`disk`";
break;
case 'year':
$sql = "`album`.`year`";
@ -503,44 +503,45 @@ class Browse {
// Format any matches we have so we can show them to the masses
$match = $_SESSION['browse']['filter']['alpha_match'] ? ' (' . $_SESSION['browse']['filter']['alpha_match'] . ')' : '';
$class = "box browse_".$_SESSION['browse']['type'];
switch ($_SESSION['browse']['type']) {
case 'song':
show_box_top(_('Songs') . $match);
show_box_top(_('Songs') . $match, $class);
require_once Config::get('prefix') . '/templates/show_songs.inc.php';
show_box_bottom();
break;
case 'album':
show_box_top(_('Albums') . $match);
show_box_top(_('Albums') . $match, $class);
require_once Config::get('prefix') . '/templates/show_albums.inc.php';
show_box_bottom();
break;
case 'genre':
show_box_top(_('Genres') . $match);
show_box_top(_('Genres') . $match, $class);
require_once Config::get('prefix') . '/templates/show_genres.inc.php';
show_box_bottom();
break;
case 'user':
show_box_top(_('Manage Users') . $match);
show_box_top(_('Manage Users') . $match, $class);
require_once Config::get('prefix') . '/templates/show_users.inc.php';
show_box_bottom();
break;
case 'artist':
show_box_top(_('Artists') . $match);
show_box_top(_('Artists') . $match, $class);
require_once Config::get('prefix') . '/templates/show_artists.inc.php';
show_box_bottom();
break;
case 'live_stream':
show_box_top(_('Radion Stations') . $match);
show_box_top(_('Radion Stations') . $match, $class);
require_once Config::get('prefix') . '/templates/show_live_streams.inc.php';
show_box_bottom();
break;
case 'playlist':
show_box_top(_('Playlists') . $match);
show_box_top(_('Playlists') . $match, $class);
require_once Config::get('prefix') . '/templates/show_playlists.inc.php';
show_box_bottom();
break;
case 'catalog':
show_box_top(_('Catalogs'));
show_box_top(_('Catalogs'), $class);
require_once Config::get('prefix') . '/templates/show_catalogs.inc.php';
show_box_bottom();
break;

5
templates/show_album_row.inc.php
View file

@ -24,10 +24,11 @@
<?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random',_('Random'),'random_album_' . $album->id); ?>
</td>
<?php if (Browse::get_filter('show_art')) { ?>
<td height="87">
<td class="br_td_cover">
<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=show&amp;album=<?php echo $album->id; ?>">
<img height="75" width="75" src="<?php echo Config::get('web_path'); ?>/image.php?id=<?php echo $album->id; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>"
<img height="75" width="75" src="<?php echo Config::get('web_path'); ?>/image.php?id=<?php echo $album->id; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" />
</a>
</td>
<?php } ?>
<td><?php echo $album->f_name_link; ?></td>
<td><?php echo $album->f_artist_link; ?></td>

32
templates/show_albums.inc.php
View file

@ -21,13 +21,18 @@
$web_path = Config::get('web_path');
$ajax_url = Config::get('ajax_url');
?>
<table class="tabledata" cellspacing="0" cellpadding="0">
<tr>
<td colspan="7">
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
</td>
</tr>
<tr class="table-header">
<table class="tabledata" cellspacing="0" cellpadding="0">
<colgroup>
<col id="br_add" />
<col id="br_cover" />
<col id="br_album" />
<col id="br_artist" />
<col id="br_songs" />
<col id="br_year" />
<col id="br_action" />
</colgroup>
<tr class="table-header th-top">
<th><?php echo _('Add'); ?></th>
<?php if (Browse::get_filter('show_art')) { ?>
<th><?php echo _('Cover'); ?></th>
@ -48,9 +53,16 @@ $ajax_url = Config::get('ajax_url');
<?php require Config::get('prefix') . '/templates/show_album_row.inc.php'; ?>
</tr>
<?php } //end foreach ($albums as $album) ?>
<tr>
<td colspan="7">
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
</td>
<tr class="table-header th-bottom">
<th><?php echo _('Add'); ?></th>
<?php if (Browse::get_filter('show_art')) { ?>
<th><?php echo _('Cover'); ?></th>
<?php } ?>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Album'),'album_sort_name'); ?></th>
<th><?php echo _('Artist'); ?></th>
<th><?php echo _('Songs'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=year',_('Year'),'album_sort_year'); ?></th>
<th><?php echo _('Actions'); ?></th>
</tr>
</table>
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>

2
templates/show_artist_row.inc.php
View file

@ -26,7 +26,7 @@
<td><?php echo $artist->f_name_link; ?></td>
<td><?php echo $artist->songs; ?></td>
<td><?php echo $artist->albums; ?></td>
<td nowrap="nowrap">
<td>
<?php if (Access::check_function('batch_download')) { ?>
<a href="<?php echo Config::get('web_path'); ?>/batch.php?action=artist&amp;id=<?php echo $artist->id; ?>">
<?php echo get_user_icon('batch_download','',_('Batch Download')); ?>

26
templates/show_artists.inc.php
View file

@ -21,13 +21,16 @@
$web_path = Config::get('web_path');
?>
<table class="tabledata" cellspacing="0" cellpadding="0">
<tr>
<td colspan="5">
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
</td>
</tr>
<tr class="table-header">
<table class="tabledata" cellspacing="0" cellpadding="0">
<colgroup>
<col id="br_add" />
<col id="br_artist" />
<col id="br_songs" />
<col id="br_albums" />
<col id="br_action" />
</colgroup>
<tr class="table-header th-top">
<th><?php echo _('Add'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Artist'),'artist_sort_name'); ?></th>
<th> <?php echo _('Songs'); ?> </th>
@ -44,17 +47,12 @@ foreach ($object_ids as $artist_id) {
<?php require Config::get('prefix') . '/templates/show_artist_row.inc.php'; ?>
</tr>
<?php } //end foreach ($artists as $artist) ?>
<tr class="table-header">
<tr class="table-header th-bottom">
<th><?php echo _('Add'); ?></th>
<th><?php echo _("Artist"); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Artist'),'artist_sort_name'); ?></th>
<th> <?php echo _('Songs'); ?> </th>
<th> <?php echo _('Albums'); ?> </th>
<th> <?php echo _('Action'); ?> </th>
</tr>
<tr>
<td colspan="5">
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
</td>
</tr>
</table>
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>

26
templates/show_catalogs.inc.php
View file

@ -19,13 +19,16 @@
*/
?>
<table class="tabledata" cellspacing="0" cellpadding="0">
<tr>
<td colspan="5">
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
</td>
</tr>
<tr class="table-header">
<table class="tabledata" cellspacing="0" cellpadding="0">
<colgroup>
<col id="br_catalog" />
<col id="br_path" />
<col id="br_lastverify" />
<col id="br_lastadd" />
<col id="br_action" />
</colgroup>
<tr class="table-header th-top">
<th><?php echo _('Name'); ?></th>
<th><?php echo _('Path'); ?></th>
<th><?php echo _('Last Verify'); ?></th>
@ -41,9 +44,12 @@
<?php require Config::get('prefix') . '/templates/show_catalog_row.inc.php'; ?>
</tr>
<?php } ?>
<tr>
<td colspan="5">
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
</td>
<tr class="table-header th-bottom">
<th><?php echo _('Name'); ?></th>
<th><?php echo _('Path'); ?></th>
<th><?php echo _('Last Verify'); ?></th>
<th><?php echo _('Last Add'); ?></th>
<th><?php echo _('Actions'); ?></th>
</tr>
</table>
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>

24
templates/show_genres.inc.php
View file

@ -24,13 +24,15 @@
* Takes an array of genre objects and displays them out
*/
?>
<table class="tabledata" cellspacing="0" cellpadding="0">
<tr>
<td colspan="5">
<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
</td>
</tr>
<tr class="table-header">
<table class="tabledata" cellspacing="0" cellpadding="0">
<colgroup>
<col id="br_add" />
<col id="br_genre" />
<col id="br_songs" />
<col id="br_action" />
</colgroup>
<tr class="table-header th-top">
<th><?php echo _('Add'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Genre'),'sort_genre_name'); ?></th>
<th><?php echo _('Songs'); ?></th>
@ -61,9 +63,11 @@ foreach ($object_ids as $genre_id) {
</td>
</tr>
<?php } // end foreach genres ?>
<tr>
<td colspan="5">
<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
</td>
<tr class="table-header th-bottom">
<th><?php echo _('Add'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Genre'),'sort_genre_name'); ?></th>
<th><?php echo _('Songs'); ?></th>
<th><?php echo _('Action'); ?></th>
</tr>
</table>
<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>

28
templates/show_live_streams.inc.php
View file

@ -21,13 +21,17 @@
$web_path = Config::get('web_path');
?>
<table class="tabledata" cellspacing="0" cellpadding="0">
<tr>
<td colspan="6">
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
</td>
</tr>
<tr class="table-header">
<table class="tabledata" cellspacing="0" cellpadding="0">
<colgroup>
<col id="br_add" />
<col id="br_streamname" />
<col id="br_callsign" />
<col id="br_frequency" />
<col id="br_genre" />
<col id="br_action" />
</colgroup>
<tr class="table-header th-top">
<th><?php echo _('Add'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Name'),'live_stream_sort_name'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign',_('Callsign'),'live_stream_call_sign'); ?></th>
@ -44,9 +48,13 @@ foreach ($object_ids as $radio_id) {
<?php require Config::get('prefix') . '/templates/show_live_stream_row.inc.php'; ?>
</tr>
<?php } //end foreach ($artists as $artist) ?>
<tr>
<td colspan="6">
<?php require Config::Get('prefix') . '/templates/list_header.inc.php'; ?>
</td>
<tr class="table-header th-bottom">
<th><?php echo _('Add'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Name'),'live_stream_sort_name'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign',_('Callsign'),'live_stream_call_sign'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency',_('Frequency'),'live_stream_frequency'); ?></th>
<th><?php echo _('Genre'); ?></th>
<th><?php echo _('Action'); ?> </th>
</tr>
</table>
<?php require Config::Get('prefix') . '/templates/list_header.inc.php'; ?>

28
templates/show_playlists.inc.php
View file

@ -20,14 +20,17 @@
*/
?>
<table class="tabledata" cellspacing="0" cellpadding="0"> <!-- Playlist Table -->
<tr>
<td colspan="5">
<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
</td>
</tr>
<tr class="table-header">
<th>&nbsp;</th>
<table class="tabledata" cellspacing="0" cellpadding="0">
<colgroup>
<col id="br_add" />
<col id="br_playlist" />
<col id="br_songs" />
<col id="br_owner" />
<col id="br_action" />
</colgroup>
<tr class="table-header th-top">
<th><?php echo _('Add'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Playlist Name'),'playlist_sort_name'); ?></th>
<th><?php echo _('# Songs'); ?></th>
<th><?php echo _('Owner'); ?></th>
@ -43,9 +46,12 @@ foreach ($object_ids as $playlist_id) {
<?php require Config::get('prefix') . '/templates/show_playlist_row.inc.php'; ?>
</tr>
<?php } // end foreach ($playlists as $playlist) ?>
<tr>
<td colspan="5">
<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>
</td>
<tr class="table-header th-bottom">
<th><?php echo _('Add'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Playlist Name'),'playlist_sort_name'); ?></th>
<th><?php echo _('# Songs'); ?></th>
<th><?php echo _('Owner'); ?></th>
<th><?php echo _('Actions'); ?></th>
</tr>
</table>
<?php require Config::get('prefix') . '/templates/list_header.inc.php' ?>

34
templates/show_songs.inc.php
View file

@ -23,13 +23,19 @@
$web_path = Config::get('web_path');
$ajax_url = Config::get('ajax_url');
?>
<table class="tabledata" cellspacing="0" cellpadding="0">
<tr>
<td colspan="8">
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
</td>
</tr>
<tr class="table-header">
<table class="tabledata" cellspacing="0" cellpadding="0">
<colgroup>
<col id="br_add" />
<col id="br_song" />
<col id="br_artist" />
<col id="br_album" />
<col id="br_genre" />
<col id="br_track" />
<col id="br_time" />
<col id="br_action" />
</colgroup>
<tr class="table-header th-top">
<th><?php echo _('Add'); ?></th>
<th>
<?php echo Ajax::text('?page=browse&action=set_sort&sort=title',_('Song Title'),'sort_song_title'); ?>
@ -50,9 +56,17 @@ $ajax_url = Config::get('ajax_url');
<?php require Config::get('prefix') . '/templates/show_song_row.inc.php'; ?>
</tr>
<?php } ?>
<tr>
<td colspan="8">
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
</td>
<tr class="table-header th-bottom">
<th><?php echo _('Add'); ?></th>
<th>
<?php echo Ajax::text('?page=browse&action=set_sort&sort=title',_('Song Title'),'sort_song_title'); ?>
</th>
<th><?php echo _('Artist'); ?></th>
<th><?php echo _('Album'); ?></th>
<th><?php echo _('Genre'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=track',_('Track'),'sort_song_track'); ?></th>
<th><?php echo Ajax::text('?page=browse&action=set_sort&sort=time',_('Time'),'sort_song_time'); ?></th>
<th><?php echo _('Action'); ?></th>
</tr>
</table>
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>

57
templates/show_users.inc.php
View file

@ -22,37 +22,27 @@
$web_path = Config::get('web_path');
?>
<table class="tabledata" cellpadding="0" cellspacing="0">
<tr class="table-header" align="center">
<th colspan="11">
<?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?>
</th>
</tr>
<tr class="table-header">
<th>
<?php echo _('Fullname'); ?>
(<?php echo _('Username'); ?>)
</th>
<th>
<?php echo _('Last Seen'); ?>
</th>
<th>
<?php echo _('Registration Date'); ?>
</th>
<th>
<?php echo _('Activity'); ?>
</th>
<table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup>
<col id="br_username" />
<col id="br_lastseen" />
<col id="br_registrationdate" />
<col id="br_activity" />
<col id="br_lastip" />
<col id="br_action" />
<col id="br_online" />
</colgroup>
<tr class="table-header th-top">
<th><?php echo _('Fullname'); ?>(<?php echo _('Username'); ?>)</th>
<th><?php echo _('Last Seen'); ?></th>
<th><?php echo _('Registration Date'); ?></th>
<th><?php echo _('Activity'); ?></th>
<?php if (Config::get('track_user_ip')) { ?>
<th>
<?php echo _('Last Ip'); ?>
</th>
<th><?php echo _('Last Ip'); ?></th>
<?php } ?>
<th>
<?php echo _('Action'); ?>
</th>
<th>
<?php echo _('On-line'); ?>
</th>
<th><?php echo _('Action'); ?></th>
<th><?php echo _('On-line'); ?></th>
</tr>
<?php
foreach ($object_ids as $user_id) {
@ -112,4 +102,15 @@ foreach ($object_ids as $user_id) {
?>
</tr>
<?php } //end foreach users ?>
<tr class="table-header th-bottom">
<th><?php echo _('Fullname'); ?>(<?php echo _('Username'); ?>)</th>
<th><?php echo _('Last Seen'); ?></th>
<th><?php echo _('Registration Date'); ?></th>
<th><?php echo _('Activity'); ?></th>
<?php if (Config::get('track_user_ip')) { ?>
<th><?php echo _('Last Ip'); ?></th>
<?php } ?>
<th><?php echo _('Action'); ?></th>
<th><?php echo _('On-line'); ?></th>
</tr>
</table>

11
themes/classic/templates/default.css
View file

@ -556,9 +556,9 @@ h3#content_title span {
/************************************************/
/* List Header Styles */
/************************************************/
.list-header{margin:7px 0; text-align:center; font-size: 0.8em;}
.list-header .prev{float:left;}
.list-header .next{float:right;}
.list-header{margin:7px 0; text-align:center; font-size: 0.8em;position:relative;}
.list-header .prev{/*float:left;*/ position:absolute; top:0; left:0;}
.list-header .next{/*float:right;*/ position:absolute; top:0; right:0;}
.list-header .selected{background: #e0e0e0;}
.list-header .page-nb{padding:1px;border: 1px solid #ccc;text-decoration: none;}
.list-header .page-nb:hover{background: #d0d0d0;}
@ -613,6 +613,11 @@ div#Header{
margin-left: 10px;
}
/************************************************/
/* "Browse by" */
/************************************************/
.br_td_cover{padding:6px;}
/************************************************/
/* Styles for Login template */

19
themes/greysme/templates/default.css
View file

@ -56,6 +56,7 @@ body{
font-family: Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif;
background: #2b293d url(../images/background.jpg) 0 0 repeat-x fixed;
min-width:90em;
color:#e9ad51;
}
ol { list-style-type: decimal-leading-zero; }
@ -159,15 +160,13 @@ input[type=checkbox]{border:none;background:none;}
background: #111;
vertical-align: top;
}
.table-header td, .table-header th {
.table-header th {
color:#8b3e38;
font-variant:small-caps;
font-weight:normal;
}
.table-header th {
border-right:1px solid #000;
}
.table-header td a, .table-header th a {
.table-header th a {
color:#8b3e38;
padding-right:10px;
background: url(../images/sort_off.gif) 100% 50% no-repeat;
@ -333,6 +332,7 @@ h3#content_title span {} /* Doesn't exist anymore (?) */
border-bottom:1px dotted #e9ad51;
text-decoration: overline;
background: url(../images/puce.gif) -8px -8px no-repeat;
color:#e9ad51;
}
#sidebar-page ul.sb2 li:hover h4{
background-color:#000;
@ -620,9 +620,9 @@ h3#content_title span {} /* Doesn't exist anymore (?) */
/************************************************/
/* List Header Styles */
/************************************************/
.list-header{margin:7px 0; text-align:center; font-size: 0.9em;}
.list-header .prev{float:left;}
.list-header .next{float:right;}
.list-header{margin:7px 0; text-align:center; font-size: 0.9em;position:relative;}
.list-header .prev{/*float:left;*/ position:absolute; top:0; left:0;}
.list-header .next{/*float:right;*/ position:absolute; top:0; right:0;}
.list-header .selected{}
.list-header .page-nb{padding:1px;border: 1px solid #111;}
.list-header a:hover{background: transparent; border-color:#e9ad51;}
@ -792,7 +792,10 @@ input.text_input {
margin-left:5px;
}
/************************************************/
/* "Browse by" */
/************************************************/
.br_td_cover{padding:6px;}
/************************************************/
/* Misc */