diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.css | 6 | ||||
| -rw-r--r-- | templates/show_album_row.inc.php | 12 | ||||
| -rw-r--r-- | templates/show_albums.inc.php | 8 | ||||
| -rw-r--r-- | templates/show_artist.inc.php | 4 | ||||
| -rw-r--r-- | templates/show_now_playing_row.inc.php | 11 | ||||
| -rw-r--r-- | templates/show_random_albums.inc.php | 8 |
6 files changed, 20 insertions, 29 deletions
diff --git a/templates/base.css b/templates/base.css index ca508c35..834e2c39 100644 --- a/templates/base.css +++ b/templates/base.css @@ -25,7 +25,6 @@ * Tag Definitions *****************/ -/* why god why!? .tag_size1 { font-size:.6em; } @@ -38,12 +37,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; } */ /* why god why!? */ -.hover-remove:hover { text-decoration:line-through;} +.hover-add:hover { color: #347C17; } +.hover-remove:hover { color: #FF0000; } /***************** * Generic / Misc diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php index 0ec8f058..42984465 100644 --- a/templates/show_album_row.inc.php +++ b/templates/show_album_row.inc.php @@ -24,16 +24,12 @@ <?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random',_('Random'),'random_album_' . $album->id); ?> </td> <?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; +if (Browse::is_enabled('show_art')) { + $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); ?> <td class="cel_cover"> <a href="<?php echo Config::get('web_path'); ?>/albums.php?action=show&album=<?php echo $album->id; ?>"> - <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'); ?>" /> + <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" /> </a> </td> <?php } ?> @@ -44,9 +40,11 @@ <td class="cel_tags"><?php echo $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('sociable')) { <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 } ?> <?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 82436c40..68a6a4ca 100644 --- a/templates/show_albums.inc.php +++ b/templates/show_albums.inc.php @@ -25,9 +25,9 @@ $ajax_url = Config::get('ajax_url'); <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_add" /> - <?php if (Config::get('bandwidth') > BANDWIDTH_LOW) { ?> +<?php if (Browse::is_enabled('show_art') { ?> <col id="col_cover" /> - <?php } ?> +<?php } ?> <col id="col_album" /> <col id="col_artist" /> <col id="col_songs" /> @@ -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 (Config::get('bandwidth') > BANDWIDTH_LOW) { ?> + <?php if (Browse::is_enabled('show_art') { ?> <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 (Config::get('bandwidth') > BANDWIDTH_LOW) { ?> + <?php if (Browse::is_enabled('show_art') { ?> <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 24033e8b..4e63835d 100644 --- a/templates/show_artist.inc.php +++ b/templates/show_artist.inc.php @@ -60,6 +60,10 @@ 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_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php index 66b3639d..bbc67541 100644 --- a/templates/show_now_playing_row.inc.php +++ b/templates/show_now_playing_row.inc.php @@ -23,11 +23,6 @@ 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"> @@ -77,11 +72,11 @@ $image_size = 75; </div> </div> -<?php if (Config::get('bandwidth') > BANDWIDTH_LOW) { ?> +<?php if (Browse::is_enabled('show_art')) { ?> <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=<?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 target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&type=popup" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $media->album; ?>&type=popup'); 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" /> </a> </div> </div> diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php index 2dee7f85..167e50b6 100644 --- a/templates/show_random_albums.inc.php +++ b/templates/show_random_albums.inc.php @@ -29,15 +29,11 @@ $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('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 if (Browse::is_enabled('show_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 } else { ?> <?php echo '[' . $album->f_artist . '] ' . $album->f_name; ?> <?php } ?> |