From ab92032cf6fcd2b9d23c2ff71c46b0087ff02da5 Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Fri, 10 Apr 2009 15:19:10 +0200
Subject: [PATCH] added / url to standard urls (easier than redirect in apache
 config), repaired showContent

---
 pyweb/mumble/views.py | 9 ++++++++-
 pyweb/urls.py         | 8 ++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pyweb/mumble/views.py b/pyweb/mumble/views.py
index 147abcb..26e9f30 100644
--- a/pyweb/mumble/views.py
+++ b/pyweb/mumble/views.py
@@ -77,7 +77,14 @@ def showContent( server, user = None ):
 			mumbleAcc = mmUsers[0];
 	
 	t_content = loader.get_template( 'mumble/content.htm' );
-	c_content = Context( { 'DBaseObject': srv, 'ServerObject': o, 'ChannelTable': Storage.s, 'user': user, 'mumbleAccount': mumbleAcc } );
+	c_content = Context( {
+		'DBaseObject': srv,
+		'ServerObject': o,
+		'ChannelTable': Storage.s,
+		'user': user,
+		'mumbleAccount': mumbleAcc,
+		"CurrentUserIsAdmin": srv.isUserAdmin( request.user ),
+		} );
 	r_content = t_content.render( c_content );
 	
 	return r_content;
diff --git a/pyweb/urls.py b/pyweb/urls.py
index d1ae5e2..90e7924 100644
--- a/pyweb/urls.py
+++ b/pyweb/urls.py
@@ -7,6 +7,7 @@ admin.autodiscover()
 from django.conf import settings
 
 urlpatterns = patterns('',
+	(r'^/?$',               'django.views.generic.simple.redirect_to', { 'url': '/mumble/' } ),
     # Example:
     # (r'^mumble_django/', include('mumble_django.foo.urls')),
 
@@ -25,8 +26,7 @@ urlpatterns = patterns('',
 
 # Development stuff
 if settings.DEBUG:
-        urlpatterns += patterns('',
-                (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True} ),
-		(r'^/?$',                  'django.views.generic.simple.redirect_to', { 'url': '/mumble/' } ),
-        )
+	urlpatterns += patterns('',
+		(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True} ),
+	)