diff options
-rw-r--r-- | lib/class/album.class.php | 19 | ||||
-rw-r--r-- | templates/list_header.inc.php | 7 | ||||
-rw-r--r-- | templates/show_index.inc.php | 2 | ||||
-rw-r--r-- | templates/show_now_playing.inc.php | 6 | ||||
-rw-r--r-- | templates/show_now_playing_row.inc.php | 74 | ||||
-rw-r--r-- | templates/show_object_rating.inc.php | 63 | ||||
-rw-r--r-- | templates/show_object_rating_static.inc.php | 57 | ||||
-rw-r--r-- | templates/show_objects.inc.php | 4 | ||||
-rw-r--r-- | themes/classic/templates/default.css | 85 | ||||
-rw-r--r-- | themes/greysme/images/punaise-bl.gif | bin | 990 -> 552 bytes | |||
-rw-r--r-- | themes/greysme/images/punaise-br.gif | bin | 989 -> 556 bytes | |||
-rw-r--r-- | themes/greysme/images/punaise-tl.gif | bin | 989 -> 555 bytes | |||
-rw-r--r-- | themes/greysme/templates/default.css | 119 |
13 files changed, 212 insertions, 224 deletions
diff --git a/lib/class/album.class.php b/lib/class/album.class.php index c351b085..cd54eccd 100644 --- a/lib/class/album.class.php +++ b/lib/class/album.class.php @@ -209,9 +209,17 @@ class Album { foreach ($data as $key=>$value) { $this->$key = $value; } /* Truncate the string if it's to long */ - $this->f_name = truncate_with_ellipsis($this->name,Config::get('ellipsis_threshold_album')); - $this->f_name_link = "<a href=\"$web_path/albums.php?action=show&album=" . scrub_out($this->id) . "\" title=\"" . scrub_out($this->name) . "\">" . $this->f_name . "</a>"; - $this->f_link = $this->f_name_link; + $this->f_name = truncate_with_ellipsis($this->name,Config::get('ellipsis_threshold_album')); + + // + $this->f_name_link = "<a href=\"$web_path/albums.php?action=show&album=" . scrub_out($this->id) . "\" title=\"" . scrub_out($this->name) . "\">" . $this->f_name; + // If we've got a disk append it + if ($this->disk) { + $this->f_name_link .= " <span class=\"discnb disc" .$this->disk. "\">[" . _('Disk') . " " . $this->disk . "]</span>"; + } + $this->f_name_link .="</a>"; + + $this->f_link = $this->f_name_link; $this->f_title = $name; if ($this->artist_count == '1') { $artist = scrub_out(truncate_with_ellipsis(trim($this->artist_prefix . ' ' . $this->artist_name),Config::get('ellipsis_threshold_album'))); @@ -227,11 +235,6 @@ class Album { $this->year = "N/A"; } - // If we've got a disk append it - if ($this->disk) { - $this->f_name_link .= ' [' . _('Disk') . ' ' . $this->disk . ']'; - } - } // format /** diff --git a/templates/list_header.inc.php b/templates/list_header.inc.php index 9469cd85..c465a6b0 100644 --- a/templates/list_header.inc.php +++ b/templates/list_header.inc.php @@ -30,7 +30,8 @@ $limit = $GLOBALS['user']->prefs['offset_limit'] ? $GLOBALS['user']->prefs['offset_limit'] : '25'; $start = Browse::$start; $total = Browse::$total_objects; -$uid = Config::get('list_header_uid'); +$uid = Config::get('list_header_uid'); +$sides = 5; // ++ the uid Config::set('list_header_uid',$uid+1); @@ -63,7 +64,7 @@ $page = $current_page; $i = 0; /* While we have pages left */ while ($page > 0) { - if ($i == '10') { $page_data['down'][1] = '...'; $page_data['down'][0] = '0'; break; } + if ($i == $sides) { $page_data['down'][1] = '...'; $page_data['down'][0] = '0'; break; } $i++; $page = $page - 1; $page_data['down'][$page] = $page * $limit; @@ -75,7 +76,7 @@ $i = 0; /* While we have pages left */ while ($page <= $pages) { if ($page * $limit > $total) { break; } - if ($i == '10') { + if ($i == $sides) { $key = $pages - 1; if (!$page_data['up'][$key]) { $page_data['up'][$key] = '...'; } $page_data['up'][$pages] = ($pages-1) * $limit; diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php index 39a95c5b..4ff0055f 100644 --- a/templates/show_index.inc.php +++ b/templates/show_index.inc.php @@ -25,7 +25,7 @@ if (isset($_REQUEST['xspf']) && isset ($_REQUEST['play_info'])){ } ?> -<div id="np_data"> +<div id="now_playing"> <?php show_now_playing(); ?> </div> <!-- Close Now Playing Div --> <!-- Recently Played --> diff --git a/templates/show_now_playing.inc.php b/templates/show_now_playing.inc.php index 3e5b259f..267bb9c4 100644 --- a/templates/show_now_playing.inc.php +++ b/templates/show_now_playing.inc.php @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. if (count($results)) { ?> <?php show_box_top(_('Now Playing')); ?> -<table class="tabledata"> +<div class="np_row"> <?php foreach ($results as $item) { $song = $item['song']; @@ -41,12 +41,10 @@ foreach ($results as $item) { if (!is_object($song)) { continue; } if (!$np_user->fullname) { $np_user->fullname = "Ampache User"; } - echo '<tr class="np_row">'; require Config::get('prefix') . '/templates/show_now_playing_row.inc.php'; - echo '</tr>'; } // end foreach ?> -</table> +</div> <?php show_box_bottom(); ?> <?php } // end if count results ?> diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php index 6faabb99..4c80e462 100644 --- a/templates/show_now_playing_row.inc.php +++ b/templates/show_now_playing_row.inc.php @@ -24,31 +24,51 @@ $title = scrub_out(truncate_with_ellipsis($song->title,'25')); $album = scrub_out(truncate_with_ellipsis($song->f_album_full,'25')); $artist = scrub_out(truncate_with_ellipsis($song->f_artist_full,'25')); ?> -<td class="np_cell_left"><b><?php echo _('Username'); ?></b>:<br /> - <a title="<?php echo scrub_out($agent); ?>" href="<?php echo $web_path; ?>/stats.php?action=show_user&user_id=<?php echo $np_user->id; ?>"><?php echo scrub_out($np_user->fullname); ?></a><br /><br /> - <!-- ## modified ##--> - <strong><?php echo _('Song'); ?></strong><br /> - <a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&song_id=<?php echo $song->id; ?>"> - <?php echo $title; ?> - </a> - <div id="rating_<?php echo $song->id; ?>_song"> - <?php Rating::show($song->id,'song'); ?> - </div> -</td> -<td class="np_cell_m"> - <strong><?php echo _('Artist'); ?></strong><br /> - <a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $song->artist; ?>"> - <?php echo $artist; ?> - </a> - <br /><br /> - <strong><?php echo _('Album'); ?></strong><br /> - <a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $song->album; ?>"> - <?php echo $album; ?> - </a> -</td> - <?php if (Config::get('show_album_art')) { ?> -<td class="np_cell_right"> - <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&type=popup&sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&type=popup&sid=<?php echo session_id(); ?>'); return false;"> - <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&thumb=1&sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($song->f_album_full); ?>" title="<?php echo scrub_out($song->f_album_full); ?>" height="75" width="75" /></a> -</td> +<div class="np_group"> + <div class="np_cell cel_username"> + <label><?php echo _('Username'); ?></label> + <a title="<?php echo scrub_out($agent); ?>" href="<?php echo $web_path; ?>/stats.php?action=show_user&user_id=<?php echo $np_user->id; ?>"> + <?php echo scrub_out($np_user->fullname); ?> + </a> + </div> + + <div class="np_cell cel_rating"> + <label><?php echo _('Rating'); ?></label> + <div id="rating_<?php echo $song->id; ?>_song"> + <?php Rating::show($song->id,'song'); ?> + </div> + </div> +</div> + +<div class="np_group"> + <div class="np_cell cel_song"> + <label><?php echo _('Song'); ?></label> + <a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&song_id=<?php echo $song->id; ?>"> + <?php echo $title; ?> + </a> + </div> + + <div class="np_cell cel_album"> + <label><?php echo _('Album'); ?></label> + <a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $song->album; ?>"> + <?php echo $album; ?> + </a> + </div> + + <div class="np_cell cel_artist"> + <label><?php echo _('Artist'); ?></label> + <a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $song->artist; ?>"> + <?php echo $artist; ?> + </a> + </div> +</div> + +<?php if (Config::get('show_album_art')) { ?> +<div class="np_group"> + <div class="np_cell cel_albumart"> + <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&type=popup&sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&type=popup&sid=<?php echo session_id(); ?>'); return false;"> + <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&thumb=1&sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($song->f_album_full); ?>" title="<?php echo scrub_out($song->f_album_full); ?>" height="75" width="75" /> + </a> + </div> +</div> <?php } // end play album art ?> diff --git a/templates/show_object_rating.inc.php b/templates/show_object_rating.inc.php index ad512c0d..ea3a22ba 100644 --- a/templates/show_object_rating.inc.php +++ b/templates/show_object_rating.inc.php @@ -21,42 +21,31 @@ /* Create some variables we are going to need */ $web_path = Config::get('web_path'); $base_url = '?action=set_rating&rating_type=' . $rating->type . '&object_id=' . $rating->id; - -echo "<div class=\"star-rating dynamic-star-rating\">\n"; -echo "<ul>\n"; - -// decide width of rating (5 stars -> 20% per star) -$width = $rating->rating*20; -if ($width < 0) $width = 0; - -//set the current rating background -echo "<li class=\"current-rating\" style=\"width:${width}%\" >Current rating: "; -if ($rating->rating <= 0) { - echo "not rated yet </li>\n"; -} -else echo "$rating->rating of 5</li>\n"; - -//it did not like my "1-star", "2-star" ... css styles, and I changed it to this after I realized star1... would have worked :\ ?> -<li> - <?php echo Ajax::text($base_url . '&rating=1','','rating1_' . $rating->id,'','one-stars'); ?> -</li> -<li> - <?php echo Ajax::text($base_url . '&rating=2','','rating2_' . $rating->id,'','two-stars'); ?> -</li> -<li> - <?php echo Ajax::text($base_url . '&rating=3','','rating3_' . $rating->id,'','three-stars'); ?> -</li> -<li> - <?php echo Ajax::text($base_url . '&rating=4','','rating4_' . $rating->id,'','four-stars'); ?> -</li> -<li> - <?php echo Ajax::text($base_url . '&rating=5','','rating5_' . $rating->id,'','five-stars'); ?> -</li> -</ul> -<?php - // Add in the 0 / Remove rating level - echo "<div class=\"zero-stars\">" . Ajax::text($base_url . '&rating=-1','','rating0_' . $rating->id,'','zero-stars') . "</div>\n"; - echo "</div>\n"; -?> +<div class="star-rating dynamic-star-rating"> + <ul> + <?php + // decide width of rating (5 stars -> 20% per star) + $width = $rating->rating*20; + if ($width < 0) $width = 0; + + //set the current rating background + echo "<li class=\"current-rating\" style=\"width:${width}%\" >Current rating: "; + if ($rating->rating <= 0) { + echo "not rated yet </li>\n"; + } + else echo "$rating->rating of 5</li>\n"; + + for ($i=1; $i<6; $i++) + { + ?> + <li> + <?php echo Ajax::text($base_url . '&rating='.$i,'','rating'.$i.'_' . $rating->id,'','star'.$i); ?> + </li> + <?php + } + ?> + </ul> + <?php echo Ajax::text($base_url . '&rating=-1','','rating0_' . $rating->id,'','star0'); ?> +</div> diff --git a/templates/show_object_rating_static.inc.php b/templates/show_object_rating_static.inc.php index 763c115a..5fcd4f18 100644 --- a/templates/show_object_rating_static.inc.php +++ b/templates/show_object_rating_static.inc.php @@ -21,37 +21,30 @@ /* Create some variables we are going to need */ $web_path = Config::get('web_path'); $base_url = Config::get('ajax_url') . '?action=set_rating&rating_type=' . $rating->type . '&object_id=' . $rating->id; - -echo "<div class=\"star-rating\">\n"; -echo "<ul>\n"; - -// decide width of rating (5 stars -> 20% per star) -$width = $rating->rating*20; -if ($width < 0) $width = 0; - -//set the current rating background -echo "<li class=\"current-rating\" style=\"width:${width}%\" >Current rating: "; -if ($rating->rating <= 0) { - echo "not rated yet </li>\n"; -} -else echo "$rating->rating of 5</li>\n"; - -//it did not like my "1-star", "2-star" ... css styles, and I changed it to this after I realized star1... would have worked :\ ?> -<li> - <span class="one-stars" title="1 <?php echo _('out of'); ?> 5">1</span> -</li> -<li> - <span class="two-stars" title="2 <?php echo _('out of'); ?> 5">2</span> -</li> -<li> - <span class="three-stars" title="3 <?php echo _('out of'); ?> 5">3</span> -</li> -<li> - <span class="four-stars" title="4 <?php echo _('out of'); ?> 5">4</span> -</li> -<li> - <span class="five-stars" title="5 <?php echo _('out of'); ?> 5">5</span> -</li> -</ul> + +<div class="star-rating"> + <ul> + <?php + // decide width of rating (5 stars -> 20% per star) + $width = $rating->rating*20; + if ($width < 0) $width = 0; + + //set the current rating background + echo "<li class=\"current-rating\" style=\"width:${width}%\" >Current rating: "; + if ($rating->rating <= 0) { + echo "not rated yet </li>\n"; + } + else echo "$rating->rating of 5</li>\n"; + + for ($i=1; $i<6; $i++) + { + ?> + <li> + <span class="star<?php echo $i; ?>" title="<?php echo $i.' '._('out of'); ?> 5"><?php echo $i; ?></span> + </li> + <?php + } + ?> + </ul> </div> diff --git a/templates/show_objects.inc.php b/templates/show_objects.inc.php index 72e79f89..4ebaa1f2 100644 --- a/templates/show_objects.inc.php +++ b/templates/show_objects.inc.php @@ -23,10 +23,10 @@ * Variable/Non-DB object display takes headers & objects */ ?> -<table class="table-data" cellspacing="0"> +<table class="tabledata" cellspacing="0"> <tr> <?php foreach ($headers as $header) { ?> - <th><?php echo scrub_out($header); ?></th> + <th class="th-top"><?php echo scrub_out($header); ?></th> <?php } ?> </tr> <?php diff --git a/themes/classic/templates/default.css b/themes/classic/templates/default.css index e03ec453..dbfe4287 100644 --- a/themes/classic/templates/default.css +++ b/themes/classic/templates/default.css @@ -338,9 +338,10 @@ a.button{padding:1px} /************************************************/
.star-rating {
position:relative;
- display:inline;
}
-
+.dynamic-star-rating{
+ width:95px;
+}
.star-rating ul,
.star-rating a:hover,
.star-rating .current-rating{
@@ -371,14 +372,14 @@ a.button{padding:1px} overflow:hidden;
border:none;
}
-.star-rating .one-stars { width:20%; z-index:6; }
-.star-rating .two-stars { width:40%; z-index:5; }
-.star-rating .three-stars { width:60%; z-index:4; }
-.star-rating .four-stars { width:80%; z-index:3; }
-.star-rating .five-stars { width:100%; z-index:2; }
+.star-rating .star1 { width:20%; z-index:6; }
+.star-rating .star2 { width:40%; z-index:5; }
+.star-rating .star3 { width:60%; z-index:4; }
+.star-rating .star4 { width:80%; z-index:3; }
+.star-rating .star5 { width:100%; z-index:2;}
.star-rating .current-rating { z-index:1; background-position: left bottom; }
-.star-rating a.zero-stars {
+.star-rating a.star0 {
left:80px;
width:16px;
background: url(../../../images/ratings/x_off.gif) left top;
@@ -388,7 +389,7 @@ a.button{padding:1px} .dynamic-star-rating a:hover{
background-position: left center;
}
-.dynamic-star-rating a:hover.zero-stars {
+.dynamic-star-rating a:hover.star0 {
background: url(../../../images/ratings/x.gif) left top;
}
@@ -496,24 +497,10 @@ a.button{padding:1px} #content {
margin: 20px 135px 20px 135px;
}
-h3#content_title{
- font: 12px/32px Arial,Helvetica,Sans-Serif;
- background:#8b8b8b url(../images/content_corner.gif) no-repeat right top;
- color:#fff;
-}
-h3#content_title span {
- text-align:left;
-}
-
-
-
-
-
/************************************************/
/* Albums of the moment */
/************************************************/
-
.random_album
{
position:relative;
@@ -528,45 +515,41 @@ h3#content_title span { }
/************************************************/
-/* Now Playing Styles */
+/* Now Playing */
/************************************************/
-#nowplaying{
- clear: both;
- width: 600px;
+#now_playing{
}
-#np_container1{
- width: 260px;
- height: 18px;
- background: #fff url(../images/tb_tab.jpg) no-repeat top left;
+.np_row {
+ padding: 3px;
+ float:left;
+ clear:both;
+ font-size:0.75em;
}
-
-#np_container1 h1{
- font-size: 10px;
- font-weight: bold;
- padding: 2px;
+.np_cell {
+ padding-left:5px;
+ margin-left:5px;
}
-#np_container2{
- border: 1px solid #999;
- border-color:#ddd #999 #999 #ccc;
- padding: 6px;
- font: 10px/12px Verdana, sans-serif;
- background: #d6d6d4 url(../images/bg_row.jpg) repeat top left;
- color: #000;
-}
-.np_row {
- padding: 3px 0;
+.np_row label {
+ display:block;
+ font-weight:bold;
+ margin:2px 0 0 -5px;
}
-.np_cell, .np_cell_left, .np_cell_m, .np_cell_right {
- margin: 10px;
+
+.np_group {
+ float:left;
+ padding-right:15px;
}
+.np_row a {
+ font-size:0.8em;
+}
/************************************************/
-/* List Header Styles */
+/* List Header */
/************************************************/
-.list-header{margin:7px 0; text-align:center; font-size: 0.8em;position:relative;}
+.list-header{margin:7px 0; padding:0 4em; 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;}
@@ -574,7 +557,7 @@ h3#content_title span { .list-header .page-nb:hover{background: #d0d0d0;}
/************************************************/
-/* Text Action Styles */
+/* Text Action */
/************************************************/
.text-action, .text-action li {
list-style: none;
diff --git a/themes/greysme/images/punaise-bl.gif b/themes/greysme/images/punaise-bl.gif Binary files differindex 73b6255f..dd6b5804 100644 --- a/themes/greysme/images/punaise-bl.gif +++ b/themes/greysme/images/punaise-bl.gif diff --git a/themes/greysme/images/punaise-br.gif b/themes/greysme/images/punaise-br.gif Binary files differindex 68bf9895..97b47e50 100644 --- a/themes/greysme/images/punaise-br.gif +++ b/themes/greysme/images/punaise-br.gif diff --git a/themes/greysme/images/punaise-tl.gif b/themes/greysme/images/punaise-tl.gif Binary files differindex 5c6c9cf5..58e19e9c 100644 --- a/themes/greysme/images/punaise-tl.gif +++ b/themes/greysme/images/punaise-tl.gif diff --git a/themes/greysme/templates/default.css b/themes/greysme/templates/default.css index 32dcc736..5c3ff090 100644 --- a/themes/greysme/templates/default.css +++ b/themes/greysme/templates/default.css @@ -101,12 +101,14 @@ body { behavior:url("templates/csshover2.htc"); } /* Header */
/************************************************/
#header { padding: 0 0; }
-#headerbox { font-size: 0.9em; text-align: right; color: #e9ad51; position: absolute; top: 0; right: 0; padding: 3px; }
+#headerbox { font-size: 0.9em; text-align: right; color: #e9ad51; position: absolute; top: 20px; right: 0; padding: 3px; }
#headerbox b { font-weight: normal }
#headerbox a { color: #e9ad51;}
#headerlogo { text-align: center; background: url(../images/ampache_back.gif) 0 0 repeat-x;}
#headerlogo a { }
-.box_topbarright {display:table;}
+#headerbox .box_headerbox {background:transparent;border:none;}
+#headerbox .box-top{display:none;}
+#headerbox .box-bottom{display:none;}
#play_type_switch {
float:left;
@@ -120,7 +122,10 @@ body { behavior:url("templates/csshover2.htc"); } clear:both;
text-align:center;
font-size:.8em;
- padding:3px;
+ padding:3px 0;
+ background:#2c2b39;
+ border-top:5px solid #21212a;
+ margin-top:20px;
}
/************************************************/
@@ -348,7 +353,9 @@ input[type=checkbox] {border:0;background:none;} /************************************************/
.star-rating {
position:relative;
- display:inline;
+}
+.dynamic-star-rating{
+ width:96px;
}
.star-rating ul,
@@ -365,6 +372,7 @@ input[type=checkbox] {border:0;background:none;} margin:0;
padding:0;
background-position: left top;
+ /*float:left;*/
}
.star-rating li{
display: inline;
@@ -381,25 +389,26 @@ input[type=checkbox] {border:0;background:none;} overflow:hidden;
border: none;
}
-.star-rating .one-stars { width:20%; z-index:6; }
-.star-rating .two-stars { width:40%; z-index:5; }
-.star-rating .three-stars { width:60%; z-index:4; }
-.star-rating .four-stars { width:80%; z-index:3; }
-.star-rating .five-stars { width:100%; z-index:2; }
+.star-rating .star1 { width:20%; z-index:6; }
+.star-rating .star2 { width:40%; z-index:5; }
+.star-rating .star3 { width:60%; z-index:4; }
+.star-rating .star4 { width:80%; z-index:3; }
+.star-rating .star5 { width:100%; z-index:2;}
.star-rating .current-rating { z-index:1; background-position: left bottom; }
-.star-rating a.zero-stars {
+.star-rating-reset {height:16px;}
+.star-rating a.star0 {
left:80px;
+ height:16px;
width:16px;
background: url(../images/ratings/x_off.gif) left top;
}
-
/* hovering effect only for dynamic star rating */
#content .dynamic-star-rating a:hover{
background-position: left center;
background-color:transparent;
}
-.dynamic-star-rating a:hover.zero-stars {
+.dynamic-star-rating a:hover.star0 {
background: url(../images/ratings/x.gif) left top;
}
@@ -426,23 +435,24 @@ input[type=checkbox] {border:0;background:none;} /* Enclosing Boxes Styles */
.box, .info-box {
- margin-top: 5px;
- margin-right: 3px;
+ margin-top: 7px;
+ margin-right: 5px;
background: #050505 url(../images/back-box.gif) 0 0 no-repeat;
font-size : 0.9em;
border: 1px solid #8b3e38;
+ border-width: 1px 1px 0 0;
float:left;
clear:left;
height:1%; /* IE6 : Holly Hack comes to rescue once again */
}
/* Hovering effects on links */
-.box a:hover, .info-box a:hover { background-color: #8b3e38; color: #e9ad51;}
+.box a:hover, .info-box a:hover { /*background-color: #8b3e38;*/ color: #e9ad51;}
.box-inside {
background: url(../images/right.gif) top right repeat-y;
}
.box-content {
- padding:8px 15px;
+ padding:8px 12px;
}
.box-top {
@@ -452,7 +462,7 @@ input[type=checkbox] {border:0;background:none;} background: url(../images/punaise-tl.gif) no-repeat;
height:16px;
width:16px;
- position:relative;left:0;top:0;
+ position:relative;left:-4px;top:-4px;
}
.box-right-top {
background: url(../images/curl.gif) no-repeat;
@@ -468,13 +478,13 @@ input[type=checkbox] {border:0;background:none;} background: url(../images/punaise-bl.gif) no-repeat;
height:18px;
width:16px;
- position:relative;left:0;top:0;
+ position:relative;left:-6px;top:5px;
}
.box-right-bottom {
background: url(../images/punaise-br.gif) no-repeat;
height:18px;
width:20px;
- position:absolute;right:0;top:0;
+ position:absolute;right:-6px;top:5px;
}
* html .box-right-bottom {right: expression(-this.parentNode.offsetWidth%2+"px");} /* Fixes an IE6 rounding error */
@@ -512,12 +522,18 @@ input[type=checkbox] {border:0;background:none;} background-image:url(../images/sort_on.gif);
}
+.tabledata td a{display:block;}
+.tabledata td.cel_add a, .tabledata td.cel_action a{display:inline;}
+
.odd, .even { background: url(../images/list_back.png) 0 50% repeat-x !important; background-image: none;}
.odd { background-color: #111 !important;}
.even { }
.odd:hover, .even:hover { background-color: #2b293d !important;}
-.odd td a img:hover, .even td a img:hover {opacity:0.5;}
+.odd td a img, .even td a img {opacity:0.7;}
+.odd td a img:hover, .even td a img:hover {opacity:1;}
+
+.discnb { font-style: italic; font-size:0.8em; }
.border { background: #000; }
@@ -533,22 +549,14 @@ td.cel_track {text-align:right;} /************************************************/
/* Content block */
/************************************************/
-
-#content {margin:10px 14em 10px 13.5em;}
-
-/* Center things on supporting browsers */
-#content>table,#content>table .box { margin-left: auto; margin-right: auto; }
-
-h3#content_title{} /* Doesn't exist anymore (?) */
-h3#content_title span {} /* Doesn't exist anymore (?) */
-
-
+#content {
+ margin:10px 14em 10px 13.5em;
+}
/************************************************/
/* Albums of the moment */
/************************************************/
-
.random_album
{
position:relative;
@@ -562,55 +570,48 @@ h3#content_title span {} /* Doesn't exist anymore (?) */ top:10px;
right:0;
}
+
/************************************************/
-/* Styles for Now Playing */
+/* Now Playing */
/************************************************/
-
-#nowplaying{
- clear: both;
-}
-#np_container1{
- height: 18px;
-}
-#np_container1 h1{
- font-weight: bold;
- padding: 2px;
-}
-#np_container2{
- border-width: 1px;
- border-style: solid;
- border-color:#ddd #999 #999 #ccc;
- padding: 6px;
- color: #000;
+#now_playing{
}
.np_row {
- padding-top: 3px;
- padding-bottom: 3px;
- display: block;
+ padding: 3px;
+ float:left;
+ clear:both;
}
.np_cell {
- margin: 10px;
+ padding-left:5px;
+ margin-left:5px;
}
+.np_row label {
+ display:block;
+ font-weight:bold;
+ margin-left:-5px;
+}
-
-
+.np_group {
+ float:left;
+ padding-left:10px;
+}
/************************************************/
-/* List Header Styles */
+/* List Header */
/************************************************/
-.list-header{margin:7px 0; text-align:center; font-size: 0.9em;position:relative;}
+.list-header{margin:7px 0; padding:0 4em; 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 .selected{background:#e9ad51;color:#111;}
.list-header .page-nb{padding:1px;border: 1px solid #111;}
.list-header a:hover{background: transparent; border-color:#e9ad51;}
/************************************************/
-/* Text Action Styles */
+/* Text Action */
/************************************************/
.text-action {
|