[Slim-Checkins] r8820 - in /trunk/server/HTML/ExBrowse3: browsedbitems_list.html exbrowse.css html/playlist.js search.html

[jacobdp at svn.slimdevices.com]

Author: jacobdp
Date: Sat Aug  5 18:00:04 2006
New Revision: 8820

URL: http://svn.slimdevices.com?rev=8820&view=rev
Log:
Bug: N/A (http://forums.slimdevices.com/showthread.php?t=26131)
Description:
Fix search in ExBrowse3.


Modified:
    trunk/server/HTML/ExBrowse3/browsedbitems_list.html
    trunk/server/HTML/ExBrowse3/exbrowse.css
    trunk/server/HTML/ExBrowse3/html/playlist.js
    trunk/server/HTML/ExBrowse3/search.html

Modified: trunk/server/HTML/ExBrowse3/browsedbitems_list.html
URL: http://svn.slimdevices.com/trunk/server/HTML/ExBrowse3/browsedbitems_list.html?rev=8820&r1=8819&r2=8820&view=diff
==============================================================================
--- trunk/server/HTML/ExBrowse3/browsedbitems_list.html (original)
+++ trunk/server/HTML/ExBrowse3/browsedbitems_list.html Sat Aug  5 18:00:04 2006
@@ -1,4 +1,16 @@
-[% ADD = "ADD" | string ; PLAY = "PLAY" | string %]<tr>
+[% ADD = "ADD" | string ; PLAY = "PLAY" | string -%]
+
+[% IF item.heading -%]
+
+ <tr>
+  <td class="searchHeader" colspan="2">
+   [% "$item.heading" _ "SMATCHING" | string %] "[% query %]"[% "COLON" | string %][% item.numresults %]
+  </td>
+ </tr>
+
+[%- ELSE -%]
+
+<tr>
  <td class="browselistbuttons">
   <img height="8" onclick="parent.doBrowseCommand('addtracks', '[% IF item.attributes; item.attributes|html;
   ELSE; 'track='; item.item; END %]')" src="[%webroot%]html/images/add.gif" alt="[%ADD%]" title="[%ADD%]"
@@ -36,3 +48,4 @@
  </td>
 </tr>
 
+[% END %]

Modified: trunk/server/HTML/ExBrowse3/exbrowse.css
URL: http://svn.slimdevices.com/trunk/server/HTML/ExBrowse3/exbrowse.css?rev=8820&r1=8819&r2=8820&view=diff
==============================================================================
--- trunk/server/HTML/ExBrowse3/exbrowse.css (original)
+++ trunk/server/HTML/ExBrowse3/exbrowse.css Sat Aug  5 18:00:04 2006
@@ -684,6 +684,11 @@
         cursor: pointer;
 }
 
+td.searchHeader {
+	font-size: 13px;
+	color: white;
+}
+
 /*************\
  * Song Info *
 \*************/

Modified: trunk/server/HTML/ExBrowse3/html/playlist.js
URL: http://svn.slimdevices.com/trunk/server/HTML/ExBrowse3/html/playlist.js?rev=8820&r1=8819&r2=8820&view=diff
==============================================================================
--- trunk/server/HTML/ExBrowse3/html/playlist.js (original)
+++ trunk/server/HTML/ExBrowse3/html/playlist.js Sat Aug  5 18:00:04 2006
@@ -37,7 +37,7 @@
 	var combolist = [ ];
 
 	for (var i = 0; i < playlistObj.length; i++) {
-		newitem = { title :
+		var newitem = { title :
 			(playlistObj[i].tracknum ?
 				(
 					(playlistObj[i].album && playlistObj[i].album.discc && playlistObj[i].album.disc) ?

Modified: trunk/server/HTML/ExBrowse3/search.html
URL: http://svn.slimdevices.com/trunk/server/HTML/ExBrowse3/search.html?rev=8820&r1=8819&r2=8820&view=diff
==============================================================================
--- trunk/server/HTML/ExBrowse3/search.html (original)
+++ trunk/server/HTML/ExBrowse3/search.html Sat Aug  5 18:00:04 2006
@@ -14,7 +14,7 @@
  [% ELSE %]
   <input type="text" id="searchquery" name="query" size="40" value="[% query %]"/>
  [% END %]
-  <input name="submit" type=submit class="stdclick" value=[% "SEARCH" | string %]/>
+  <input name="submit" type=submit class="stdclick" value="[% "SEARCH" | string %]"/>
   <input type="hidden" value="1" name="manualSearch"/>
   <input type="hidden" value="[% player %]" name="player"/>
  </form>
@@ -29,9 +29,12 @@
 [% IF searchlist_header %]
 <p>[% searchlist_header %][% "COLON" | string %]</p>
 [% END %] 
-
 <table>
- [% browse_list %] 
+ [% IF browse_items %]
+  [% FOREACH item = browse_items %]
+   [% PROCESS browsedbitems_list.html %]
+  [% END %]
+ [% END %]
 </table>
 
 </body>