[Slim-Checkins] r10550 - in /branches/6.5/server: Changelog6.html
HTML/EN/songinfo.html
HTML/NBMU/songinfo.html HTML/Nokia770/songinfo.html
kdf at svn.slimdevices.com
kdf at svn.slimdevices.com
Wed Nov 1 17:37:25 PST 2006
Author: kdf
Date: Wed Nov 1 17:37:23 2006
New Revision: 10550
URL: http://svn.slimdevices.com?rev=10550&view=rev
Log:
Bug: 4457
Description: merge -r10548:10549 from trunk
Modified:
branches/6.5/server/Changelog6.html
branches/6.5/server/HTML/EN/songinfo.html
branches/6.5/server/HTML/NBMU/songinfo.html
branches/6.5/server/HTML/Nokia770/songinfo.html
Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10550&r1=10549&r2=10550&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Wed Nov 1 17:37:23 2006
@@ -112,6 +112,7 @@
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4432">#4432</a> - Purge of FileCache stalls slimserver for large collections</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4447">#4447</a> - lowercase tooltips</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4450">#4450</a> - With the Nokia770 skin, the genre hyperlink on the track info page doesn't filter by genre</li>
+ <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4457">#4457</a> - Nokia770 song info page doesn't delimit multiple artists with a comma</li>
</ul>
</ul>
Modified: branches/6.5/server/HTML/EN/songinfo.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/EN/songinfo.html?rev=10550&r1=10549&r2=10550&view=diff
==============================================================================
--- branches/6.5/server/HTML/EN/songinfo.html (original)
+++ branches/6.5/server/HTML/EN/songinfo.html Wed Nov 1 17:37:23 2006
@@ -44,12 +44,14 @@
</li>
[% END %]
- [% genres = itemobj.genres %]
- [% IF genres %]
+ [% IF itemobj.genres %] [% genresHTML = [] %]
<li><div class="songInfoTitle">[% "GENRE" | string; "COLON" | string %]</div>
- <div class="songInfoText">[% FOREACH genre = genres %]
- <a href="browsedb.html?hierarchy=genre,contributor,album,track&level=1&genre.id=[% genre.id %]&player=[% playerURI %]" target="browser">[% genre.name | html %]</a>
- [% END %]</div>
+ <div class="songInfoText">
+ [% FOREACH genre = itemobj.genres.sort %]
+ [% genreHTMLFrag = "<a href=\"browsedb.html?hierarchy=genre,contributor,album,track&level=1&genre.id=$genre.id&player=$playerURI\" target=\"browser\">$genre.name</a>" %]
+ [% genresHTML.push(genreHTMLFrag) %]
+ [% END %]
+ [% genresHTML.join(', ') %]</div>
</li>
[% END %]
Modified: branches/6.5/server/HTML/NBMU/songinfo.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/NBMU/songinfo.html?rev=10550&r1=10549&r2=10550&view=diff
==============================================================================
--- branches/6.5/server/HTML/NBMU/songinfo.html (original)
+++ branches/6.5/server/HTML/NBMU/songinfo.html Wed Nov 1 17:37:23 2006
@@ -24,17 +24,21 @@
[% FOREACH role = itemobj.contributorRoles.sort %]
[% contributors = itemobj.contributorsOfType(role) %]
+
[% IF contributors %]
+ <tr>
+ <td>[% role | upper | string; "COLON" | string %]</td>
+ [% contributorsHTML = [] %]
- <tr>
- <td> [% role | upper | string; "COLON" | string %]</td>
- <td>
+ <td>[% FOREACH contributor = contributors.sort %]
- [% FOREACH contributor = contributors.sort %]
- <a href="browsedb.html?hierarchy=contributor,album,track&level=1&contributor.id=[% contributor.id %]&player=[% playerURI %]" target="browser">[% contributor.name | html %]</a>
- [% END %]
+ [% contributorHTMLFrag = "<a href=\"browsedb.html?hierarchy=contributor,album,track&level=1&contributor.id=$contributor.id&player=$playerURI\" target=\"browser\">$contributor.name</a>" %]
- </td>
+ [% contributorsHTML.push(contributorHTMLFrag) %]
+
+ [% END %]
+
+ [% contributorsHTML.join(', ') %]</td>
</tr>
[% END %]
@@ -49,18 +53,25 @@
</td>
</tr>
[% END %]
- [% genres = itemobj.genres %]
- [% IF genres %]
+ [% IF itemobj.genres %][% genresHTML = [] %]
+
<tr>
+
+ <td>[% "GENRE" | string %][% "COLON" | string %]</td>
+
<td>
- [% "GENRE" | string %][% "COLON" | string %]
+
+ [% FOREACH genre = itemobj.genres.sort %]
+
+ [% genreHTMLFrag = "<a href=\"browsedb.html?hierarchy=genre,contributor,album,track&level=1&genre.id=$genre.id&player=$playerURI\" target=\"browser\">$genre.name</a>" %]
+ [% genresHTML.push(genreHTMLFrag) %]
+ [% END %]
+
+ [% genresHTML.join(', ') %]
</td>
- <td>
- [% FOREACH genre = genres %]
- <a href="browsedb.html?hierarchy=contributor,album,track&level=0&genre.id=[% genre.id %]&player=[% playerURI %]" target="browser">[% genre.name %]</a>
- [% END %]
- </td>
+
</tr>
+
[% END %] [% IF itemobj.tracknum %]
<tr>
<td>
Modified: branches/6.5/server/HTML/Nokia770/songinfo.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Nokia770/songinfo.html?rev=10550&r1=10549&r2=10550&view=diff
==============================================================================
--- branches/6.5/server/HTML/Nokia770/songinfo.html (original)
+++ branches/6.5/server/HTML/Nokia770/songinfo.html Wed Nov 1 17:37:23 2006
@@ -25,20 +25,20 @@
<table width="100%" cellspacing="0" cellpadding="5" border="0">
<tr>
<td align="left" colspan = 2>
- <table width = '75'><tr>
- [% PROCESS browsecontrols_abbr
- itemobj = itemobj
- attributes = attributes
- odd = odd
- mixerlinks = mixerlinks %]
- </tr></table>
+ <table width = '75'><tr>
+ [% PROCESS browsecontrols_abbr
+ itemobj = itemobj
+ attributes = attributes
+ odd = odd
+ mixerlinks = mixerlinks %]
+ </tr></table>
</td>
</tr>
<tr>
<td valign = 'top'>
<table border = '0'>
- <tr>
- <td class = 'smallitemtext'>
+ <tr>
+ <td class = 'smallitemtext'>
<nobr>[% "TITLE" | string %][% "COLON" | string %]</nobr>
</td>
<td class = 'smallitemtext'>
@@ -46,73 +46,82 @@
</td>
</tr>
[% FOREACH role = itemobj.contributorRoles.sort %]
- [% contributors = itemobj.contributorsOfType(role) %]
- [% IF contributors %]
+
+ [% contributors = itemobj.contributorsOfType(role) %]
+
+ [% IF contributors %]
+ <tr>
+ <td class = 'smallitemtext'>[% role | upper | string; "COLON" | string %]</td>
+ [% contributorsHTML = [] %]
+
+ <td class = 'smallitemtext'>[% FOREACH contributor = contributors.sort %]
+
+ [% contributorHTMLFrag = "<a href=\"browsedb.html?hierarchy=contributor,album,track&level=1&contributor.id=$contributor.id&player=$playerURI\" target=\"browser\">$contributor.name</a>" %]
+
+ [% contributorsHTML.push(contributorHTMLFrag) %]
+
+ [% END %]
+
+ [% contributorsHTML.join(', ') %]</td>
+ </tr>
+ [% END %]
+
+ [% END %]
+ [% IF itemobj.album %]
<tr>
<td class = 'smallitemtext'>
- [% role | upper | string; "COLON" | string %]
+ [% "ALBUM" | string %][% "COLON" | string %]
+ </td>
+ <td class = 'smallitemtext'>
+ <a href="browsedb.html?hierarchy=contributor,album,track&level=2&album.id=[% itemobj.album.id %]&player=[% playerURI %]" style="text-decoration:none">[% itemobj.album.title %]</a>
+ </td>
+ </tr>
+ [% END %]
+ [% IF itemobj.genres %][% genresHTML = [] %]
+ <tr>
+ <td class = 'smallitemtext'>
+ [% "GENRE" | string %][% "COLON" | string %]
</td>
<td class = 'smallitemtext'>
- [% FOREACH contributor = contributors.sort %]
- <a href="browsedb.html?hierarchy=contributor,album,track&level=1&contributor.id=[% contributor.id %]&player=[% playerURI %]" style="text-decoration:none">[% contributor.name | html %]</a>
+ [% FOREACH genre = itemobj.genres.sort %]
+ [% genreHTMLFrag = "<a href=\"browsedb.html?hierarchy=genre,contributor,album,track&level=1&genre.id=$genre.id&player=$playerURI\" style=\"text-decoration:none\">$genre.name</a>" %]
+ [% genresHTML.push(genreHTMLFrag) %]
[% END %]
+ [% genresHTML.join(', ') %]
</td>
+ [% END %]
</tr>
- [% END %]
- [% END %] [% IF itemobj.album %]
- <tr>
- <td class = 'smallitemtext'>
- [% "ALBUM" | string %][% "COLON" | string %]
- </td>
- <td class = 'smallitemtext'>
- <a href="browsedb.html?hierarchy=contributor,album,track&level=2&album.id=[% itemobj.album.id %]&player=[% playerURI %]" style="text-decoration:none">[% itemobj.album.title %]</a>
- </td>
- </tr>
- [% END %]
- [% genres = itemobj.genres %]
- [% IF genres %]
- <tr>
- <td class = 'smallitemtext'>
- [% "GENRE" | string %][% "COLON" | string %]
- </td>
- <td class = 'smallitemtext'>
- [% FOREACH genre = genres %]
- <a href="browsedb.html?hierarchy=genre,contributor,album,track&level=1&genre.id=[% genre.id %]&player=[% playerURI %]"style="text-decoration:none">[% genre.name %]</a>
- [% END %]
- </td>
- [% END %]
- </tr>
</table>
</td>
<td valign = 'top'>
<table>
[% IF itemobj.tracknum %]
- <tr>
- <td class = 'smallitemtext'>
- [% "TRACK" | string %][% "COLON" | string %]
- </td>
- <td class = 'smallitemtext'>
- [% itemobj.tracknum %]
- </td>
- </tr>
- [% END %] [% IF itemobj.duration %]
- <tr>
- <td class = 'smallitemtext'>
- [% "LENGTH" | string %][% "COLON" | string %]
- </td>
- <td class = 'smallitemtext'>
- [% itemobj.duration %]
- </td>
- </tr>
- [% END %] [% IF itemobj.year %]
- <tr>
- <td class = 'smallitemtext'>
- [% "YEAR" | string %][% "COLON" | string %]
- </td>
- <td class = 'smallitemtext'>
- [% itemobj.year %]
- </td>
- </tr>
+ <tr>
+ <td class = 'smallitemtext'>
+ [% "TRACK" | string %][% "COLON" | string %]
+ </td>
+ <td class = 'smallitemtext'>
+ [% itemobj.tracknum %]
+ </td>
+ </tr>
+ [% END %] [% IF itemobj.duration %]
+ <tr>
+ <td class = 'smallitemtext'>
+ [% "LENGTH" | string %][% "COLON" | string %]
+ </td>
+ <td class = 'smallitemtext'>
+ [% itemobj.duration %]
+ </td>
+ </tr>
+ [% END %] [% IF itemobj.year %]
+ <tr>
+ <td class = 'smallitemtext'>
+ [% "YEAR" | string %][% "COLON" | string %]
+ </td>
+ <td class = 'smallitemtext'>
+ [% itemobj.year %]
+ </td>
+ </tr>
[% END %] [% IF itemobj.replay_gain.defined %]
<tr>
<td class = 'smallitemtext'>[% "REPLAYGAIN" | string; "COLON" | string %]</td>
@@ -123,57 +132,57 @@
<td class = 'smallitemtext'>[% "ALBUMREPLAYGAIN" | string; "COLON" | string %]</td>
<td class = 'smallitemtext'>[% itemobj.album.replay_gain | format('%2.2f') | html %] dB</td>
</tr>
- [% END %] [% IF comment %]
- <tr>
- <td class = 'smallitemtext'>
- [% "COMMENT" | string %][% "COLON" | string %]
- </td>
- <td class = 'smallitemtext'>
- [% comment %]
- </td>
- </tr>
+ [% END %] [% IF comment %]
+ <tr>
+ <td class = 'smallitemtext'>
+ [% "COMMENT" | string %][% "COLON" | string %]
+ </td>
+ <td class = 'smallitemtext'>
+ [% comment %]
+ </td>
+ </tr>
[% END %] [% IF itemobj.lyrics %]
- <tr>
- <td class = 'smallitemtext'>
- [% "LYRICS" | string %][% "COLON" | string %]
- </td>
- <td class = 'smallitemtext'>
- [% itemobj.lyrics | html_line_break | html_para %]
- </td>
- </tr>
- [% END %] [% IF filelength %]
- <tr>
- <td class = 'smallitemtext'>
- [% "FILELENGTH" | string %][% "COLON" | string %]
- </td>
- <td class = 'smallitemtext'>
- [% filelength %] [% "BYTES" | string %]
- </td>
- </tr>
- [% END %] [% IF itemobj.prettyBitRate %]
- <tr>
- <td class = 'smallitemtext'>
- [% "BITRATE" | string %][% "COLON" | string %]
- </td>
- <td class = 'smallitemtext'>
- [% itemobj.prettyBitRate %]
- </td>
- </tr>
- [% END %][% IF itemobj.samplerate %]
- <tr>
- <td class = 'smallitemtext'>[% "SAMPLERATE" | string; "COLON" | string %]</td>
- <td class = 'smallitemtext'>[% itemobj.prettySampleRate | html %] </td>
- </tr>
- [% END %] [% IF itemobj.tagversion %]
- <tr>
- <td class = 'smallitemtext'>
- [% "TAGVERSION" | string %][% "COLON" | string %]
- </td>
- <td class = 'smallitemtext'>
- [% itemobj.tagversion %]
- </td>
- </tr>
- [% END %]
+ <tr>
+ <td class = 'smallitemtext'>
+ [% "LYRICS" | string %][% "COLON" | string %]
+ </td>
+ <td class = 'smallitemtext'>
+ [% itemobj.lyrics | html_line_break | html_para %]
+ </td>
+ </tr>
+ [% END %] [% IF filelength %]
+ <tr>
+ <td class = 'smallitemtext'>
+ [% "FILELENGTH" | string %][% "COLON" | string %]
+ </td>
+ <td class = 'smallitemtext'>
+ [% filelength %] [% "BYTES" | string %]
+ </td>
+ </tr>
+ [% END %] [% IF itemobj.prettyBitRate %]
+ <tr>
+ <td class = 'smallitemtext'>
+ [% "BITRATE" | string %][% "COLON" | string %]
+ </td>
+ <td class = 'smallitemtext'>
+ [% itemobj.prettyBitRate %]
+ </td>
+ </tr>
+ [% END %][% IF itemobj.samplerate %]
+ <tr>
+ <td class = 'smallitemtext'>[% "SAMPLERATE" | string; "COLON" | string %]</td>
+ <td class = 'smallitemtext'>[% itemobj.prettySampleRate | html %] </td>
+ </tr>
+ [% END %] [% IF itemobj.tagversion %]
+ <tr>
+ <td class = 'smallitemtext'>
+ [% "TAGVERSION" | string %][% "COLON" | string %]
+ </td>
+ <td class = 'smallitemtext'>
+ [% itemobj.tagversion %]
+ </td>
+ </tr>
+ [% END %]
</table>
</td>
</tr>
More information about the checkins
mailing list