[Slim-Checkins] r10007 - in /branches/6.5/server: HTML/EN/html/global.js HTML/EN/html/ping.html HTML/EN/ping.html Slim/Web/Pages.pm

[kdf at svn.slimdevices.com]

Author: kdf
Date: Fri Sep 22 21:50:19 2006
New Revision: 10007

URL: http://svn.slimdevices.com?rev=10007&view=rev
Log:
Bug: 4192
Description: merge -r10005:10006 from trunk


Added:
    branches/6.5/server/HTML/EN/html/ping.html
      - copied unchanged from r10006, trunk/server/HTML/EN/html/ping.html
Removed:
    branches/6.5/server/HTML/EN/ping.html
Modified:
    branches/6.5/server/HTML/EN/html/global.js
    branches/6.5/server/Slim/Web/Pages.pm

Modified: branches/6.5/server/HTML/EN/html/global.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/EN/html/global.js?rev=10007&r1=10006&r2=10007&view=diff
==============================================================================
--- branches/6.5/server/HTML/EN/html/global.js (original)
+++ branches/6.5/server/HTML/EN/html/global.js Fri Sep 22 21:50:19 2006
@@ -70,7 +70,7 @@
 	}
 
 	var myAjax = new Ajax.Request(
-	'ping.html',
+	'html/ping.html',
 	{
 		method: requesttype,
 		postBody: params,

Modified: branches/6.5/server/Slim/Web/Pages.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Web/Pages.pm?rev=10007&r1=10006&r2=10007&view=diff
==============================================================================
--- branches/6.5/server/Slim/Web/Pages.pm (original)
+++ branches/6.5/server/Slim/Web/Pages.pm Fri Sep 22 21:50:19 2006
@@ -566,12 +566,6 @@
 	return Slim::Web::HTTP::filltemplatefile('tunein.html', $params);
 }
 
-# Handler for a very small 'are you alive' page for background check of server status
-sub ping {
-	my ($client, $params) = @_;
-	return Slim::Web::HTTP::filltemplatefile('ping.html', $params);
-}
-
 1;
 
 __END__