[Slim-Checkins] r12635 - in /trunk/server/HTML/Nokia770: cmdwrappers pageheader.html searchinput.html slimserver.css

bklaas at svn.slimdevices.com bklaas at svn.slimdevices.com
Mon Aug 20 21:44:22 PDT 2007 

Author: bklaas
Date: Mon Aug 20 21:44:21 2007
New Revision: 12635

URL: http://svn.slimdevices.com?rev=12635&view=rev
Log:
Misc hacking to try to get bug 5295 fixed. Bug isn't fixed, but various other things have been cleaned up

Modified:
    trunk/server/HTML/Nokia770/cmdwrappers
    trunk/server/HTML/Nokia770/pageheader.html
    trunk/server/HTML/Nokia770/searchinput.html
    trunk/server/HTML/Nokia770/slimserver.css

Modified: trunk/server/HTML/Nokia770/cmdwrappers
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/cmdwrappers?rev=12635&r1=12634&r2=12635&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/cmdwrappers (original)
+++ trunk/server/HTML/Nokia770/cmdwrappers Mon Aug 20 21:44:21 2007
@@ -161,7 +161,7 @@
 [% END %]
 
 [% BLOCK browsecontrols_abbr %]
-	<span class="[% isCurrent ? "listing2" : "listing" %]" align="center">
+	<span class="[% isCurrent ? "listing2" : "listing" %]">
 	[% width='20' height='20'  %]
 	[% IF showplayall %]
 		[% WRAPPER playlink noTarget = 1 %]href="[% playallhref %]"[% END %]

Modified: trunk/server/HTML/Nokia770/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/pageheader.html?rev=12635&r1=12634&r2=12635&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/pageheader.html (original)
+++ trunk/server/HTML/Nokia770/pageheader.html Mon Aug 20 21:44:21 2007
@@ -8,11 +8,11 @@
 		function resizeSettingsSection(){}
 		</script>
 	[% ELSE %]
-		<script TYPE="text/javascript">[% PROCESS html/vars.js %]</script>
-		<script src="[% webroot %]html/prototype.js?r=[% revision %]"></script>
-		<script src="[% webroot %]html/global.js?r=[% revision %]"></script>
+		<script type="text/javascript">[% PROCESS html/vars.js %]</script>
+		<script src="[% webroot %]html/prototype.js?r=[% revision %]" type = 'text/javascript'></script>
+		<script src="[% webroot %]html/global.js?r=[% revision %]" type = 'text/javascript'></script>
 		<script>
-		[% IF thispage == 'status' %][% PROCESS status.js %][% ELSIF thispage == 'search' %][% PROCESS search.js %][% ELSIF thispage == 'playlist' %][% PROCESS playlist.js %][% ELSIF thispage == 'artwork' || ( artwork == 1 && (levelName == 'album' || levelName == 'age')) %][% PROCESS artwork.js %][% ELSE %][% PROCESS browse.js %][% END %]
+		[% IF thispage == 'status' %][% PROCESS status.js %][% ELSIF thispage == 'search' %][%# PROCESS search.js %][% ELSIF thispage == 'playlist' %][% PROCESS playlist.js %][% ELSIF thispage == 'artwork' || ( artwork == 1 && (levelName == 'album' || levelName == 'age')) %][% PROCESS artwork.js %][% ELSE %][% PROCESS browse.js %][% END %]
 		</script>
 	[% END %]
       </head>
@@ -35,10 +35,11 @@
 <div id = 'topbar'>
 <table width="100%" bgcolor="#333333">
       <tr>
-	<td width = '55px'>&nbsp;</td>
-      <td valign = 'top'><a href = 'http://slimdevices.com' title = 'slimdevices website'><img src="[% webroot %]html/images/[% playermodel %]_logo.gif" border="0" alt = 'slimdevices website' height = '19'></a>
-      </td>
-</td></tr>
+		<td width = '55px'>&nbsp;</td>
+		<td valign = 'top'>
+			<a href = 'http://slimdevices.com' title = 'slimdevices website'><img src="[% webroot %]html/images/[% playermodel %]_logo.gif" border="0" alt = 'slimdevices website' height = '19'></a>
+		</td>
+	</tr>
 </table>
 <div id = 'playerSelect'>
 <table bgcolor="#333333">

Modified: trunk/server/HTML/Nokia770/searchinput.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/searchinput.html?rev=12635&r1=12634&r2=12635&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/searchinput.html (original)
+++ trunk/server/HTML/Nokia770/searchinput.html Mon Aug 20 21:44:21 2007
@@ -1,74 +1,32 @@
 <!-- searchinput.html -->
-
-<center>
 <form name="FormSong" method="Get" action = '[% webroot %]search.html'>
-<table width = '100%' bgcolor = '#EEEEEE'>
-<tr><td>
 <table width="100%" bgcolor="#EEEEEE" cellpadding="0" cellspacing="0" border="0">
+<tr>
+	<td align="left" height="45" valign="bottom" style="padding-left:40px;">		<font class="headertext">[% "SEARCH" | string %]</font>
+	</td>
+</tr>
 
 <tr>
-<td colspan = '8' align="left" height="45" valign="bottom" style="padding-left:40px;"><font class="headertext">[% "SEARCH" | string %]</td>
+	<td height = '50'>&nbsp;</td>
 </tr>
 
-<tr><td height="20"></td></tr>
-
-<tr><td colspan="8" height="30" align = 'center'>
+<tr>
+	<td height="30" align = 'center'>
               &nbsp;<input type='text' name="query" value="[% query %]" size="20" class = 'searchForm'>
 	</td>
 </tr>
+
 <tr><td height="10"></td></tr>
 
-<tr><td colspan="8" align="center">
-<br><center>
-		<input type=submit value="[% "SEARCH" | string %]" name="Go" class = 'searchButton'>
-		<input type=reset value="[% "CLEAR" | string %]" name="Reset" class = 'searchButton'>
-		<input type=hidden value="track" name="type">
-		<input type=hidden value="[% player %]" name="player">
-		<input type=hidden value="1" name="manualSearch">
-              [% IF nofolder %]<input type=hidden value="1" name="nofolder">[% END %]
-
-
+<tr>
+	<td align="center">
+		<input type='submit' value="[% "SEARCH" | string %]" name="Go" class = 'searchButton'>
+		<input type='reset' value="[% "CLEAR" | string %]" name="Reset" class = 'searchButton'>
+		<input type='hidden' value="[% player %]" name="player">
+		<input type='hidden' value="1" name="manualSearch">
+              [%- IF nofolder %]<input type='hidden' value="1" name="nofolder">[% END %]
           </td>
       </tr>
-	<tr><td height="10"></td></tr>
-</table>
-</form>
-	</td>
-</tr>
-<tr>
-	<td>
-	[% INCLUDE searchButtons %]
-	</td>
-</tr>
-</table>
-
-<table width="100%" cellspacing="0" cellpadding="0" border="0" bgcolor="#EEEEEE">
-<tr><td>&nbsp;</td></tr>
 </table>
 </form>
 <!-- /Element searchinput.html -->
-
-[% BLOCK searchButtons %]
-<table width="100%" cellspacing="0" cellpadding="0" border="0" bgcolor="#EEEEEE">
-<form name="Keyboard">
-<tr>
-<td width="100"></td>
-<td><p align="center"><img src="html/images/active.gif" name="ButtonSong"></td>
-<td><p align="center"><img src="html/images/inactive.gif" name="ButtonArtist"></td>
-<td><p align="center"><img src="html/images/inactive.gif" name="ButtonAlbum"></td>
-<td width="100"></td>
-</tr>
-<tr><td height="10"></td></tr>
-
-<tr>
-<td></td>
-<td>
-<center><input type=button value="[% "SONGS" | string %]" name="Song" onclick="Activate('Song');Mode('track')" style="FONT-SIZE:12pt;FONT-FAMILY: Verdana;COLOR: #666666;background-image:url(html/images/button.gif);BORDER-LEFT: black 0pt none;BORDER-RIGHT: black 0pt none;BORDER-TOP: black 0pt none;BORDER-BOTTOM: black 0pt none;WIDTH: 132;HEIGHT: 44;">
-</td><td>
-<center><input type=button value="[% "ARTISTS" | string %]" name="Artist" onclick="Activate('Artist');Mode('contributor')" style="FONT-SIZE:12pt;FONT-FAMILY: Verdana;COLOR: #666666;background-image:url(html/images/button.gif);BORDER-LEFT: black 0pt none;BORDER-RIGHT: black 0pt none;BORDER-TOP: black 0pt none;BORDER-BOTTOM: black 0pt none;WIDTH: 132;HEIGHT: 44;">
-</td><td>
-<center><input type=button value="[% "ALBUMS" | string %]" name="Album" onclick="Activate('Album');Mode('album')" style="FONT-SIZE:12pt;FONT-FAMILY: Verdana;COLOR: #666666;background-image:url(html/images/button.gif);BORDER-LEFT: black 0pt none;BORDER-RIGHT: black 0pt none;BORDER-TOP: black 0pt none;BORDER-BOTTOM: black 0pt none;WIDTH: 132;HEIGHT: 44;">
-</td></tr>
-	<tr><td height="15"></td></tr>
-</table>
-[% END %]

Modified: trunk/server/HTML/Nokia770/slimserver.css
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/slimserver.css?rev=12635&r1=12634&r2=12635&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/slimserver.css (original)
+++ trunk/server/HTML/Nokia770/slimserver.css Mon Aug 20 21:44:21 2007
@@ -204,11 +204,13 @@
 }
 
 tr.odd, td.odd, div.odd {
+	text-align: left;
 	padding-top: 2px;
 	padding-bottom: 2px;
 	background-color: #d0d0d0;
 }
 tr.even, td.even, div.even {
+	text-align: left;
 	padding-top: 2px;
 	padding-bottom: 2px;
 	background-color: #FFFFFF;

More information about the checkins mailing list