[Slim-Checkins] r10137 - in /branches/6.5/server: Changelog6.html HTML/EN/songinfo.html HTML/NBMU/songinfo.html

[kdf at svn.slimdevices.com]

Author: kdf
Date: Mon Oct  2 18:05:09 2006
New Revision: 10137

URL: http://svn.slimdevices.com?rev=10137&view=rev
Log:
Bug: 3044
Description: merge -r10135:10136 from trunki


Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/HTML/EN/songinfo.html
    branches/6.5/server/HTML/NBMU/songinfo.html

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10137&r1=10136&r2=10137&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Mon Oct  2 18:05:09 2006
@@ -3,6 +3,7 @@
 <ul>
 	<li>Bug Fixes:
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2985">#2985</a> - WMA transcoded to WAV truncated (not gapless)</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3044">#3044</a> - Lyrics do not display with line spacing correctly (again)</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3318">#3318</a> - MusicMagic: Songs with national chars get duplicated</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3696">#3696</a> - Random Mix fails</li>
  		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3915">#3915</a> - Softsqueeze animate on screen 2 clears screen 1</li>

Modified: branches/6.5/server/HTML/EN/songinfo.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/EN/songinfo.html?rev=10137&r1=10136&r2=10137&view=diff
==============================================================================
--- branches/6.5/server/HTML/EN/songinfo.html (original)
+++ branches/6.5/server/HTML/EN/songinfo.html Mon Oct  2 18:05:09 2006
@@ -115,7 +115,7 @@
 	
 		[% IF itemobj.lyrics %] 
 			<li><div class="songInfoTitle">[% "LYRICS" | string; "COLON" | string %]</div>
-				<div class="songInfoText">[% itemobj.lyrics | html %]</div>
+				<div class="songInfoText">[% itemobj.lyrics | html | html_para %]</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=10137&r1=10136&r2=10137&view=diff
==============================================================================
--- branches/6.5/server/HTML/NBMU/songinfo.html (original)
+++ branches/6.5/server/HTML/NBMU/songinfo.html Mon Oct  2 18:05:09 2006
@@ -113,7 +113,7 @@
 			[% "LYRICS" | string %][% "COLON" | string %]
 		</td>
 		<td>
-			[% itemobj.lyrics %] 
+			[% itemobj.lyrics | html | html_para %]
 		</td>
 	</tr>
 	[% END %] [% IF filelength %]