[Slim-Checkins] r15126 - in /trunk/server: HTML/Default/pageheader.html HTML/Default/slimserver.css Slim/Web/XMLBrowser.pm

Mon Dec 10 02:59:43 PST 2007

Author: mherger
Date: Mon Dec 10 02:59:41 2007
New Revision: 15126

URL: http://svn.slimdevices.com?rev=15126&view=rev
Log:
Bug: 6279
Description: display service partner icon in web ui page header

Modified:
    trunk/server/HTML/Default/pageheader.html
    trunk/server/HTML/Default/slimserver.css
    trunk/server/Slim/Web/XMLBrowser.pm

Modified: trunk/server/HTML/Default/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Default/pageheader.html?rev=15126&r1=15125&r2=15126&view=diff
==============================================================================

--- trunk/server/HTML/Default/pageheader.html (original)
+++ trunk/server/HTML/Default/pageheader.html Mon Dec 10 02:59:41 2007
@@ -48,7 +48,13 @@
 	</head>
 	<body  [% IF bodyscript && NOT extJsScripts; bodyscript; END %]>
 		<div id="inner_header">
-			<div class="pagetitle">[% pagetitle %]</div>
+
+			<div class="pagetitle [%- IF pageicon -%]pagetitleWithIcon[% END %]">
+				[%- IF pageicon -%]
+				<img src="[% webroot %][% pageicon.replace('.png', "_25x25_f.png") %]" class="pageicon" width="25" border="0" alt="[% pagetitle %]">
+				[%- END -%]
+				<span>[% pagetitle %]</span>
+			</div>
 		</div>
 
 		<div class="inner_content">

Modified: trunk/server/HTML/Default/slimserver.css
URL: http://svn.slimdevices.com/trunk/server/HTML/Default/slimserver.css?rev=15126&r1=15125&r2=15126&view=diff
==============================================================================
--- trunk/server/HTML/Default/slimserver.css (original)
+++ trunk/server/HTML/Default/slimserver.css Mon Dec 10 02:59:41 2007
@@ -324,6 +324,20 @@
 	padding-left: 10px;
 	font-size: 14px;
 	font-weight: bold;
+}
+
+div.pagetitleWithIcon {
+	margin-bottom: 8px;
+}
+
+.pagetitleWithIcon span {
+	position: relative;
+	top: 5px;
+}
+
+.pageicon {
+	float: left;
+	padding-right: 3px;
 }
 
 #crumblist {

Modified: trunk/server/Slim/Web/XMLBrowser.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/XMLBrowser.pm?rev=15126&r1=15125&r2=15126&view=diff
==============================================================================
--- trunk/server/Slim/Web/XMLBrowser.pm (original)
+++ trunk/server/Slim/Web/XMLBrowser.pm Mon Dec 10 02:59:41 2007
@@ -106,6 +106,7 @@
 	my ( $client, $stash, $callback, $httpClient, $response ) = @{ $params->{'args'} };
 	
 	$stash->{'pagetitle'} = $feed->{'title'} || string($params->{'title'});
+	$stash->{'pageicon'}  = $Slim::Web::Pages::additionalLinks{icons}{$params->{'title'}};
 	
 	my $template = 'xmlbrowser.html';
 	
@@ -415,6 +416,7 @@
 	
 	my $title = string($params->{'title'});
 	$stash->{'pagetitle'} = $title;
+	$stash->{'pageicon'}  = $Slim::Web::Pages::additionalLinks{icons}{$params->{'title'}};
 	$stash->{'msg'} = sprintf(string('WEB_XML_ERROR'), $title, $error);
 	
 	my $output = processTemplate($template, $stash);
@@ -492,7 +494,7 @@
 	handleFeed( $parent, $params );
 }
 
-sub processTemplate {	
+sub processTemplate {
 	return Slim::Web::HTTP::filltemplatefile( @_ );
 }
 

