[Slim-Checkins] r10706 - in /trunk/server/HTML/Fishbone: cmdwrappers_Fishbone html/scripts.js pagefooter.html pageheader.html status_header.html status_list.html

kdf at svn.slimdevices.com kdf at svn.slimdevices.com
Thu Nov 16 18:20:09 PST 2006 

Author: kdf
Date: Thu Nov 16 18:20:09 2006
New Revision: 10706

URL: http://svn.slimdevices.com?rev=10706&view=rev
Log:
Bug: n/a
Description: fix some html/js warnings


Modified:
    trunk/server/HTML/Fishbone/cmdwrappers_Fishbone
    trunk/server/HTML/Fishbone/html/scripts.js
    trunk/server/HTML/Fishbone/pagefooter.html
    trunk/server/HTML/Fishbone/pageheader.html
    trunk/server/HTML/Fishbone/status_header.html
    trunk/server/HTML/Fishbone/status_list.html

Modified: trunk/server/HTML/Fishbone/cmdwrappers_Fishbone
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/cmdwrappers_Fishbone?rev=10706&r1=10705&r2=10706&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/cmdwrappers_Fishbone (original)
+++ trunk/server/HTML/Fishbone/cmdwrappers_Fishbone Thu Nov 16 18:20:09 2006
@@ -13,7 +13,7 @@
 [%- END -%]
 
 [% BLOCK dummylink -%]
-<a><img src="[% webroot %]html/images/spacer.gif" width=7></a>
+<a><img src="[% webroot %]html/images/spacer.gif" alt="" title="" width="7"></a>
 [%- END %]
 
 [% BLOCK infolink %]
@@ -49,9 +49,9 @@
 	[%- WRAPPER moveuplink   -%][%- PROCESS cmdHRef cmdType = 'move' moveTo = MoveUp           -%][%- END -%]
 	[%- WRAPPER movedownlink -%][%- PROCESS cmdHRef cmdType = 'move' moveTo = MoveDown         -%][%- END -%]
 	[%- WRAPPER removelink   -%][%- PROCESS cmdHRef cmdType = 'delete'                         -%][%- END -%]
-	<span class="mixers">[%- FOREACH mixer = item.mixerlinks.values.sort %]
-		[%- PROCESS $mixer -%]
-	[%- END -%]
+		[% IF mixerlinks %]<span class="mixers">[%- FOREACH mixer = item.mixerlinks.values.sort -%]
+			[%- PROCESS $mixer -%]
+		[%- END %]</span>[% END %]
 [%- END %]
 
 [% BLOCK browsecontrols -%]
@@ -70,9 +70,9 @@
 		[%- WRAPPER insertlink -%][%- PROCESS cmdHRef cmdType='insert' -%][%- END %]
 		[%- WRAPPER addlink    -%][%- PROCESS cmdHRef cmdType='add'    -%][%- END %]
 		[%- WRAPPER removelink -%][%- PROCESS cmdHRef cmdType='remove' -%][%- END %]
-		<span class="mixers">[%- FOREACH mixer = mixerlinks.values.sort -%]
+		[% IF mixerlinks %]<span class="mixers">[%- FOREACH mixer = mixerlinks.values.sort -%]
 			[%- PROCESS $mixer -%]
-		[%- END %]</span>
+		[%- END %]</span>[% END %]
 	[% END %]
 [%- END %]
 

Modified: trunk/server/HTML/Fishbone/html/scripts.js
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/html/scripts.js?rev=10706&r1=10705&r2=10706&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/html/scripts.js (original)
+++ trunk/server/HTML/Fishbone/html/scripts.js Thu Nov 16 18:20:09 2006
@@ -264,7 +264,8 @@
 var selectedLink;
 function selectLink(lnk,reset) {
 
-	if (selectedLink) selectedLink.style.fontWeight='normal';
+	document.getElementById('homelink').style.fontWeight = 'normal';
+	if (selectedLink) selectedLink.style.fontWeight = 'normal';
 
 	if (lnk) {
 		lnk.style.fontWeight='bold';

Modified: trunk/server/HTML/Fishbone/pagefooter.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/pagefooter.html?rev=10706&r1=10705&r2=10706&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/pagefooter.html (original)
+++ trunk/server/HTML/Fishbone/pagefooter.html Thu Nov 16 18:20:09 2006
@@ -1,5 +1,7 @@
+[% IF NOT home %]
 		</div>
+[% END %]
 	[% IF artwork && (levelName == 'album' || levelName == 'age') -%]
-	<script>toggleText(1)</script>[% END %]
+	<script type="text/javascript">toggleText(1)</script>[% END %]
 	</body>
 </html>

Modified: trunk/server/HTML/Fishbone/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/pageheader.html?rev=10706&r1=10705&r2=10706&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/pageheader.html (original)
+++ trunk/server/HTML/Fishbone/pageheader.html Thu Nov 16 18:20:09 2006
@@ -26,7 +26,7 @@
 <html>
 <head>
 	[% PROCESS customheader.html %]
-	[% IF home %]<script language="JavaScript">
+	[% IF home %]<script type="text/javascript">
 	<!--Hide
 	var homestring;
 	var page;
@@ -116,18 +116,18 @@
 			<a href="http://www.slimdevices.com/" target="slimdevices"><img src="[% webroot %]html/images/slimdevices_logo.gif" alt="Slim Devices"></a>
 	</div>
 	<div id="serverlinks">
-		<a id="homelink" onload="style.fontWeight='bold';" href="" target="browser" onclick="selectLink(this,'[% page %]');" onMouseOver="homelink();setLink(this);" onMouseOut="document.getElementById('homelink').innerHTML = '[% "HOME" | string %]';">[% "HOME" | string %]</a>
+		<a id="homelink" style="font-weight:bold;" href="javascript:selectLink(this,'BROWSE_NEW_MUSIC');" target="browser" onclick="selectLink(this,'[% page %]');" onMouseOver="homelink();setLink(this);" onMouseOut="document.getElementById('homelink').innerHTML = '[% "HOME" | string %]';">[% "HOME" | string %]</a>
 		 / 
 		[% IF not nosetup && not noserver %]
 			<a href="[% webroot %]settings/server/basic.html?player=[% playerURI %][% IF nofolder %]&nofolder=1[% END %]" target="browser" onclick="selectLink(this,1)">[% "SERVER_SETTINGS" | string %]</a>
 			 / 
 		[% END %]
-		<a href="[% webroot %]home.html?page=help&player=[% playerURI %][% IF nofolder %]&nofolder=1[% END %]" target="browser" onclick="selectLink(this,1)">[% "HELP" | string %]</a></nobr>
+		<a href="[% webroot %]home.html?page=help&amp;player=[% playerURI %][% IF nofolder %]&nofolder=1[% END %]" target="browser" onclick="selectLink(this,1)">[% "HELP" | string %]</a>
 	</div>
 </div>
 
 <div id="menuHeader">[% END %]
-	<FORM id="browseForm" name="browser" action="javascript: return false;" target="header">
+	<FORM id="browseForm" name="browseForm" action="javascript:return(false);" target="header">
 		<SELECT NAME="browse" class="stdedit" style="width:17em;" onchange="chooseBrowser(selectedIndex,options[selectedIndex].value)">
 			<OPTION value="" label="">---[% "BROWSE_MUSIC" | string %]---</OPTION>
 			[% PROCESS addBrowseLinks links=additionalLinks.browse %]
@@ -149,7 +149,7 @@
 		<input type=hidden value="[% page %]" name="page">
 	</FORM>
 	[% IF NOT optionOnly %]
-	<FORM id="HeaderSearchForm" name=searcher action="javascript: return false;" onSubmit="doSearch(query.value);">
+	<FORM id="HeaderSearchForm" name="HeaderSearchForm" action="javascript:return(false);" onSubmit="doSearch(query.value);">
 		[% "SEARCH" | string %]
 		<input type=text class="stdedit" name="query" [% IF search %]value="[% query %]"[% END %] size="15">
 		<input type=hidden value="[% player %]" name="player">
@@ -171,5 +171,5 @@
 [%- END %]
 <span class="pageHeaderInfo">[% pageHeaderInfo %]</span>
 
-[% UNLESS noHR %]<span class="headerhr"><hr></span>[% END %]
+[% UNLESS noHR %]<hr class="headerhr">[% END %]
 [% END %]

Modified: trunk/server/HTML/Fishbone/status_header.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/status_header.html?rev=10706&r1=10705&r2=10706&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/status_header.html (original)
+++ trunk/server/HTML/Fishbone/status_header.html Thu Nov 16 18:20:09 2006
@@ -100,7 +100,7 @@
 
 [%- IF NOT undock -%]
 		<div id="menuHeader">
-			<form id="playerForm" action="javascript:return false">
+			<form id="playerForm" action="javascript:return(false);">
 				[% IF player_chooser_list -%]
 					<select name="player" onchange="changePlayer(this);" class="stdedit">[% player_chooser_list %]</select>
 				[%- ELSE -%]
@@ -206,7 +206,7 @@
 				([% IF myClientState; myClientState.playlist.size; END; %] [% "SONGS" | string %])[% IF current_playlist_modified %]([% "MODIFIED" | string %])[% END %][% END %]
 			</div>
 			<div id="playlistLinks">
-				[% img = '' %]<span id="saveplaylist" style="display:none";>[% PROCESS savePlaylistLink %] / </span>
+				[% img = '' %]<span id="saveplaylist" style="display:none;">[% PROCESS savePlaylistLink %] / </span>
 				[% PROCESS downloadPlaylistLink %] /
 				[% PROCESS clearPlaylistLink %]
 			</div>

Modified: trunk/server/HTML/Fishbone/status_list.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/status_list.html?rev=10706&r1=10705&r2=10706&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/status_list.html (original)
+++ trunk/server/HTML/Fishbone/status_list.html Thu Nov 16 18:20:09 2006
@@ -1,4 +1,4 @@
-[% IF item.currentsong %]<a name="currentsong"></a>[% ELSE %]<a name="[% item.num %]"></a>[% END %]
+<a name="[% item.num %]"></a>
 <div [% IF item.odd %]class="odd"[% END %] [% IF not item.odd %]class="even"[% END %]>
 	<div id="playlistitem[% item.num %]" [% IF item.currentsong %]class="currentListItem"[% ELSE %]class="browsedbListItem"[% END %]>
 		[% PROCESS trackinfo %]

More information about the checkins mailing list