? HTML/Fields
? HTML/Default/html/images/h_BROWSE_BY_COVER.gif
? HTML/Default/html/images/slimdevices_logo.gif
? HTML/Default/html/images/slimp3_logo.gif
? HTML/Default/html/images/spacer.gif
? HTML/Default/html/images/squeezebox_logo.gif
? HTML/EN/html/softsqueeze
? HTML/EN/html/softsqueeze.jnlp
? HTML/EN/html/images/softsqueeze.png
? HTML/Fishbone/status_noclients-softsqueeze.html
? HTML/Fishbone/html/b_up.gif
? HTML/Handheld/slimserver.css
Index: Slim/Web/Pages.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Web/Pages.pm,v
retrieving revision 1.82
diff -u -p -B -r1.82 Pages.pm
--- Slim/Web/Pages.pm 20 May 2004 05:46:09 -0000 1.82
+++ Slim/Web/Pages.pm 21 May 2004 09:17:33 -0000
@@ -26,6 +26,9 @@ sub home {
$params->{'nosetup'} = 1 if $::nosetup;
$params->{'newVersion'} = $::newVersion if $::newVersion;
+ addLinks("browse",{string('BROWSE_BY_ARTIST') => "browseid3.html?genre=*&player=[% player | uri %]"});
+ addLinks("browse",{string('BROWSE_BY_GENRE') => "browseid3.html?player=[% player | uri %]"});
+ addLinks("browse",{string('BROWSE_BY_ALBUM') => "browseid3.html?genre=*&artist=*&player=[% player | uri %]"});
if (Slim::Utils::Prefs::get('lookForArtwork')) {
addLinks("browse",{string('BROWSE_BY_ARTWORK') => "browseid3.html?genre=*&artist=*&artwork=1"});
@@ -47,6 +50,16 @@ sub home {
addLinks("browse",{string('SAVED_PLAYLISTS') => undef});
}
+addLinks("help",{string('GETTING_STARTED') => "html/docs/quickstart.html"});
+addLinks("help",{string('PLAYER_SETUP') => "html/docs/ipconfig.html"});
+addLinks("help",{string('USING_REMOTE') => "html/docs/interface.html"});
+addLinks("help",{string('HELP_REMOTE') => "html/help_remote.html?player=[% player | uri %]"});
+addLinks("help",{string('RADIO') => "html/docs/radio.html?player=[% player | uri %]"});
+addLinks("help",{string('REMOTE_STREAMING') => "html/docs/remotestream.html?player=[% player | uri %]"});
+addLinks("help",{string('FAQ') => "html/docs/faq.html?player=[% player | uri %]"});
+addLinks("help",{string('TECHNICAL_INFORMATION') => "html/docs/index.html"});
+
+
# fill out the client setup choices
foreach my $player (sort { $a->name() cmp $b->name() } Slim::Player::Client::clients()) {
Index: HTML/Default/home.html
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/HTML/Default/home.html,v
retrieving revision 1.16
diff -u -p -B -r1.16 home.html
--- HTML/Default/home.html 13 May 2004 17:57:32 -0000 1.16
+++ HTML/Default/home.html 21 May 2004 09:17:33 -0000
@@ -57,9 +57,6 @@
 |
- | • [% "BROWSE_BY_GENRE" | string %] |
- | • [% "BROWSE_BY_ARTIST" | string %] |
- | • [% "BROWSE_BY_ALBUM" | string %] |
[% IF additionalLinks.browse %]
[% FOREACH link = additionalLinks.browse %]
| • [% link.key %] |
@@ -225,17 +222,9 @@
|
Index: HTML/EN/home.html
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/HTML/EN/home.html,v
retrieving revision 1.8
diff -u -p -B -r1.8 home.html
--- HTML/EN/home.html 14 May 2004 23:07:47 -0000 1.8
+++ HTML/EN/home.html 21 May 2004 09:17:34 -0000
@@ -12,19 +12,10 @@
[% "BROWSE_MUSIC" | string %]
- -
- [% "BROWSE_BY_GENRE" | string %]
-
- -
- [% "BROWSE_BY_ARTIST" | string %]
-
- -
- [% "BROWSE_BY_ALBUM" | string %]
-
[% IF additionalLinks.browse %]
- [% FOREACH key = additionalLinks.browse.keys %]
+ [% FOREACH link = additionalLinks.browse %]
-
- [% key %]
+ [% link.key %]
[% END %]
[% END %]
@@ -73,28 +64,10 @@
[% END %]
[% "HELP" | string %]
- -
- [% "GETTING_STARTED" | string %]
-
- -
- [% "PLAYER_SETUP" | string %]
-
- -
- [% "USING_REMOTE" | string %]
-
- -
- [% "HELP_REMOTE" | string %]
-
- - [% "RADIO" | string %]
- - [% "REMOTE_STREAMING" | string %]
- - [% "FAQ" | string %]
- -
- [% "TECHNICAL_INFORMATION" | string %]
-
[% IF additionalLinks.help %]
- [% FOREACH key = additionalLinks.help.keys %]
+ [% FOREACH link = additionalLinks.help %]
-
- [% key %]
+ [% link.key %]
[% END %]
[% END %]
Index: HTML/Fishbone/home.html
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/HTML/Fishbone/home.html,v
retrieving revision 1.19
diff -u -p -B -r1.19 home.html
--- HTML/Fishbone/home.html 15 May 2004 04:50:26 -0000 1.19
+++ HTML/Fishbone/home.html 21 May 2004 09:17:34 -0000
@@ -1,16 +1,7 @@
- [% pagetitle = "MUSIC" | string %] [% pageicon = 'MUSIC' %] [% search = '0' %][% browse = '1' %] [% music = '0' %][% home = '1' %][% playlist = '0' %][% PROCESS pageheader.html %]
-
+[% IF page != 'help' %] [% pagetitle = "MUSIC" | string %] [% pageicon = 'MUSIC' %] [% search = '0' %][% browse = '1' %] [% music = '0' %][% home = '1' %][% playlist = '0' %][% PROCESS pageheader.html %]
+[% END %]
+[% IF page == 'help' %]
+
+
+ [% pagetitle %]
+
+
+
+
+ [% IF additionalLinks.help %]
+ [% FOREACH link = additionalLinks.help %]
+ -
+ [% link.key %]
+
+ [% END %]
+ [% END %]
+
+[% END %]
\ No newline at end of file
Index: HTML/Fishbone/pageheader.html
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/HTML/Fishbone/pageheader.html,v
retrieving revision 1.26
diff -u -p -B -r1.26 pageheader.html
--- HTML/Fishbone/pageheader.html 15 May 2004 05:45:59 -0000 1.26
+++ HTML/Fishbone/pageheader.html 21 May 2004 09:17:34 -0000
@@ -38,18 +38,6 @@
var url;
switch(option)
{
- case 'genre':
- url="browseid3.html?";
- suffix ="&page=genre";
- break
- case 'artist':
- url="browseid3.html?genre=*";
- suffix ="&page=artist";
- break
- case 'album':
- url="browseid3.html?genre=*&artist=*"
- suffix ="&page=album";
- break
case 'song':
url="browseid3.html?genre=*&artist=*&album=*";
suffix ="&page=song";
@@ -84,7 +72,7 @@
|
-
+
|
@@ -93,13 +81,10 @@
|
|