[Slim-Checkins] r11831 - in /branches/6.5/server: Changelog6.html HTML/Fishbone/cmdwrappers_Fishbone HTML/Fishbone/pageheader.html HTML/Fishbone/skin.css

kdf at svn.slimdevices.com kdf at svn.slimdevices.com
Wed Apr 25 20:08:05 PDT 2007


Author: kdf
Date: Wed Apr 25 20:08:04 2007
New Revision: 11831

URL: http://svn.slimdevices.com?rev=11831&view=rev
Log:
Bug: 4910
Description: fix progress bar height for IE6, add upnp controls to fishbone browse pages


Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/HTML/Fishbone/cmdwrappers_Fishbone
    branches/6.5/server/HTML/Fishbone/pageheader.html
    branches/6.5/server/HTML/Fishbone/skin.css

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=11831&r1=11830&r2=11831&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Wed Apr 25 20:08:04 2007
@@ -48,7 +48,8 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4872">#4872</a> - Installer: Error creating INI entry in Logitech.url</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4891">#4891</a> - "Play this song" and "Add this song to playlist" links are not always visible.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4902">#4902</a> - BMF: correctly display and follow Windows shortcuts pointing to a drive; fix an issue with the path display on the player interface</li>
-		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4902">#4907</a> - Dark Skin:  Song Info not visible.</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4907">#4907</a> - Dark Skin:  Song Info not visible.</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4910">#4910</a> - Fishbone skin:  Some texts are cut off.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4924">#4924</a> - Nice to have: Up and Down buttons for PlayList on Dark skin</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4926">#4926</a> - Mac Installer & Preference Pane still shows 6.5.1 should be 6.5.2</li>
 	</ul>

Modified: branches/6.5/server/HTML/Fishbone/cmdwrappers_Fishbone
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/cmdwrappers_Fishbone?rev=11831&r1=11830&r2=11831&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/cmdwrappers_Fishbone (original)
+++ branches/6.5/server/HTML/Fishbone/cmdwrappers_Fishbone Wed Apr 25 20:08:04 2007
@@ -56,14 +56,25 @@
 
 [% BLOCK browsecontrols -%]
 	[% width='9' height='11' target='status' %]
-	[%- WRAPPER playlink   -%][%- PROCESS cmdHRef cmdType='play'   -%][%- END %]
-	[%- WRAPPER insertlink -%][%- PROCESS cmdHRef cmdType='insert' -%][%- END %]
-	[%- WRAPPER addlink    -%][%- PROCESS cmdHRef cmdType='add'    -%][%- END %]
-	[%- WRAPPER removelink -%][%- PROCESS cmdHRef cmdType='remove' -%][%- END %]
-	<span class="mixers">[%- FOREACH mixer = mixerlinks.values.sort -%]
-		[%- PROCESS $mixer -%]
-	[%- END %]</span>
-[%- END %]
+	[% IF showplayall %]
+		[% WRAPPER playlink noTarget = 1 %]href="[% playallhref %]"[% END %]
+		[% WRAPPER addlink  noTarget = 1 %]href="[% addallhref %]"[% END %]
+	[% ELSIF showdescend && href %]
+		[% WRAPPER descendlink %][% href %][% END %]
+		[% IF showplay %]
+			[% WRAPPER playlink %][% PROCESS cmdHRef cmdType='play' %][% END %]
+			[% WRAPPER addlink  %][% PROCESS cmdHRef cmdType='add'  %][% END %]
+		[% END %]
+	[% ELSE %]
+		[%- WRAPPER playlink   -%][%- PROCESS cmdHRef cmdType='play'   -%][%- END %]
+		[%- WRAPPER insertlink -%][%- PROCESS cmdHRef cmdType='insert' -%][%- END %]
+		[%- WRAPPER addlink    -%][%- PROCESS cmdHRef cmdType='add'    -%][%- END %]
+		[%- WRAPPER removelink -%][%- PROCESS cmdHRef cmdType='remove' -%][%- END %]
+		[%- FOREACH mixer = mixerlinks.values.sort -%]
+			[%- PROCESS $mixer -%]
+		[%- END -%]
+	[% END %]
+[%- END -%]
 
 [%# taken from EN/cmdwrappers as an override %]
 [% BLOCK contentitem -%]
@@ -76,9 +87,9 @@
 		[%- content | indent(4) %]
 		[%- IF controls -%]
 			<div class="browsedbControls">
-			[%- PROCESS $controls -%]
-			</div>
-		[%- END %]
+			[%- PROCESS $controls %]
+		</div>
+		[%- END -%]
 	</div>
 </div>
 [%- END %]

Modified: branches/6.5/server/HTML/Fishbone/pageheader.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/pageheader.html?rev=11831&r1=11830&r2=11831&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/pageheader.html (original)
+++ branches/6.5/server/HTML/Fishbone/pageheader.html Wed Apr 25 20:08:04 2007
@@ -24,7 +24,7 @@
 		he\ight: auto;
 	}
 	.browsedbControls {
-		padding-right: 20px;
+		padding-right: 8px;
 	}
 	.playlistControls {
 		padding-right: 8px;

Modified: branches/6.5/server/HTML/Fishbone/skin.css
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/skin.css?rev=11831&r1=11830&r2=11831&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/skin.css (original)
+++ branches/6.5/server/HTML/Fishbone/skin.css Wed Apr 25 20:08:04 2007
@@ -133,14 +133,15 @@
 .browsedbListItem {
 	position: relative;
 	padding: 0px;
-	padding-right: 100px;
+	padding-right: 80px;
 }
 
 .browsedbControls,.playlistControls {
+	position: absolute;
+	top: 0px;
 	right: 1px;
 	padding: 0px;
 	margin: 0px;
-	float: right;
 }
 
 .browsedbControls a, .playlistControls a {
@@ -453,7 +454,7 @@
 	padding: 0px;
 	top: 0px;
 	float: left;
-	width: 5%;
+	width: 4.9%;
 }
 
 #TopMenu1



More information about the checkins mailing list