From 152a24ba9b9454d546150dd4dc265829c277fbf2 Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Sat, 18 Apr 2009 15:35:26 +0200
Subject: [PATCH] updated changelog and install files, and polished the
 <noscript> messages a bit

---
 CHANGELOG                  | 10 ++++++++++
 INSTALL                    | 21 ++++++++++++++++-----
 template/mumble/mumble.htm |  5 +----
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 07dd9e2..430f4f2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,16 @@
 mumble-django changelog
 =======================
 
+Version 0.5, 18 April 2009:
+------------------------------
+* Added redirect for / into urls.py, as this is easier than configuring
+  it in the Apache config because it doesn't require the user to do
+  anything.
+* Completely refurbished the user interface, now using a YAML template
+  and ExtJS for some extra cool stuff. Still, the page does not _require_
+  JavaScript to be enabled in order to function correctly, users with JS
+  disabled will only see the registration forms and a hint to enable JS.
+
 Version 0.4, 10 April 2009:
 ------------------------------
 * Various bug fixes.
diff --git a/INSTALL b/INSTALL
index afda6f7..be4dfb7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,27 @@
 Thanks for downloading mumble-django.
 
-To install the fully functional version, extract it to wherever you would
-like it to reside. Alter settings.py to fit your needs (the most important
-parts are the Database config and the TEMPLATE_DIRS), and then run:
+To install mumble-django, extract it to wherever you would like it to
+reside, and then run:
 
     python manage.py syncdb
 
+Under most circumstances, that should be all you need to do. However, if
+Murmur is not configured to connect to DBus, syncdb will give you an error
+message and Mumble-Django will not be able to work correctly. In this case,
+have a look at the wiki at
+<http://bitbucket.org/Svedrin/mumble-django/wiki/Connecting_Murmur_to_DBus>
+for instructions how to connect Murmur to DBus.
+
 If you need instructions on how to configure your web server in order to
 serve this application, you can have a look at the Wiki at
 <http://bitbucket.org/Svedrin/mumble-django/wiki/Webserver_Setup>. The wsgi
-config file is already included as mumble-django.wsgi, but you will have to
-alter the paths in this file.
+script is also able to detect the installation paths automatically, so you
+shouldn't need to edit it.
+
+Django_Registration requires a valid EMail address to be set in settings.py,
+that can be used as a sender address for the registration emails. If you
+intend to use the registration feature, you may need to change the
+DEFAULT_FROM_EMAIL setting in settings.py.
 
 Note that there is no need to use the same Database that Murmur itself uses,
 as mumble-django exclusively uses DBus to connect to Murmur and does not
diff --git a/template/mumble/mumble.htm b/template/mumble/mumble.htm
index c8b9169..ec7831d 100644
--- a/template/mumble/mumble.htm
+++ b/template/mumble/mumble.htm
@@ -13,7 +13,7 @@
     <p>
       <b>Hint:</b><br />
       This area is used to display additional information for each channel and player, but requires JavaScript to be
-      enabled in order to be displayed correctly. You will not see the detail pages, but you can use all links and forms
+      displayed correctly. You will not see the detail pages, but you can use all links and forms
       that are displayed.
     </p>
   </noscript>
@@ -48,9 +48,6 @@
         <input type="submit" />
       </form>
     </div>
-    <noscript>
-      By the way, if you had enabled JavaScript, you could see a nifty Tab bar here :)
-    </noscript>
   {% endif %}
   
   {% for item in ChannelTable %}