From 1a4e2ea101f8c8f7c01031890a2261f0f5188277 Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Sat, 21 Aug 2010 13:32:55 +0200
Subject: [PATCH] add "register" button next to "login" if django-registration
 available

---
 pyweb/mumble/templates/mumble/list.html   |  2 +-
 pyweb/mumble/templates/mumble/mumble.html | 11 +++++++++--
 pyweb/processors.py                       |  2 +-
 pyweb/templates/index.html                |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pyweb/mumble/templates/mumble/list.html b/pyweb/mumble/templates/mumble/list.html
index d386e12..319c4e3 100644
--- a/pyweb/mumble/templates/mumble/list.html
+++ b/pyweb/mumble/templates/mumble/list.html
@@ -21,7 +21,7 @@
                 layout:   "border",
                 title:    gettext("Mumble Servers"),
                 buttons: [
-                    {% if user.is_staff and ROSETTA_INSTALLED %}
+                    {% if user.is_staff and "rosetta" in INSTALLED_APPS %}
                     {
                         xtype: 'buttonIframeWindow',
                         text:  gettext('Edit Translation'),
diff --git a/pyweb/mumble/templates/mumble/mumble.html b/pyweb/mumble/templates/mumble/mumble.html
index c76e87c..6055460 100644
--- a/pyweb/mumble/templates/mumble/mumble.html
+++ b/pyweb/mumble/templates/mumble/mumble.html
@@ -35,14 +35,14 @@
                 height:   600,
                 layout:   "border",
                 tbar: [ {
-                    text: gettext("back"),
+                    text: gettext("Back to the server list"),
                     xtype: "button",
                     handler: function(){
                         location.href = "{% url mumble.views.mumbles %}";
                     }
                 } ],
                 buttons: [
-                    {% if user.is_staff and ROSETTA_INSTALLED %}
+                    {% if user.is_staff and "rosetta" in INSTALLED_APPS %}
                     {
                         xtype: 'buttonIframeWindow',
                         text:  gettext('Edit Translation'),
@@ -59,6 +59,13 @@
                     {% if user.is_authenticated %}
                         new Ext.ux.ButtonLogout()
                     {% else %}
+                        {% if 'registration' in INSTALLED_APPS %}
+                        {
+                            xtype: 'buttonIframeWindow',
+                            text:  gettext('Register'),
+                            url: '{% url registration.views.register %}',
+                        },
+                        {% endif %}
                         new Ext.ux.ButtonLogin()
                     {% endif %}
                 ],
diff --git a/pyweb/processors.py b/pyweb/processors.py
index b472696..db6e8fa 100644
--- a/pyweb/processors.py
+++ b/pyweb/processors.py
@@ -17,7 +17,7 @@
 
 def installed_apps(request):
     from django.conf import settings
-    return { 'ROSETTA_INSTALLED': "rosetta" in settings.INSTALLED_APPS }
+    return { 'INSTALLED_APPS': settings.INSTALLED_APPS }
 
 def mumble_version(request):
     from mumble import version_str
diff --git a/pyweb/templates/index.html b/pyweb/templates/index.html
index b3dcaa1..4d95300 100644
--- a/pyweb/templates/index.html
+++ b/pyweb/templates/index.html
@@ -31,7 +31,7 @@
           {% endif %}
           {% if user.is_staff %}
             <a href="{% url admin:index %}" target="_blank">{% trans "Administration" %}</a> |
-            {% if ROSETTA_INSTALLED %}
+            {% if "rosetta" in INSTALLED_APPS %}
               <a href="{% url rosetta.views.home %}" target="_blank">{% trans "Edit translations" %}</a> |
             {% endif %}
           {% endif %}