From 59760bb36c39ce929c24f18c03baac528ff2e70c Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 21 Jun 2014 17:16:41 +0200 Subject: [PATCH] web: Remove WebSocket demo page --- mopidy/http/data/index.html | 2 +- mopidy/http/data/mopidy.html | 52 ------------------------------------ mopidy/http/handlers.py | 2 +- tests/http/test_server.py | 4 +-- 4 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 mopidy/http/data/mopidy.html diff --git a/mopidy/http/data/index.html b/mopidy/http/data/index.html index d85251c8..007d4e2a 100644 --- a/mopidy/http/data/index.html +++ b/mopidy/http/data/index.html @@ -23,7 +23,7 @@ HTML/CSS/JavaScript Mopidy client.

If you replace this page with your own content, the Mopidy resources - at /mopidy/ will still be available.

+ and APIs at /mopidy/ will still be available.

diff --git a/mopidy/http/data/mopidy.html b/mopidy/http/data/mopidy.html deleted file mode 100644 index 38ea2036..00000000 --- a/mopidy/http/data/mopidy.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - Mopidy HTTP frontend - - - -
-

Mopidy HTTP frontend

- -

This web server is a part of the music server Mopidy. To learn more - about Mopidy, please visit www.mopidy.com.

-
- -
-

WebSocket endpoint

- -

Mopidy has a WebSocket endpoint at /mopidy/ws/. You can use - this end point to access Mopidy's full API, and to get notified about - events happening in Mopidy.

-
- -
-

Example

- -

Here you can see events arriving from Mopidy in real time:

- - 

-
-      
Nothing to see? Try playing a track using your MPD client.

-    

-
-    

-      
Documentation

-
-      
For more information, please refer to the Mopidy documentation at
-      docs.mopidy.com.

-    

-    
-    
-  
-
diff --git a/mopidy/http/handlers.py b/mopidy/http/handlers.py
index 5911fe09..c9926ecd 100644
--- a/mopidy/http/handlers.py
+++ b/mopidy/http/handlers.py
@@ -25,7 +25,7 @@ def mopidy_app_factory(config, core):
         }),
         (r'/(.*)', StaticFileHandler, {
             'path': os.path.join(os.path.dirname(__file__), 'data'),
-            'default_filename': 'mopidy.html'
+            'default_filename': 'index.html'
         }),
     ]
 
diff --git a/tests/http/test_server.py b/tests/http/test_server.py
index 5f3495a5..f8e1b74e 100644
--- a/tests/http/test_server.py
+++ b/tests/http/test_server.py
@@ -39,7 +39,7 @@ class RootAppTest(HttpServerTest):
         response = self.fetch('/', method='GET')
 
         self.assertIn(
-            'Static content serving',
+            'This web server is a part of the Mopidy music server.',
             tornado.escape.to_unicode(response.body))
         self.assertEqual(
             response.headers['X-Mopidy-Version'], mopidy.__version__)
@@ -59,7 +59,7 @@ class MopidyAppTest(HttpServerTest):
         response = self.fetch('/mopidy/', method='GET')
 
         self.assertIn(
-            'Here you can see events arriving from Mopidy in real time:',
+            'This web server is a part of the Mopidy music server.',
             tornado.escape.to_unicode(response.body))
         self.assertEqual(
             response.headers['X-Mopidy-Version'], mopidy.__version__)