[Slim-Checkins] r12541 - in /trunk/server: HTML/EN/html/wizard.js HTML/EN/settings/server/wizard.html Slim/Web/Settings/Server/Wizard.pm strings.txt
mherger at svn.slimdevices.com
mherger at svn.slimdevices.com
Mon Aug 13 03:11:28 PDT 2007
Author: mherger
Date: Mon Aug 13 03:11:27 2007
New Revision: 12541
URL: http://svn.slimdevices.com?rev=12541&view=rev
Log:
Bug: n/a
Description: wizard
- summary page
- format updates
Modified:
trunk/server/HTML/EN/html/wizard.js
trunk/server/HTML/EN/settings/server/wizard.html
trunk/server/Slim/Web/Settings/Server/Wizard.pm
trunk/server/strings.txt
Modified: trunk/server/HTML/EN/html/wizard.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/wizard.js?rev=12541&r1=12540&r2=12541&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/wizard.js (original)
+++ trunk/server/HTML/EN/html/wizard.js Mon Aug 13 03:11:27 2007
@@ -130,6 +130,20 @@
}
break;
+ case 'summary' :
+ a = (!(Ext.get('useAudiodir').dom.checked || Ext.get('itunes').dom.checked || Ext.get('musicmagic').dom.checked) ? '<li>' + strings['summary_none'] + '</li>' : '');
+ b = (Ext.get('useAudiodir').dom.checked ? '<li>' + strings['summary_audiodir'] + Ext.get('audiodir').dom.value + '</li>' : '');
+ c = (Ext.get('itunes').dom.checked ? '<li>' + strings['summary_itunes'] + '</li>' : '');
+ d = (Ext.get('musicmagic').dom.checked ? '<li>' + strings['summary_musicmagic'] + '</li>' : '');
+
+ Ext.get('summary').update(
+ (!(Ext.get('useAudiodir').dom.checked || Ext.get('itunes').dom.checked || Ext.get('musicmagic').dom.checked) ? '<li>' + strings['summary_none'] + '</li>' : '') +
+ (Ext.get('useAudiodir').dom.checked ? '<li>' + strings['summary_audiodir'] + Ext.get('audiodir').dom.value + '</li>' : '') +
+ (Ext.get('itunes').dom.checked ? '<li>' + strings['summary_itunes'] + '</li>' : '') +
+ (Ext.get('musicmagic').dom.checked ? '<li>' + strings['summary_musicmagic'] + '</li>' : '')
+ );
+ break;
+
default :
break;
}
@@ -194,6 +208,8 @@
pw = pw.dom.value;
Ext.get('sn_result').update('');
+ Ext.get('sn_email_summary').update(email);
+ Ext.get('sn_result_summary').update('');
Ext.Ajax.request({
url: '/settings/server/squeezenetwork.html',
@@ -203,6 +219,7 @@
success: function(response, options){
result = response.responseText.split('|');
Ext.get('sn_result').update(result[1]);
+ Ext.get('sn_result_summary').update('(' + result[1] + ')');
this.sqnValidated = (result[0] == '1');
}
});
Modified: trunk/server/HTML/EN/settings/server/wizard.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/wizard.html?rev=12541&r1=12540&r2=12541&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/wizard.html (original)
+++ trunk/server/HTML/EN/settings/server/wizard.html Mon Aug 13 03:11:27 2007
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
- <title>[% SLIMSERVER | string %]</title>
+ <title>[% "SLIMSERVER" | string %]</title>
<link rel="stylesheet" type="text/css" href="/html/ext/resources/css/ext-all.css" />
<script type="text/javascript" src="/html/ext/adapter/ext/ext-base.js"></script>
@@ -18,6 +18,11 @@
strings['next'] = "[% "SETUP_WIZARD_NEXT" | string %]";
strings['finish'] = "[% "SETUP_WIZARD_FINISH" | string %]";
strings['sn_verify'] = "[% "SETUP_WIZARD_SQN_VERIFY" | string %]";
+
+ strings['summary_none'] = "[% "NONE" | string %]";
+ strings['summary_audiodir'] = "[% "SETUP_AUDIODIR" | string %][% "COLON" | string %]";
+ strings['summary_itunes'] = "[% "ITUNES_DESC" | string %]";
+ strings['summary_musicmagic'] = "[% "MUSICMAGIC_DESC" | string %]";
</script>
<script type="text/javascript" src="/html/fileselector.js"></script>
@@ -35,13 +40,9 @@
font-family: sans-serif;
}
- body {
- margin: 20px;
- }
-
- a {
- color: white;
- }
+ body { margin: 20px; }
+
+ a { color: white; }
#header {
background: url(/html/wizard/header_background.png) repeat;
@@ -116,6 +117,7 @@
background: url(/html/wizard/title_background.gif) repeat;
margin-left: 10px;
height: 15px;
+ font-weight: bold;
}
.titlebox_top div {
height: 10px;
@@ -147,27 +149,57 @@
overflow: hidden;
}
- #formpanel {
- margin: 7px;
- }
-
.folderselector {
- overflow:scroll;
+ overflow: auto;
height: 300px;
width: 50%;
border: 2px inset grey;
background: white;
}
-
- .folderselector_path {
- width: 90%;
- }
-
- .page {
+
+ .wz_path {
+ width: 45%;
+ vertical-align:top;
+ }
+
+ #wz_formpanel {
+ margin: 7px;
+ position: relative;
+ }
+
+ .wz_page {
position: absolute;
width: 95%;
}
+ .wz_logo {
+ float: right;
+ margin-left: 30px;
+ }
+
+ .wz_desc_right {
+ position: absolute;
+ left: 55%;
+ float: right;
+ width: 45%;
+ }
+
+ #wz_musicsource td {
+ vertical-align: top;
+ padding-top: 5px;
+ }
+
+ #wz_buttonbar {
+ float: right;
+ margin-top:5px;
+ margin-right:10px;
+ }
+
+ .wz_summary_list {
+ list-style-type: circle;
+ margin-left: 20px;
+ }
+
.x-tree-node-leaf .x-tree-node-alwayscollapsed {
background-image:url(/html/ext/resources/images/default/tree/folder.gif);
}
@@ -178,6 +210,10 @@
.x-layout-panel {
border: 0px none;
+ }
+
+ .x-btn {
+ display: inline;
}
.x-btn-text, .x-btn button {
@@ -245,24 +281,25 @@
<div class="titlebox">
<div class="titlebox_top"><div></div></div>
<div class="titlebox_content">
- <div id="welcome_h" class="page">[% "SETUP_WIZARD_WELCOME" | string %]</div>
- <div id="proxy_h" class="page">[% "SETUP_WIZARD_PROXY" | string %]</div>
- <div id="sqn_h" class="page">[% "SETUP_WIZARD_SQN" | string %]</div>
- <div id="source_h" class="page">[% "SETUP_WIZARD_SOURCE" | string %]</div>
- <div id="audiodir_h" class="page">[% "SETUP_WIZARD_AUDIODIR" | string %]</div>
- <div id="playlistdir_h" class="page">[% "SETUP_WIZARD_PLAYLISTDIR" | string %]</div>
- <div id="itunes_h" class="page">[% "SETUP_WIZARD_ITUNES" | string %]</div>
- <div id="musicip_h" class="page">[% "SETUP_WIZARD_MUSICIP" | string %]</div>
- <div id="summary_h" class="page">[% "SETUP_WIZARD_SUMMARY" | string %]</div>
+ <div id="welcome_h" class="wz_page">[% "SETUP_WIZARD_WELCOME" | string %]</div>
+ <div id="proxy_h" class="wz_page">[% "SETUP_WIZARD_PROXY" | string %]</div>
+ <div id="sqn_h" class="wz_page">[% "SETUP_WIZARD_SQN" | string %]</div>
+ <div id="source_h" class="wz_page">[% "SETUP_WIZARD_SOURCE" | string %]</div>
+ <div id="audiodir_h" class="wz_page">[% "SETUP_WIZARD_AUDIODIR" | string %]</div>
+ <div id="playlistdir_h" class="wz_page">[% "SETUP_WIZARD_PLAYLISTDIR" | string %]</div>
+ <div id="itunes_h" class="wz_page">[% "SETUP_WIZARD_ITUNES" | string %]</div>
+ <div id="musicip_h" class="wz_page">[% "SETUP_WIZARD_MUSICIP" | string %]</div>
+ <div id="summary_h" class="wz_page">[% "SETUP_WIZARD_SUMMARY" | string %]</div>
</div>
<div class="titlebox_bottom"><div></div></div>
</div>
- <div id="formpanel">
- <div id="welcome_m" class="page">
+ <div id="wz_formpanel">
+ <div id="welcome_m" class="wz_page">
+ <div class="wz_logo"><img src="[% webroot %]html/images/squeezebox.gif"></div>
<form name="languageForm" id="languageForm" method="post" action="[% webroot %][% path %]">
<div>[% "SETUP_WIZARD_WELCOME_DESC" | string %]</div>
- <div>
+ <div><br/>
[% "CHOOSE_A_LANGUAGE" | string %]
<select name="language" id="language">
@@ -277,12 +314,16 @@
</div>
<form name="wizardForm" id="wizardForm" method="post" action="[% webroot %][% path %]">
- <div id="proxy_m" class="page">
+ <div id="proxy_m" class="wz_page">
<div>[% "SETUP_WIZARD_PROXY_DESC" | string %]</div>
<div>[% "SETUP_WEBPROXY_CHOOSE" | string %][% "COLON" | string %] <input type="text" name="webproxy" value="[% prefs.webproxy %]"></div>
</div>
- <div id="sqn_m" class="page">
+ <div id="sqn_m" class="wz_page">
+ <div class="wz_logo">
+<!-- <img src="[% webroot %]html/images/squeezenetwork.gif"> -->
+ </div>
+
<div>[% "SETUP_WIZARD_SQN_DESC" | string %]</div>
<div><table>
@@ -302,9 +343,9 @@
<div id="sn_result"></div>
</div>
- <div id="source_m" class="page">
+ <div id="source_m" class="wz_page">
<div>[% "SETUP_WIZARD_SOURCE_DESC" | string %]</div>
- <div><table>
+ <div><table id="wz_musicsource">
<tr>
<td><input type="checkbox" name="useAudiodir" id="useAudiodir" [% IF prefs.audiodir %]checked="checked" [% END %]> </td>
<td>[% "SETUP_WIZARD_SOURCE_AUDIODIR" | string %]</td>
@@ -320,48 +361,63 @@
</table></div>
</div>
- <div id="audiodir_m" class="page">
- <div>[% "SETUP_WIZARD_AUDIODIR_DESC" | string %]</div>
+ <div id="audiodir_m" class="wz_page">
+ <div class="wz_desc_right">
+ [% "SETUP_WIZARD_AUDIODIR_DESC" | string %]
+ [% serverOS == "win" ? "SETUP_WIZARD_SHARE_WIN" : "SETUP_WIZARD_SHARE_OTHERS" | string %]
+ </div>
<div id="audiodirselector"></div>
<div>
- <table><tr>
- <td><input type="text" name="audiodir" id="audiodir" value="[% prefs.audiodir %]" class="folderselector_path"></td>
- <td><span id="gotoAudiodir"></span></td>
- </tr></table>
- </div>
- </div>
-
- <div id="playlistdir_m" class="page">
- <div>[% "SETUP_WIZARD_PLAYLISTDIR_DESC" | string %]</div>
+ <input type="text" name="audiodir" id="audiodir" value="[% prefs.audiodir %]" class="wz_path">
+ <span id="gotoAudiodir"></span>
+ </div>
+ </div>
+
+ <div id="playlistdir_m" class="wz_page">
+ <div class="wz_desc_right">
+ [% "SETUP_WIZARD_PLAYLISTDIR_DESC" | string %]
+ [% serverOS == "win" ? "SETUP_WIZARD_SHARE_WIN" : "SETUP_WIZARD_SHARE_OTHERS" | string %]
+ </div>
<div id="playlistdirselector"></div>
<div>
- <table><tr>
- <td><input type="text" name="playlistdir" id="playlistdir" value="[% prefs.playlistdir %]" size="50"></td>
- <td><span id="gotoPlaylistdir"></span></td>
- </tr></table>
- </div>
- </div>
-
- <div id="itunes_m" class="page">
- <div>[% "SETUP_WIZARD_ITUNES_DESC" | string %]</div>
+ <input type="text" name="playlistdir" id="playlistdir" value="[% prefs.playlistdir %]" class="wz_path">
+ <span id="gotoPlaylistdir"></span>
+ </div>
+ </div>
+
+ <div id="itunes_m" class="wz_page">
+ <div>
+ [% "SETUP_WIZARD_ITUNES_DESC" | string %]
+ [% serverOS == "win" ? "SETUP_WIZARD_SHARE_WIN" : "SETUP_WIZARD_SHARE_OTHERS" | string %]
+ </div>
<div id="itunespathselector"></div>
<div>
- <table><tr>
- <td><input type="text" name="xml_file" id="xml_file" value="[% prefs.xml_file %]" size="50"></td>
- <td><span id="gotoiTunesDir"></span></td>
- </tr></table>
- </div>
- </div>
-
- <div id="musicip_m" class="page">
+ <input type="text" name="xml_file" id="xml_file" value="[% prefs.xml_file %]" class="wz_path">
+ <span id="gotoiTunesDir"></span>
+ </div>
+ </div>
+
+ <div id="musicip_m" class="wz_page">
<div>[% "SETUP_WIZARD_MUSICIP_DESC" | string %]</div>
+ <br/>
<div><input type="text" name="port" id="port" value="[% prefs.port %]" size="20"></div>
+ <br/>
<div>[% "SETUP_WIZARD_MUSICIP_DESC2" | string %]</div>
<div>[% "SETUP_WIZARD_MUSICIP_DESC3" | string %]</div>
</div>
- <div id="summary_m" class="page">
+ <div id="summary_m" class="wz_page">
<div>[% "SETUP_WIZARD_SUMMARY_DESC" | string %]</div>
+ <br/>
+ <div>[% "SETUP_WIZARD_SUMMARY_SQN" | string %]</div>
+ <ul class="wz_summary_list">
+ <li><span id="sn_email_summary"></span> <span id="sn_result_summary"></span></li>
+ </ul>
+ <br/>
+ <div>[% "SETUP_WIZARD_SUMMARY_MUSICSOURCE" | string %][% "COLON" | string %]</div>
+ <ul class="wz_summary_list" id="summary"></ul>
+ <br/>
+ <div>[% "SETUP_WIZARD_SUMMARY_RESCAN" | string %]</div>
</div>
<input name="saveSettings" type="hidden" value="1">
@@ -376,7 +432,7 @@
<div id="footer">
<img src="/html/wizard/footer_left.png" id="footer_logo">
<div id="footer_content">
- <table style="float: right; margin-top:5px; margin-right:10px;">
+ <table id="wz_buttonbar">
<tr>
<td><span id="previous"></span></td>
<td><span id="next"></span></td>
Modified: trunk/server/Slim/Web/Settings/Server/Wizard.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/Wizard.pm?rev=12541&r1=12540&r2=12541&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/Wizard.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/Wizard.pm Mon Aug 13 03:11:27 2007
@@ -94,6 +94,7 @@
$paramRef->{'showiTunes'} = !Slim::Plugin::iTunes::Common->canUseiTunesLibrary();
$paramRef->{'showMusicIP'} = !Slim::Plugin::MusicMagic::Plugin::canUseMusicMagic();
$paramRef->{'languageoptions'} = Slim::Utils::Strings::languageOptions();
+ $paramRef->{'serverOS'} = Slim::Utils::OSDetect::OS();
return Slim::Web::HTTP::filltemplatefile($class->page, $paramRef);
}
Modified: trunk/server/strings.txt
URL: http://svn.slimdevices.com/trunk/server/strings.txt?rev=12541&r1=12540&r2=12541&view=diff
==============================================================================
--- trunk/server/strings.txt (original)
+++ trunk/server/strings.txt Mon Aug 13 03:11:27 2007
@@ -6954,7 +6954,7 @@
EN Welcome to the SlimServer Setup wizard
SETUP_WIZARD_WELCOME_DESC
- EN Thank you for buying a Logitech digital music player! We're sure you'll enjoy it a lot...<br><br>This wizard will guide you through the necessary steps to get your SlimServer and music player up and running.<br>Some more blah, blah...
+ EN Thank you for buying a Logitech digital music player! We're sure you'll enjoy it a lot...<br><br>This wizard will guide you through the necessary steps to get your SlimServer and music player up and running. In only a few minutes you'll be able to access your music collection as well as many internet radio stations and music services. Just follow instructions on the following few pages.<br/><br/>Have fun!
SETUP_WIZARD_PROXY
EN SlimServer Setup: Proxy Settings
@@ -6975,22 +6975,28 @@
EN SlimServer Setup: Music Source
SETUP_WIZARD_SOURCE_DESC
- EN Please select your local music source.
+ EN You have several ways to integrate your local music files with SlimServer. Please select one of the following:
SETUP_WIZARD_SOURCE_AUDIODIR
- EN <em>Music Folder<em><br/>SlimServer can access music files stored on your computer or another computer in your local network, such as eg. a network attached storage (NAS).
+ EN <em>Local Music Folder<em><br/>SlimServer can access music files stored on your computer or another computer in your local network, such as eg. a network attached storage (NAS).
SETUP_WIZARD_SOURCE_ITUNES
EN <em>iTunes<em><br/>SlimServer can use your iTunes music library and playlists. Any changes that you make in iTunes will be reflected on your player. For more information about iTunes please visit <a href="http://www.apple.com/itunes" target="_blank">http://www.apple.com/itunes</a>.
SETUP_WIZARD_SOURCE_MUSICIP
- EN <em>MusicIP Integration</em><br/>SlimServer can use MusicIP as your source for title and genre information. Additionally MusicIP allows you to generate mixes based on genre, artist and songs. For more information about MusicIP please visit <a href="http://www.musicip.com/mixer/" target="_blank">http://www.musicip.com</a>
+ EN <em>MusicIP</em><br/>SlimServer can use MusicIP as your source for title and genre information. Additionally MusicIP allows you to generate mixes based on genre, artist and songs. For more information about MusicIP please visit <a href="http://www.musicip.com/mixer/" target="_blank">http://www.musicip.com</a>
SETUP_WIZARD_AUDIODIR
EN SlimServer Setup: Local Music Folder
SETUP_WIZARD_AUDIODIR_DESC
- EN Please select the path to your local music collection.
+ EN On the left you can select the local folder where your music collection is stored.
+
+SETUP_WIZARD_SHARE_WIN
+ EN <br/><br/>If you want to use a network share hosted on another computer or a NAS, you can do this by entering the UNC path to the share in the form \\yourserver\share in the text field below. Then press the > button.<br/><br/>Make sure either the music share is configured for anonymous access or make SlimServer run as a user known to the fileserver hosting your music files.
+
+SETUP_WIZARD_SHARE_OTHERS
+ EN <br/><br/>If you want to use a network share hosted on another computer or a NAS, you'll need to first mount the share to your filesystem. It will then be available in the folder tree.
SETUP_WIZARD_PLAYLISTDIR
EN SlimServer Setup: Playlist Folder
@@ -7020,7 +7026,16 @@
EN SlimServer Setup: Summary
SETUP_WIZARD_SUMMARY_DESC
- EN You're finished setting up your SlimServer.<br>If you selected a local music source, SlimServer will now start indexing your collection. Have fun! blah, blah...
+ EN You've finished setting up your SlimServer.
+
+SETUP_WIZARD_SUMMARY_SQN
+ EN SqueezeNetwork Account:
+
+SETUP_WIZARD_SUMMARY_MUSICSOURCE
+ EN Music Source
+
+SETUP_WIZARD_SUMMARY_RESCAN
+ EN If you selected a local music source, SlimServer will now start indexing your collection.<br/><br/>Have fun!
SETUP_WIZARD_NEXT
DE Weiter
More information about the checkins
mailing list