[Slim-Checkins] r12604 - in /trunk/server/HTML: Nokia770/browsedb.html Nokia770/browsedbitems_list.html Nokia770/cmdwrappers Nokia770/searchinput.html Nokia770/slimserver.css Touch/slimserver.css
bklaas at svn.slimdevices.com
bklaas at svn.slimdevices.com
Sat Aug 18 21:37:23 PDT 2007
Author: bklaas
Date: Sat Aug 18 21:37:23 2007
New Revision: 12604
URL: http://svn.slimdevices.com?rev=12604&view=rev
Log:
Loads of changes to layout row data smarter, especially for supporting mixer links like MusicIP
Modified:
trunk/server/HTML/Nokia770/browsedb.html
trunk/server/HTML/Nokia770/browsedbitems_list.html
trunk/server/HTML/Nokia770/cmdwrappers
trunk/server/HTML/Nokia770/searchinput.html
trunk/server/HTML/Nokia770/slimserver.css
trunk/server/HTML/Touch/slimserver.css
Modified: trunk/server/HTML/Nokia770/browsedb.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/browsedb.html?rev=12604&r1=12603&r2=12604&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/browsedb.html (original)
+++ trunk/server/HTML/Nokia770/browsedb.html Sat Aug 18 21:37:23 2007
@@ -110,13 +110,13 @@
<table width = '100%' class = 'noborder' bgcolor = 'white'>
<tr>
+ <td valign = 'top' width = '205'>
[% IF coverArt %]
- <td valign = 'top' width = '205'>
<img src="/music/[% coverArt %]/thumb_[% IF thumbSize %][% thumbSize %]x[% thumbSize %][% ELSE %]200x200[% END %]_f_000000.jpg" STYLE="border: 1px solid black" id = 'albumArt'>
+[% END %]
</td>
-[% END %]
- <td valign = 'top'>
- <table cellspacing="0" border="0" cellpadding="0" width="100%" bgcolor = 'white' id = 'browsetable'>
+ </tr>
+</table>
[% IF browse_items %]
[% FOREACH item = browse_items %]
[% PROCESS browsedbitems_list.html %]
@@ -124,10 +124,6 @@
[% ELSE %]
[% browse_list %]
[% END %]
- </table>
- </td>
- </tr>
-</table>
[% END %]
<p>
<table border="0" class = 'floater' width="100%" bgcolor="#EEEEEE">
Modified: trunk/server/HTML/Nokia770/browsedbitems_list.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/browsedbitems_list.html?rev=12604&r1=12603&r2=12604&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/browsedbitems_list.html (original)
+++ trunk/server/HTML/Nokia770/browsedbitems_list.html Sat Aug 18 21:37:23 2007
@@ -4,10 +4,8 @@
[% "$item.heading" _ "SMATCHING" | string %] "[% query %]"[% "COLON" | string %][% item.numresults %]
</div>
[% ELSE %]
-<tr [% IF rowClass %]class = "[% rowClass %]"[% ELSIF item.odd %]class="odd"[% ELSE %]class="even"[% END %]>
- <td width = '80'>
- <table width = '100%' class = 'noborder'>
- <tr>
+<div [% IF rowClass %]class = "[% rowClass %][% ELSIF item.odd %]class="even[% ELSE %]class="odd[% END %] buffered">
+
[% PROCESS browsecontrols_abbr
itemobj = item.itemobj
attributes = item.attributes
@@ -20,21 +18,15 @@
playallhref = item.playallhref
addallhref = item.addallhref
href = item.href %]
- </tr>
- </table>
- </td>
- <td align = 'left'>
- <table width = '100%' class = 'noborder'>
- <tr>
- <td class = '[% IF textClass %][% textClass %][% ELSE %]itemtext[% END %]' align = 'left'>
+ <span class = '[% IF textClass %][% textClass %][% ELSE %]itemtext[% END %]' align = 'left'>
+ <span class = 'rowtext'>
[%- IF noLink %]
[% item.text | html %]
[%- ELSE %]
[% PROCESS iteminfo %]
[%- END %]
- </td>
- </tr>
- </table>
- </td>
-</tr>
+
+ </span>
+ </span>
+</div>
[% END %]
Modified: trunk/server/HTML/Nokia770/cmdwrappers
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/cmdwrappers?rev=12604&r1=12603&r2=12604&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/cmdwrappers (original)
+++ trunk/server/HTML/Nokia770/cmdwrappers Sat Aug 18 21:37:23 2007
@@ -9,7 +9,7 @@
[% notarget = 1 %]
[% BLOCK cmdlink %]
- <a [% content %]><img src="[% webroot %]html/images/[% cmdimage %]" border=0 height="20" alt='[% cmdtitle | string | ucfirst %]' title='[% cmdtitle | string | ucfirst %]'></a>
+ <span class = 'buttonControls'><a [% content %]><img src="[% webroot %]html/images/[% cmdimage %]" border=0 alt='[% cmdtitle | string | ucfirst %]' title='[% cmdtitle | string | ucfirst %]'></a></span>
[% END %]
[% BLOCK dummylink -%]
@@ -161,6 +161,7 @@
[% END %]
[% BLOCK browsecontrols_abbr %]
+ <span class="[% isCurrent ? "listing2" : "listing" %]" align="center">
[% width='20' height='20' %]
[% IF showplayall %]
[% WRAPPER playlink noTarget = 1 %]href="[% playallhref %]"[% END %]
@@ -173,9 +174,7 @@
[% END %]
[% ELSE %]
[%- IF playLink == 'ajax' %]
- <span class = 'listing' align = 'center'>
- <img src="[% webroot %]html/images/play.this.gif" onClick = 'changeOSD("[% IF itemobj.title == '' %][% "ALL_SONGS" | string %][% ELSE %][% itemobj.title FILTER html FILTER replace('\'', ''') %][% END %] [% "NOW_PLAYING" | string %]"); addItem("[% PROCESS ajaxCmdHRef cmdType='play' %]");' border=0 height="20" alt='Play Now' title='Play Now'>
- </span>
+ <span class = 'buttonControls'><img src="[% webroot %]html/images/play.this.gif" onClick = 'changeOSD("[% IF itemobj.title == '' %][% "ALL_SONGS" | string %][% ELSE %][% itemobj.title FILTER html FILTER replace('\'', ''') %][% END %] [% "NOW_PLAYING" | string %]"); addItem("[% PROCESS ajaxCmdHRef cmdType='play' %]");' border=0 height="20" alt='Play Now' title='Play Now'></span>
[%- ELSE %]
[% WRAPPER playlink %][% PROCESS cmdHRef cmdType='play' statusroot = 'status.html' %][% END %]
[%- END %]
@@ -183,14 +182,13 @@
[%- IF addLink == 'noajax' %]
[% WRAPPER addlink %][% PROCESS cmdHRef cmdType='add' statusroot = 'playlist.html' %][% END %]
[%- ELSE %]
- <span class = 'listing' align = 'center'>
- <img src="[% webroot %]html/images/add.gif" onClick = 'changeOSD("[% "ADDING_TO_PLAYLIST" | string %] [% IF itemobj.title == '' %][% "ALL_SONGS" | string %][% ELSE %][% itemobj.title FILTER html FILTER replace('\'',''') %][% END %]"); addItem("[% PROCESS ajaxCmdHRef cmdType='add' %]");' border=0 height="20" alt='Add to playlist' title='Add to playlist'>
- </span>
+ <span class = 'buttonControls'><img src="[% webroot %]html/images/add.gif" onClick = 'changeOSD("[% "ADDING_TO_PLAYLIST" | string %] [% IF itemobj.title == '' %][% "ALL_SONGS" | string %][% ELSE %][% itemobj.title FILTER html FILTER replace('\'',''') %][% END %]"); addItem("[% PROCESS ajaxCmdHRef cmdType='add' %]");' border=0 alt='Add to playlist' title='Add to playlist'></span>
[%- END %]
[% FOREACH mixer = mixerlinks.values.sort %]
- <span class="[% isCurrent ? "listing2" : "listing" %]" align="center">[% PROCESS $mixer %]</span>
+ <span class = 'buttonControls'>[% PROCESS $mixer %]</span>
[% END %]
[% END %]
+ </span>
[% END %]
[% BLOCK browsecontrols %]
@@ -237,7 +235,7 @@
[% item.text | html %]
[% END %]
- [%# INCLUDE by_from_info %]
+ [% INCLUDE by_from_info %]
[% END %]
[% BLOCK ajax_by_from_info %]
Modified: trunk/server/HTML/Nokia770/searchinput.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/searchinput.html?rev=12604&r1=12603&r2=12604&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/searchinput.html (original)
+++ trunk/server/HTML/Nokia770/searchinput.html Sat Aug 18 21:37:23 2007
@@ -1,9 +1,9 @@
<!-- searchinput.html -->
<center>
+<form name="FormSong" method="Get" action = '[% webroot %]search.html'>
<table width = '100%' bgcolor = '#EEEEEE'>
<tr><td>
-<form name="FormSong" method="Get" action = '[% webroot %]search.html'>
<table width="100%" bgcolor="#EEEEEE" cellpadding="0" cellspacing="0" border="0">
<tr>
@@ -13,16 +13,18 @@
<tr><td height="20"></td></tr>
<tr><td colspan="8" height="30" align = 'center'>
- <input type=hidden value="track" name="type">
- <input type=text name="query" value="[% query %]" size="20" class = 'searchForm'>
+ <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="[% player %]" name="player">
- <input type=hidden value="1" name="manualSearch">
+ <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 %]
Modified: trunk/server/HTML/Nokia770/slimserver.css
URL: http://svn.slimdevices.com/trunk/server/HTML/Nokia770/slimserver.css?rev=12604&r1=12603&r2=12604&view=diff
==============================================================================
--- trunk/server/HTML/Nokia770/slimserver.css (original)
+++ trunk/server/HTML/Nokia770/slimserver.css Sat Aug 18 21:37:23 2007
@@ -208,6 +208,11 @@
}
tr.even, td.even, div.even {
background-color: #FFFFFF;
+}
+
+div.buffered {
+ padding-top: 5px;
+ padding-bottom: 5px;
}
div#page {
@@ -329,6 +334,15 @@
overflow: hidden;
}
+
+span.buttonControls {
+ padding: 8 8 8 8;
+}
+
+
+span.rowtext {
+ padding: 8 8 8 8;
+}
div#controls {
position: absolute;
@@ -534,6 +548,7 @@
.listing {
padding-left: 10px;
+ clear: none;
}
div.fileselectorautocomplete {
Modified: trunk/server/HTML/Touch/slimserver.css
URL: http://svn.slimdevices.com/trunk/server/HTML/Touch/slimserver.css?rev=12604&r1=12603&r2=12604&view=diff
==============================================================================
--- trunk/server/HTML/Touch/slimserver.css (original)
+++ trunk/server/HTML/Touch/slimserver.css Sat Aug 18 21:37:23 2007
@@ -18,6 +18,14 @@
background-color: #EEEEEE;
}
+div {
+ overflow: visible;
+}
+
+img {
+ border: 0;
+}
+
a {
outline: none;
}
@@ -166,13 +174,7 @@
padding-bottom: 8px;
}
-div {
- overflow: visible;
-}
-
-img {
- border: 0;
-}
+
div#pagecontainer {
top: 80; height: 85%; overflow-y: auto; width: 100%; position: absolute; z-index: 2;
@@ -204,7 +206,7 @@
padding-bottom: 10px;
}
-tr.even, td.even, div.odd {
+tr.even, td.even, div.even {
background-color: #FFFFFF;
padding-top: 10px;
padding-bottom: 10px;
@@ -596,3 +598,18 @@
cursor: pointer;
white-space: nowrap
}
+
+div.buffered {
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+
+
+span.buttonControls {
+ padding: 8 8 8 8;
+}
+
+
+span.rowtext {
+ padding: 8 8 8 8;
+}
More information about the checkins
mailing list