added disc number information on album page

2 files changed, 58 insertions, 54 deletions

diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php
index adc175a5..96539167 100644
--- a/templates/show_album.inc.php
+++ b/templates/show_album.inc.php
@@ -23,7 +23,11 @@ $web_path = Config::get('web_path');
 $ajax_url = Config::get('ajax_url'); 
 
 // Title for this album
-$title		= scrub_out($album->name) . ' (' . $album->year . ') -- ' . $album->f_artist_link;
+if ($album->disk)
+{
+  $disk = "<span class=\"discnb disc" .$album->disk. "\">, " . _('Disk') . " " . $album->disk . "</span>";
+}
+$title		= scrub_out($album->name) . '&nbsp;(' . $album->year . ')' . $disk .'&nbsp;-&nbsp;' . $album->f_artist_link;
 ?>
 <?php show_box_top($title,'info-box'); ?>
 	<div class="album_art">
diff --git a/themes/greysme/theme.cfg.php b/themes/greysme/theme.cfg.php
index e840dace..69fb1078 100644
--- a/themes/greysme/theme.cfg.php
+++ b/themes/greysme/theme.cfg.php
@@ -1,53 +1,53 @@
-;;;;;;;;;;;;;;;;;;
-;<?php exit(); ?>;
-;;;;;;;;;;;;;;;;;;
-; Copyright (c) 2001 - 2007 Ampache.org
-; All rights reserved.
-;
-; This program is free software; you can redistribute it and/or
-; modify it under the terms of the GNU General Public License v2
-; as published by the Free Software Foundation.
-;
-; This program is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.
-;
-; You should have received a copy of the GNU General Public License
-; along with this program; if not, write to the Free Software
-; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Alternate Ampache Theme 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; Theme Name
-; This is the actual name of the theme that
-; will be displayed in the preferences screen
-; DEFAULT: ampache-theme
-name = "Greysme"
-
-; Theme Author
-; This is just a way of giving credit to the 
-; person who actually created this theme
-; DEFAULT: N/A
-author = "Spocky"
-
-; Theme Maintainer
-; This is just a way of listing who is responsible for
-; maintaining this theme incase it's not working right
-; please include an e-mail address so you can be contacted
-; DEFAULT: N/A
-maintainer = "Spocky"
-
-; Orientation
-; This was added as of 3.3.2-Alpha4, this tells Ampache if this theme
-; uses vertical or horizontal orientation of the menu, if this is a horizontal
-; theme then it will not show the quick search and quick random play forms
-orientation = "vertical"
-
-; Submenu
-; If this is set to simple the sub menu's will only be shown when you're on one of the
-; respective pages. If you want to make the menu's something like the classic theme
-; comment this out
-;submenu = "simple"
+;;;;;;;;;;;;;;;;;;

+;<?php exit(); ?>;

+;;;;;;;;;;;;;;;;;;

+; Copyright (c) 2001 - 2007 Ampache.org

+; All rights reserved.

+;

+; This program is free software; you can redistribute it and/or

+; modify it under the terms of the GNU General Public License v2

+; as published by the Free Software Foundation.

+;

+; This program is distributed in the hope that it will be useful,

+; but WITHOUT ANY WARRANTY; without even the implied warranty of

+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+; GNU General Public License for more details.

+;

+; You should have received a copy of the GNU General Public License

+; along with this program; if not, write to the Free Software

+; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Alternate Ampache Theme 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;

+

+; Theme Name

+; This is the actual name of the theme that

+; will be displayed in the preferences screen

+; DEFAULT: ampache-theme

+name = "Greysme"

+

+; Theme Author

+; This is just a way of giving credit to the 

+; person who actually created this theme

+; DEFAULT: N/A

+author = "Mickael Despesse (Spocky)"

+

+; Theme Maintainer

+; This is just a way of listing who is responsible for

+; maintaining this theme incase it's not working right

+; please include an e-mail address so you can be contacted

+; DEFAULT: N/A

+maintainer = "Spocky"

+

+; Orientation

+; This was added as of 3.3.2-Alpha4, this tells Ampache if this theme

+; uses vertical or horizontal orientation of the menu, if this is a horizontal

+; theme then it will not show the quick search and quick random play forms

+orientation = "vertical"

+

+; Submenu

+; If this is set to simple the sub menu's will only be shown when you're on one of the

+; respective pages. If you want to make the menu's something like the classic theme

+; comment this out

+;submenu = "simple"