diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php index 89341ec2..fbcc2948 100644 --- a/lib/class/browse.class.php +++ b/lib/class/browse.class.php @@ -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; diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php index 807175c7..7d5ffde0 100644 --- a/templates/show_album_row.inc.php +++ b/templates/show_album_row.inc.php @@ -24,10 +24,11 @@ id,'random',_('Random'),'random_album_' . $album->id); ?> - + - + f_name_link; ?> f_artist_link; ?> diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php index d63353e3..fe2af1be 100644 --- a/templates/show_albums.inc.php +++ b/templates/show_albums.inc.php @@ -21,13 +21,18 @@ $web_path = Config::get('web_path'); $ajax_url = Config::get('ajax_url'); ?> + - - - - ++ + + + + + + + + @@ -48,9 +53,16 @@ $ajax_url = Config::get('ajax_url'); - - + + + + + + + + + +
- -
- -
+ diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php index f394337e..ab5ac563 100644 --- a/templates/show_artist_row.inc.php +++ b/templates/show_artist_row.inc.php @@ -26,7 +26,7 @@ f_name_link; ?> songs; ?> albums; ?> - + diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php index 224d3ce0..f67f02cd 100644 --- a/templates/show_artists.inc.php +++ b/templates/show_artists.inc.php @@ -21,13 +21,16 @@ $web_path = Config::get('web_path'); ?> + - - - - ++ + + + + + + @@ -44,17 +47,12 @@ foreach ($object_ids as $artist_id) { - + - - - - - - - - + + + +
- -
- -
+ diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php index fe6e3e7d..7a0a48cd 100644 --- a/templates/show_catalogs.inc.php +++ b/templates/show_catalogs.inc.php @@ -19,13 +19,16 @@ */ ?> + - - - - ++ + + + + + + @@ -41,9 +44,12 @@ - - + + + + + +
- -
- -
+ diff --git a/templates/show_genres.inc.php b/templates/show_genres.inc.php index 3008ed4c..f0570100 100644 --- a/templates/show_genres.inc.php +++ b/templates/show_genres.inc.php @@ -24,13 +24,15 @@ * Takes an array of genre objects and displays them out */ ?> + - - - - ++ + + + + + @@ -61,9 +63,11 @@ foreach ($object_ids as $genre_id) { - - + + + + +
- -
- -
+ diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php index 037d91c1..beb44f10 100644 --- a/templates/show_live_streams.inc.php +++ b/templates/show_live_streams.inc.php @@ -21,13 +21,17 @@ $web_path = Config::get('web_path'); ?> + - - - - ++ + + + + + + + @@ -44,9 +48,13 @@ foreach ($object_ids as $radio_id) { - - + + + + + + +
- -
- -
+ diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php index 000c5f28..c2da7945 100644 --- a/templates/show_playlists.inc.php +++ b/templates/show_playlists.inc.php @@ -20,14 +20,17 @@ */ ?> - - - - - - + +
- -
 
++ + + + + + + + @@ -43,9 +46,12 @@ foreach ($object_ids as $playlist_id) { - - + + + + + +
- -
+ diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php index a104f1f2..293b0b55 100644 --- a/templates/show_songs.inc.php +++ b/templates/show_songs.inc.php @@ -23,13 +23,19 @@ $web_path = Config::get('web_path'); $ajax_url = Config::get('ajax_url'); ?> + - - - - ++ + + + + + + + + + - - + + + + + + + + +
- -
@@ -50,9 +56,17 @@ $ajax_url = Config::get('ajax_url');
- -
+ +
+ diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php index 8b44a75f..a9e5fbd4 100644 --- a/templates/show_users.inc.php +++ b/templates/show_users.inc.php @@ -22,37 +22,27 @@ $web_path = Config::get('web_path'); ?> + - - - - - - - - ++ + + + + + + + + + + + + - + - - + + + + + + + + + + + + +
- -
- - () - - - - - - -
() - - - - - -
()
diff --git a/themes/classic/templates/default.css b/themes/classic/templates/default.css index d979f36f..43eb479f 100644 --- a/themes/classic/templates/default.css +++ b/themes/classic/templates/default.css @@ -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 */ diff --git a/themes/greysme/templates/default.css b/themes/greysme/templates/default.css index 19ff832e..591c68ae 100644 --- a/themes/greysme/templates/default.css +++ b/themes/greysme/templates/default.css @@ -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 */