diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.css | 4 | ||||
| -rw-r--r-- | templates/show_album_row.inc.php | 20 | ||||
| -rw-r--r-- | templates/show_albums.inc.php | 6 | ||||
| -rw-r--r-- | templates/show_artist.inc.php | 4 | ||||
| -rw-r--r-- | templates/show_index.inc.php | 116 | ||||
| -rw-r--r-- | templates/show_now_playing_row.inc.php | 9 | ||||
| -rw-r--r-- | templates/show_random_albums.inc.php | 8 |
7 files changed, 119 insertions, 48 deletions
diff --git a/templates/base.css b/templates/base.css index db4d7408..ca508c35 100644 --- a/templates/base.css +++ b/templates/base.css @@ -25,6 +25,7 @@ * Tag Definitions *****************/ +/* why god why!? .tag_size1 { font-size:.6em; } @@ -37,10 +38,11 @@ .tag_size4 { font-size:1.2em; } +*/ a.tag_size1, a.tag_size2, a.tag_size3, a.tag_size4 { text-decoration: none; } -.hover-add:hover { font-weight:900; } +/* .hover-add:hover { font-weight:900; } */ /* why god why!? */ .hover-remove:hover { text-decoration:line-through;} /***************** diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php index ff4256fd..71a1afbc 100644 --- a/templates/show_album_row.inc.php +++ b/templates/show_album_row.inc.php @@ -23,13 +23,17 @@ <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add',_('Add'),'add_album_' . $album->id); ?> <?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')) { - $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); +<?php + if (Config::get('bandwidth') > BANDWIDTH_LOW) { + $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); + + // This should not be hard coded, but it will likely break all the themes. + //$image_size = Config::get('bandwidth') == BANDWIDTH_MEDIUM ? 75 : 128; + $image_size = 75; ?> <td class="cel_cover"> <a href="<?php echo Config::get('web_path'); ?>/albums.php?action=show&album=<?php echo $album->id; ?>"> - <img height="75" width="75" alt="<?php echo($name) ?>" title="<?php echo($name) ?>" src="<?php echo Config::get('web_path'); ?>/image.php?id=<?php echo $album->id; ?>&thumb=1" /> + <img height="<?php echo $image_size; ?>" width="<?php echo $image_size; ?>" alt="<?php echo($name) ?>" title="<?php echo($name) ?>" src="<?php echo Config::get('web_path'); ?>/image.php?id=<?php echo $album->id; ?>&thumb=<?php echo Config::get('bandwidth'); ?>" /> </a> </td> <?php } ?> @@ -37,14 +41,12 @@ <td class="cel_artist"><?php echo $album->f_artist_link; ?></td> <td class="cel_songs"><?php echo $album->song_count; ?></td> <td class="cel_year"><?php echo $album->year; ?></td> -<td class="cel_tags"><?php echo $album->f_tags; ?></td> +<td class="cel_tags"><?php echo (strlen($album->f_tags) > 20) ? substr($album->f_tags, 0, 20) . '&hellip' : $album->f_tags; ?></td> <td class="cel_rating" id="rating_<?php echo $album->id; ?>_album"><?php Rating::show($album->id,'album'); ?></td> <td class="cel_action"> - <?php if (Config::get('shoutbox')) { ?> - <a href="<?php echo Config::get('web_path'); ?>/shout.php?action=show_add_shout&type=album&id=<?php echo $album->id; ?>"> + <a href="<?php echo Config::get('web_path'); ?>/shout.php?action=show_add_shout&type=album&id=<?php echo $album->id; ?>"> <?php echo get_user_icon('comment',_('Post Shout')); ?> - </a> - <?php } ?> + </a> <?php if (Access::check_function('batch_download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=album&id=<?php echo $album->id; ?>"> <?php echo get_user_icon('batch_download',_('Batch Download')); ?> diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php index c394b4d9..82436c40 100644 --- a/templates/show_albums.inc.php +++ b/templates/show_albums.inc.php @@ -25,7 +25,7 @@ $ajax_url = Config::get('ajax_url'); <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_add" /> - <?php if (Browse::get_filter('show_art')) { ?> + <?php if (Config::get('bandwidth') > BANDWIDTH_LOW) { ?> <col id="col_cover" /> <?php } ?> <col id="col_album" /> @@ -38,7 +38,7 @@ $ajax_url = Config::get('ajax_url'); </colgroup> <tr class="th-top"> <th class="cel_add"><?php echo _('Add'); ?></th> - <?php if (Browse::get_filter('show_art')) { ?> + <?php if (Config::get('bandwidth') > BANDWIDTH_LOW) { ?> <th class="cel_cover"><?php echo _('Cover'); ?></th> <?php } ?> <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&type=album&sort=name',_('Album'),'album_sort_name'); ?></th> @@ -69,7 +69,7 @@ $ajax_url = Config::get('ajax_url'); <?php } ?> <tr class="th-bottom"> <th class="cel_add"><?php echo _('Add'); ?></th> - <?php if (Browse::get_filter('show_art')) { ?> + <?php if (Config::get('bandwidth') > BANDWIDTH_LOW) { ?> <th class="cel_cover"><?php echo _('Cover'); ?></th> <?php } ?> <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&type=album&sort=name',_('Album'),'album_sort_name_bottom'); ?></th> diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php index 4e63835d..24033e8b 100644 --- a/templates/show_artist.inc.php +++ b/templates/show_artist.inc.php @@ -60,10 +60,6 @@ if (Config::get('ratings')) { <a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo _('Download'); ?></a> </li> <?php } ?> -<li> - <input type="checkbox" id="show_artist_artCB" <?php echo $string = Browse::get_filter('show_art') ? 'checked="checked"' : ''; ?>/> <?php echo _('Show Art'); ?> - <?php echo Ajax::observe('show_artist_artCB','click',Ajax::action('?page=browse&action=browse&key=show_art&value=1&type=album','')); ?> -</ul> </div> <?php show_box_bottom(); ?> <?php diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php index f5b2558d..12c7aae8 100644 --- a/templates/show_index.inc.php +++ b/templates/show_index.inc.php @@ -28,32 +28,94 @@ </div><!-- End XSPF Player --> +<? -<div id="now_playing"> - <?php show_now_playing(); ?> -</div> <!-- Close Now Playing Div --> -<!-- Randomly selected albums of the moment --> - <?php echo Ajax::observe('window','load',Ajax::action('?page=index&action=random_albums','random_albums')); ?> -<div id="random_selection"> - <?php show_box_top(_('Albums of the Moment')); echo _('Loading...'); show_box_bottom(); ?> -</div> -<!-- Recently Played --> -<div id="recently_played"> - <?php - $data = Song::get_recently_played(); - Song::build_cache(array_keys($data)); - require_once Config::get('prefix') . '/templates/show_recently_played.inc.php'; - ?> -</div> -<!-- Shoutbox Objects, if shoutbox is enabled --> -<?php if (Config::get('shoutbox')) { ?> -<div id="shout_objects"> - <?php - $shouts = shoutBox::get_top('5'); - if (count($shouts)) { - require_once Config::get('prefix') . '/templates/show_shoutbox.inc.php'; - } - ?> -</div> -<?php } ?> +// Various settings for the 'bandwidth' option +$feature_sets = array + ( + BANDWIDTH_LOW => array('now', 'played'), + BANDWIDTH_MEDIUM => array('now', 'random', 'played'), + BANDWIDTH_HIGH => array('now', 'random', 'shout', 'played', 'added') + ); + +$feature_limits = array ( + BANDWIDTH_LOW => array + ( + 'shout' => 7, + 'played' => 7, + 'added' => 7 + ), + BANDWIDTH_MEDIUM => array + ( + 'shout' => 10, + 'played' => 10, + 'added' => 10 + ), + BANDWIDTH_HIGH => array + ( + 'shout' => 10, + 'played' => 20, + 'added' => 20 + ) + ); + +$features = $feature_sets[Config::get('bandwidth')]; + +foreach ($features as $feature) { + switch ($feature) { + case 'shout': + ?><div id="shout_objects"><? + + $shouts = shoutBox::get_top($feature_limits[Config::get('bandwidth')][$feature]); + + if (count($shouts)) require_once Config::get('prefix') . '/templates/show_shoutbox.inc.php'; + + ?></div><? + + break; + case 'played': + ?><div id="recently_played"><? + + $data = Song::get_recently_played('', $feature_limits[Config::get('bandwidth')][$feature]); + + Song::build_cache(array_keys($data)); + + require_once Config::get('prefix') . '/templates/show_recently_played.inc.php'; + + ?></div><? + + break; + case 'added': + show_box_top("Recently Added Albums"); + + $object_ids = Stats::get_newest('album', $feature_limits[Config::get('bandwidth')][$feature]); + + echo _('Newest Albums'); + + require_once Config::get('prefix') . '/templates/show_albums.inc.php'; + + show_box_bottom(); + + break; + case 'now': + ?><div id="now_playing"><? + + show_now_playing(); + + ?></div><? + + break; + case 'random': + echo Ajax::observe('window','load',Ajax::action('?page=index&action=random_albums','random_albums')); + + ?><div id="random_selection"><? + + show_box_top(_('Albums of the Moment')); echo _('Loading...'); show_box_bottom(); + + ?></div><? + + break; + } +} +?> diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php index bd1f95cc..66b3639d 100644 --- a/templates/show_now_playing_row.inc.php +++ b/templates/show_now_playing_row.inc.php @@ -23,6 +23,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. $title = scrub_out(truncate_with_ellipsis($media->title)); $album = scrub_out(truncate_with_ellipsis($media->f_album_full)); $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full)); + +// This should not be hard coded, but it will likely break all the themes. +//$image_size = Config::get('bandwidth') == BANDWIDTH_MEDIUM ? 75 : 128; +$image_size = 75; + ?> <div class="np_group"> <div class="np_cell cel_username"> @@ -72,11 +77,11 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full)); </div> </div> -<?php if (Config::get('show_album_art')) { ?> +<?php if (Config::get('bandwidth') > BANDWIDTH_LOW) { ?> <div class="np_group"> <div class="np_cell cel_albumart"> <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&type=popup&sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&type=popup&sid=<?php echo session_id(); ?>'); return false;"> - <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&thumb=1&sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($media->f_album_full); ?>" title="<?php echo scrub_out($media->f_album_full); ?>" height="75" width="75" /> + <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&thumb=<?php echo 1; /* This should be dynamic, but until themes are fixed to be more fluid in regards to images, make it static. */ /* Config::get('bandwidth'); */ ?>&sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($media->f_album_full); ?>" title="<?php echo scrub_out($media->f_album_full); ?>" height="<?php echo $image_size; ?>" width="<?php echo $image_size; ?>" /> </a> </div> </div> diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php index a262a4a1..2dee7f85 100644 --- a/templates/show_random_albums.inc.php +++ b/templates/show_random_albums.inc.php @@ -29,11 +29,15 @@ $button = Ajax::button('?page=index&action=random_albums','random',_('Refresh'), $album = new Album($album_id); $album->format(); $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); + + // This should not be hard coded, but it will likely break all the themes. + //$image_size = Config::get('bandwidth') == BANDWIDTH_MEDIUM ? 75 : 128; + $image_size = 75; ?> <div class="random_album"> <a href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $album_id; ?>"> - <?php if (Config::get('show_album_art')) { ?> - <img src="<?php echo $web_path; ?>/image.php?thumb=3&id=<?php echo $album_id; ?>" width="80" height="80" alt="<?php echo $name; ?>" title="<?php echo $name; ?>" /> + <?php if (Config::get('bandwidth') > BANDWIDTH_LOW) { ?> + <img src="<?php echo $web_path; ?>/image.php?thumb=3&id=<?php echo $album_id; ?>&thumb=<?php echo 1; /* This should be dynamic, but until themes are fixed to be more fluid in regards to images, make it static. */ /* Config::get('bandwidth'); */ ?>" width="<?php echo $image_size; ?>" height="<?php echo $image_size; ?>" alt="<?php echo $name; ?>" title="<?php echo $name; ?>" /> <?php } else { ?> <?php echo '[' . $album->f_artist . '] ' . $album->f_name; ?> <?php } ?> |