From 4767fe59c30bc809588fe3cb6b7fd2ec31d797c2 Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Thu, 1 Jul 2010 23:58:52 +0200
Subject: [PATCH] =?UTF-8?q?ext=202.2=20=E2=86=92=20ext=203.2.0,=20add=20Co?=
 =?UTF-8?q?ntentMaster=20block?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pyweb/templates/index.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyweb/templates/index.html b/pyweb/templates/index.html
index 7e06e76..bfb063b 100644
--- a/pyweb/templates/index.html
+++ b/pyweb/templates/index.html
@@ -5,14 +5,14 @@
     <title>Mumble Administration</title>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 
-    <link rel="stylesheet"    type="text/css"  href="{{ MEDIA_URL }}/ext-2.2/resources/css/ext-all.css" />
+    <link rel="stylesheet"    type="text/css"  href="{{ MEDIA_URL }}/ext-3.2.0/resources/css/ext-all.css" />
     <link rel="stylesheet"    type="text/css"  href="{{ MEDIA_URL }}/style.css" />
     <link rel="stylesheet"    type="text/css"  href="{{ MEDIA_URL }}/templatestyle.css" />
     <link rel="stylesheet"    type="text/css"  href="{{ MEDIA_URL }}/mumble/style.css"  />
     <link rel="shortcut icon" type="image/png" href="{{ MEDIA_URL }}/mumble/mumble.16x16.png" />
 
-    <script type="text/javascript" src="{{ MEDIA_URL }}/ext-2.2/adapter/ext/ext-base.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/ext-2.2/ext-all.js"></script>
+    <script type="text/javascript" src="{{ MEDIA_URL }}/ext-3.2.0/adapter/ext/ext-base.js"></script>
+    <script type="text/javascript" src="{{ MEDIA_URL }}/ext-3.2.0/ext-all.js"></script>
     <script type="text/javascript" src="{{ MEDIA_URL }}/checkcolumn.js"></script>
 
     {% block HeadTag %}
@@ -56,6 +56,7 @@
       </div>
       <!-- content -->
       <div id="contentpanel">
+        {% block ContentMaster %}
         <div id="contentleft">
           {% block LeftColumn %}
           {% endblock %}
@@ -64,6 +65,7 @@
           {% block Content %}
           {% endblock %}
         </div>
+        {% endblock %}
       </div>
       <!-- footer -->
       <div id="footerpanel">