[Slim-Checkins] r12539 - in /trunk/server/HTML/EN: html/fileselector.js html/wizard.js html/wizard/altbkgnd2.jpg html/wizard/btn-sprite.png settings/server/fileselector.html settings/server/wizard.html
mherger at svn.slimdevices.com
mherger at svn.slimdevices.com
Sun Aug 12 15:17:11 PDT 2007
Author: mherger
Date: Sun Aug 12 15:17:11 2007
New Revision: 12539
URL: http://svn.slimdevices.com?rev=12539&view=rev
Log:
Bug: n/a
Description: add rounded buttons
Added:
trunk/server/HTML/EN/html/wizard/btn-sprite.png (with props)
Removed:
trunk/server/HTML/EN/html/wizard/altbkgnd2.jpg
Modified:
trunk/server/HTML/EN/html/fileselector.js
trunk/server/HTML/EN/html/wizard.js
trunk/server/HTML/EN/settings/server/fileselector.html
trunk/server/HTML/EN/settings/server/wizard.html
Modified: trunk/server/HTML/EN/html/fileselector.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/fileselector.js?rev=12539&r1=12538&r2=12539&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/fileselector.js (original)
+++ trunk/server/HTML/EN/html/fileselector.js Sun Aug 12 15:17:11 2007
@@ -108,7 +108,11 @@
// activate button to add path to the selector box
gotoBtn = Ext.get(this.gotoBtn);
if (gotoBtn != null) {
- gotoBtn.on('click', this.showPath, this)
+ new Ext.Button(gotoBtn, {
+ text: '>',
+ handler: this.showPath,
+ scope: this
+ });
}
};
Modified: trunk/server/HTML/EN/html/wizard.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/wizard.js?rev=12539&r1=12538&r2=12539&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/wizard.js (original)
+++ trunk/server/HTML/EN/html/wizard.js Sun Aug 12 15:17:11 2007
@@ -48,11 +48,13 @@
handler: this.onPrevious,
scope: this
});
+
new Ext.Button('next', {
text: strings['next'],
handler: this.onNext,
scope: this
});
+
new Ext.Button('finish', {
text: strings['finish'],
handler: this.onFinish,
@@ -60,7 +62,12 @@
});
Ext.get('language').on('change', this.onLanguageChange, this);
- Ext.get('sn_verify').on('click', this.verifySqnAccount, this);
+
+ new Ext.Button('sn_verify', {
+ text: strings['sn_verify'],
+ handler: this.verifySqnAccount,
+ scope: this
+ });
Ext.EventManager.onWindowResize(this.onResize, layout);
Ext.EventManager.onDocumentReady(this.onResize, layout, true);
Added: trunk/server/HTML/EN/html/wizard/btn-sprite.png
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/wizard/btn-sprite.png?rev=12539&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/server/HTML/EN/html/wizard/btn-sprite.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/server/HTML/EN/settings/server/fileselector.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/fileselector.html?rev=12539&r1=12538&r2=12539&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/fileselector.html (original)
+++ trunk/server/HTML/EN/settings/server/fileselector.html Sun Aug 12 15:17:11 2007
@@ -5,7 +5,6 @@
<title>[% SLIMSERVER | string %]</title>
<link rel="stylesheet" type="text/css" href="/html/ext/resources/css/ext-all.css" />
- <link rel="stylesheet" type="text/css" href="/html/ext/resources/css/xtheme-gray.css" />
<script type="text/javascript" src="/html/ext/adapter/ext/ext-base.js"></script>
<script type="text/javascript" src="/html/ext/ext-all.js"></script>
@@ -24,12 +23,12 @@
<h1>A folder selector</h1>
<div id="folderselector" style="overflow:auto; height:200px; width:400px;"></div>
<input type="text" name="audiodir" id="audiodir" value="[% audiodir %]" size="45">
- <input type="button" name"gotoAudiodir" id="gotoAudiodir" value=">">
+ <span id="gotoAudiodir"></span>
<h1>A file selector (XML files only)</h1>
<div id="fileselector" style="overflow:auto; height:200px; width:400px;"></div>
<input type="text" name="xml_file" id="xml_file" value="[% xml_file %]" size="45">
- <input type="button" name="gotoXML_path" id="gotoXML_path" value=">">
+ <span id="gotoXML_path"></span>
</body>
<script type="text/javascript">
new FileSelector('folderselector', {
Modified: trunk/server/HTML/EN/settings/server/wizard.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/wizard.html?rev=12539&r1=12538&r2=12539&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/wizard.html (original)
+++ trunk/server/HTML/EN/settings/server/wizard.html Sun Aug 12 15:17:11 2007
@@ -17,6 +17,7 @@
strings['previous'] = "[% "SETUP_WIZARD_PREVIOUS" | string %]";
strings['next'] = "[% "SETUP_WIZARD_NEXT" | string %]";
strings['finish'] = "[% "SETUP_WIZARD_FINISH" | string %]";
+ strings['sn_verify'] = "[% "SETUP_WIZARD_SQN_VERIFY" | string %]";
</script>
<script type="text/javascript" src="/html/fileselector.js"></script>
@@ -159,7 +160,7 @@
}
.folderselector_path {
- width:48%;
+ width: 90%;
}
.page {
@@ -177,6 +178,52 @@
.x-layout-panel {
border: 0px none;
+ }
+
+ .x-btn-text, .x-btn button {
+ color: #d1d1d1;
+ font-weight: bold;
+ }
+
+ .x-btn-left{
+ width:3px;
+ height:22px;
+ background:url(/html/wizard/btn-sprite.png) no-repeat 0 0;
+ }
+
+ .x-btn-right{
+ width:3px;
+ height:22px;
+ background:url(/html/wizard/btn-sprite.png) no-repeat 0 -22px;
+ }
+
+ .x-btn-center{
+ background:url(/html/wizard/btn-sprite.png) repeat-x 0 -44px;
+ vertical-align: middle;
+ text-align:center;
+ padding:0 5px;
+ cursor:pointer;
+ white-space:nowrap;
+ }
+
+ .x-btn-over .x-btn-left{
+ background-position:0 0px;
+ }
+
+ .x-btn-over .x-btn-right{
+ background-position:0 -22px;
+ }
+
+ .x-btn-over .x-btn-center{
+ background-position:0 -44px;
+ }
+
+ .x-btn-click .x-btn-center, .x-btn-menu-active .x-btn-center{
+ background-position:0 -44px;
+ }
+
+ .x-btn-menu-arrow-wrap .x-btn-center button {
+ height:22px;
}
-->
</style>
@@ -249,7 +296,7 @@
</tr>
<tr>
<td> </td>
- <td><input type="button" name="sn_verify" id="sn_verify" value="[% "SETUP_WIZARD_SQN_VERIFY" | string %]"></td>
+ <td><span id="sn_verify"></span></td>
</tr>
</table></div>
<div id="sn_result"></div>
@@ -277,8 +324,10 @@
<div>[% "SETUP_WIZARD_AUDIODIR_DESC" | string %]</div>
<div id="audiodirselector"></div>
<div>
- <input type="text" name="audiodir" id="audiodir" value="[% prefs.audiodir %]" class="folderselector_path">
- <input type="button" name="gotoAudiodir" id="gotoAudiodir" value=">">
+ <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>
@@ -286,8 +335,10 @@
<div>[% "SETUP_WIZARD_PLAYLISTDIR_DESC" | string %]</div>
<div id="playlistdirselector"></div>
<div>
- <input type="text" name="playlistdir" id="playlistdir" value="[% prefs.playlistdir %]" size="50">
- <input type="button" name="gotoPlaylistdir" id="gotoPlaylistdir" value=">">
+ <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>
@@ -295,8 +346,10 @@
<div>[% "SETUP_WIZARD_ITUNES_DESC" | string %]</div>
<div id="itunespathselector"></div>
<div>
- <input type="text" name="xml_file" id="xml_file" value="[% prefs.xml_file %]" size="50">
- <input type="button" name="gotoiTunesDir" id="gotoiTunesDir" value=">">
+ <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>
@@ -323,7 +376,7 @@
<div id="footer">
<img src="/html/wizard/footer_left.png" id="footer_logo">
<div id="footer_content">
- <table style="float: right">
+ <table style="float: right; margin-top:5px; margin-right:10px;">
<tr>
<td><span id="previous"></span></td>
<td><span id="next"></span></td>
More information about the checkins
mailing list