settings cleanup

remove broken prefix-handler

13 files changed, 70 insertions, 123 deletions

diff --git a/src/templates/apps/auth/login.html b/src/templates/apps/auth/login.html
index 4bb819c..e72e73a 100644
--- a/src/templates/apps/auth/login.html
+++ b/src/templates/apps/auth/login.html
@@ -1,16 +1,11 @@
 {% extends "base.html" %}
-{% load prefix %}
 {% block headline %}Login{% endblock %}
 {% block title %}SUNET Meeting Tools{% endblock %}
 {% block content %}
-<div id="welcome">
-	<p>The SUNET meetingtools is an alternative interface to Adobe Connect. With this tool you can...</p>
-	<ul>
-		<li>Create self-cleaning rooms.</li>
-		<li>Tag rooms to provide easy access to lists of rooms for your university or research group.</li>
-		<li>Display lists of rooms on your own website.</li>
-		<li>Manage recordings for your rooms.</li>
-	</ul>
-	<div class="button"><a href="{% prefix %}/accounts/login-federated">Login</a></div>
+<div class="hero-unit">
+    <h1>Online Meetings</h1>
+	<p>Welcome to the meeting tools. Either <a class="btn btn-small btn-primary" href="/accounts/login-federated">Login</a> to manage
+        your meeting rooms and recordings, or ...</p>
+	<a class="btn btn-large btn-success pull-right" href="/accounts/login-federated?next=/user/myroom">Click here to Start a Meeting Now &raquo;&raquo;</a>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/apps/room/launch.html b/src/templates/apps/room/launch.html
index 00f40c1..204345d 100644
--- a/src/templates/apps/room/launch.html
+++ b/src/templates/apps/room/launch.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load datehumanize %}
-{% load prefix %}
 {% block widgets %}
 {% endblock %}
 {% block content %}
@@ -25,11 +24,11 @@
 	</div>
 	<br/>
 	<div>
-        <a class="btn btn-large" href="{% prefix %}/rooms#{{room.id}}">Cancel</a>
+        <a class="btn btn-large" href="/rooms#{{room.id}}">Cancel</a>
 	    {%if room.nhosts == 0 %}
-		<a class="btn btn-large btn-success" href="{% prefix %}/accounts/login-federated?next=/promote/{{room.id}}">Enter as Host</a>
+		<a class="btn btn-large btn-success" href="/accounts/login-federated?next=/promote/{{room.id}}">Enter as Host</a>
 		{% endif %}
-		<a class="btn btn-large btn-primary" href="{% prefix %}/launch/{{room.id}}">Enter as Participant</a>
+		<a class="btn btn-large btn-primary" href="/launch/{{room.id}}">Enter as Participant</a>
 
 	</div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/apps/room/list.html b/src/templates/apps/room/list.html
index 1ac034a..4e83466 100644
--- a/src/templates/apps/room/list.html
+++ b/src/templates/apps/room/list.html
@@ -1,12 +1,11 @@
 {% extends "base.html" %}
-{% load prefix %}
 {% load datehumanize %}
 {% load roomurl %}
 {% load tagging_tags %}
 {% block widgets %}
     $(".collapse").collapse({'parent': '#rooms'});
    	$(".occupation").click(function(e) {
-   		$(this).find(".occupation-info").first().load("{% prefix %}/api/room/"+$(this).parents('.accordion-body').attr('id')+"/occupation")
+   		$(this).find(".occupation-info").first().load("/api/room/"+$(this).parents('.accordion-body').attr('id')+"/occupation")
    	});
    	$(".occupation").ajaxStart(function() {
    		$(".occupation i.icon-refresh").removeClass("icon-refresh").addClass("spinner").spin("custom");
@@ -17,8 +16,8 @@
 {% endblock %}
 {% block meta %}
 {% if tags %}
-<link rel="alternate" type="application/rss+xml" title="{{title}} (RSS 2.0)" href="{% prefix %}/room/+{{tags}}.rss" />
-<link rel="alternate" type="application/atom+xml" title="{{title}} (ATOM 1.0)" href="{% prefix %}/room/+{{tags}}.atom" />
+<link rel="alternate" type="application/rss+xml" title="{{title}} (RSS 2.0)" href="/room/+{{tags}}.rss" />
+<link rel="alternate" type="application/atom+xml" title="{{title}} (ATOM 1.0)" href="/room/+{{tags}}.atom" />
 {% endif %}
 {% endblock %}
 {% block content %}
@@ -36,25 +35,25 @@
                    <p><a target="_connect" href="{{r|roomurl}}">{{r|roomurl}}</a></p>
                    <p class="well">{% if r.description %}{{r.description|safe}}{% else %}<em>No description available...</em>{% endif %}</p>
                    <ul class="unstyled" style="padding-left: 2px;">
-                      <li>&raquo;&nbsp;Tags: {% for tag in tags %}<a style="margin-right: 5px;" href="{% prefix %}/room/+{{tag}}">{{tag}}</a>{% endfor %} {%if edit %}<a style="font-size: 75%;" href="{% prefix %}/room/{{r.id}}/tag"><em>... manage room tags</em></a>{%endif%}</li>
+                      {% if tags %}<li>&raquo;&nbsp;{% for tag in tags %}<a class="badge" href="/room/+{{tag}}">{{tag}}</a>{% endfor %}{%if edit %}&nbsp;<a class="btn btn-mini btn-info" href="/room/{{r.id}}/tag">manage room tags</a>{%endif%}</li>{% endif %}
                       <li>&raquo;&nbsp;Created by {{r.creator}} {{r.timecreated|datehumanize}}.</li>
                       <li>&raquo;&nbsp;<span class="occupation"><span class="occupation-info">{%if r.nusers%}There are {{r.nusers}} users present, {{r.nhosts}} of whom are hosts.{%else%}The room is currently unoccupied.{%endif%}</span><a href="#" class="btn btn-mini btn-info"><i class="icon-refresh"> </i>refresh</a></span></li>
                       {% if r.self_cleaning %}<li>&raquo;&nbsp;Room will be reset when empty.</li>{%else%}<li>&raquo;&nbsp;Room state is preserved between sessions.</li>{% endif %}
                       {% if r.allow_host %}<li>&raquo;&nbsp;First participant can elect to become host.</li>{% endif %}
                       {% if r.lastvisited %}<li>&raquo;&nbsp;Last visited {{r.lastvisited|datehumanize}}</li>{%endif%}
-                      <li>&raquo;&nbsp;Hosted on {{r.acc.name}} <a class="btn btn-mini btn-info" href="{% prefix %}/stats/room/{{r.id}}">room usage plot</a></li>
+                      <li>&raquo;&nbsp;Hosted on {{r.acc.name}} <a class="btn btn-mini btn-info" href="/stats/room/{{r.id}}">room usage plot</a></li>
                    </ul>
                   <br/>
                   <div class="btn-group">
-                     <a class="btn" target="_blank" href="{% prefix %}/go/{{r.id}}">Enter Room</a>
+                     <a class="btn" target="_blank" href="/go/{{r.id}}">Enter Room</a>
                      {% if edit %}
-                     <a class="btn" href="{% prefix %}/room/{{r.id}}/tag">Room Tags</a>
-                     <a class="btn" href="{% prefix %}/room/{{r.id}}/recordings">Room Recordings</a>
-                     <a class="btn" href="{% prefix %}/room/{{r.id}}/modify">Modify Room</a>
+                     <a class="btn" href="/room/{{r.id}}/tag">Room Tags</a>
+                     <a class="btn" href="/room/{{r.id}}/recordings">Room Recordings</a>
+                     <a class="btn" href="/room/{{r.id}}/modify">Modify Room</a>
                      {% if room.is_locked %}
-                     <a class="btn" href="{% prefix %}/room/{{r.id}}/unlock">Unlock Room</a>
+                     <a class="btn" href="/room/{{r.id}}/unlock">Unlock Room</a>
                      {% endif %}
-                     <a class="btn btn-danger" href="{% prefix %}/room/{{r.id}}/delete">Delete Room</a>
+                     <a class="btn btn-danger" href="/room/{{r.id}}/delete">Delete Room</a>
                      {% endif %}
                   </div>
                </div>
@@ -68,13 +67,13 @@
 	<br/>
 	{% if edit %}
 	<div class="btn-group">
-	   <a class="btn btn-success" href="{% prefix %}/room/create">Create a New Room</a>
+	   <a class="btn btn-success" href="/room/create">Create a New Room</a>
 	</div>
 	{% endif %}
 {% endblock %}
 {% block validators %}
 {% if tags %}
-<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}{% prefix %}/room/+{{tags}}.atom"><img src="{% prefix %}/site-media/img/valid-atom.png" alt="[Valid Atom 1.0]" title="Validate my Atom 1.0 feed" /></a>
-<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}{% prefix %}/room/+{{tags}}.rss"><img src="{% prefix %}/site-media/img/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a>
+<a href="http://feed1.w3.org/check.cgi?url=/room/+{{tags}}.atom"><img src="{{STATIC_URL}}/img/valid-atom.png" alt="[Valid Atom 1.0]" title="Validate my Atom 1.0 feed" /></a>
+<a href="http://feed1.w3.org/check.cgi?url=/room/+{{tags}}.rss"><img src="{{STATIC_URL}}/img/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a>
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/apps/room/recordings.html b/src/templates/apps/room/recordings.html
index 7c3b863..8e95b09 100644
--- a/src/templates/apps/room/recordings.html
+++ b/src/templates/apps/room/recordings.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load prefix %}
+
 {% load datehumanize %}
 {% load roomurl %}
 {% load tagging_tags %}
@@ -7,8 +7,8 @@
 $(".collapse").collapse({'parent': '#recordings'});
 {% endblock %}
 {% block meta %}
-<link rel="alternate" type="application/rss+xml" title="{{title}} recordings (RSS 2.0)" href="{% prefix %}/room/{{room.id}}/recordings.rss" />
-<link rel="alternate" type="application/atom+xml" title="{{title}} recordings (ATOM 1.0)" href="{% prefix %}/room/{{room.id}}/recordings.atom" />
+<link rel="alternate" type="application/rss+xml" title="{{title}} recordings (RSS 2.0)" href="/room/{{room.id}}/recordings.rss" />
+<link rel="alternate" type="application/atom+xml" title="{{title}} recordings (ATOM 1.0)" href="/room/{{room.id}}/recordings.atom" />
 {% endblock %}
 {% block content %}
 	<div class="page-header">
@@ -38,9 +38,9 @@ $(".collapse").collapse({'parent': '#recordings'});
 	<p>No recordings right now...</p>
 	{% endif %}
 	<br/>
-	<a class="btn" href="{%prefix%}/room#{{room.id}}">Back to '{{room.name}}'</a>
+	<a class="btn" href="/room#{{room.id}}">Back to '{{room.name}}'</a>
 {% endblock %}
 {% block validators %}
-<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}{% prefix %}/room/{{room.id}}/recordings.atom"><img src="{% prefix %}/static/img/valid-atom.png" alt="[Valid Atom 1.0]" title="Validate my Atom 1.0 feed" /></a>
-<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}{% prefix %}/room/{{room.id}}/recordings.rss"><img src="{% prefix %}/static/img/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a>
+<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}/room/{{room.id}}/recordings.atom"><img src="{{STATIC_URL}}/img/valid-atom.png" alt="[Valid Atom 1.0]" title="Validate my Atom 1.0 feed" /></a>
+<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}/room/{{room.id}}/recordings.rss"><img src="{{STATIC_URL}}/img/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a>
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/apps/room/retry.html b/src/templates/apps/room/retry.html
index 0e27e77..28054cc 100644
--- a/src/templates/apps/room/retry.html
+++ b/src/templates/apps/room/retry.html
@@ -1,13 +1,13 @@
-{% load prefix %}
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-<meta HTTP-EQUIV="REFRESH" content="{{wait}}; url={% prefix %}/go/{{room.urlpath}}"/>
+<meta HTTP-EQUIV="REFRESH" content="{{wait}}; url=/go/{{room.urlpath}}"/>
 </head>
 <body>
 <h1>Room is temporarily locked</h1>
 <p>Retrying room in {{wait}} seconds...</p>
-<img src="{% prefix %}/site-media/img/ajax-loader.gif"/>
+<img src="{{STATIC_URL}}img/ajax-loader.gif"/>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/templates/apps/room/tag.html b/src/templates/apps/room/tag.html
index dae2f81..087862f 100644
--- a/src/templates/apps/room/tag.html
+++ b/src/templates/apps/room/tag.html
@@ -1,8 +1,6 @@
 {% extends "edit.html" %}
-{% load prefix %}
 {% load datehumanize %}
 {% load roomurl %}
-{% load prefix %}
 {% block widgets %}
 
 {% endblock %}
@@ -22,8 +20,8 @@ class="form-inline"
     <div>
         {% for tag in tags %}
         <span class="btn-group">
-            <a class="btn btn-small" href="{%prefix%}/room/+{{tag}}">{{tag}}</a>&nbsp;
-            <a class="btn btn-small btn-warning" href="{% prefix %}/room/{{room.id}}/untag/{{tag}}"><i class="icon-remove"></i></a>
+            <a class="btn btn-small" href="/room/+{{tag}}">{{tag}}</a>&nbsp;
+            <a class="btn btn-small btn-warning" href="/room/{{room.id}}/untag/{{tag}}"><i class="icon-remove"></i></a>
         </span>
         {% endfor %}
     </div>
diff --git a/src/templates/apps/room/widget.html b/src/templates/apps/room/widget.html
index a602c7e..a658a17 100644
--- a/src/templates/apps/room/widget.html
+++ b/src/templates/apps/room/widget.html
@@ -1,17 +1,4 @@
 {% extends "base.html" %}
-{% load prefix %}
-{% block widgets %}
-     //SyntaxHighlighter.all()
-{% endblock %}
-{% block meta %}
-<!-- script type="text/javascript" src="{% prefix %}/site-media/js/xregexp-min.js"></script>
-<script type="text/javascript" src="{% prefix %}/site-media/js/shCore.js"></script>
-<script type="text/javascript" src="{% prefix %}/site-media/js/shAutoloader.js"></script>
-<script type="text/javascript" src="{% prefix %}/site-media/js/shLegacy.js"></script>
-<script type="text/javascript" src="{% prefix %}/site-media/js/shBrushXml.js"></script>
-<link href="{% prefix %}/site-media/css/shCore.css" rel="stylesheet" type="text/css" />
-<link href="{% prefix %}/site-media/css/shThemeDefault.css" rel="stylesheet" type="text/css" / -->
-{% endblock %}
 {% block content %}
 <div class="page-header">
     <h1>{{title}}</h1>
diff --git a/src/templates/apps/stats/domain.html b/src/templates/apps/stats/domain.html
index 93fb1a9..f7d9ad3 100644
--- a/src/templates/apps/stats/domain.html
+++ b/src/templates/apps/stats/domain.html
@@ -1,9 +1,8 @@
 {% extends "base.html" %}
 {% load datehumanize %}
-{% load prefix %}
 {% block widgets %}
 $.ajax({
-	url: '{% prefix %}/api/stats/domain/{{domain}}',
+	url: '/api/stats/domain/{{domain}}',
 	method: 'GET',
 	success: function (resp) {
 	    var graph = $('#graph');
@@ -28,7 +27,7 @@ $.ajax({
 	<tr><td><b>Total minutes:</b></td><td id="minutes"></td></tr>
 	<tr><td><b>Total rooms:</b></td><td id="rooms"></td></tr>
 	<tr><td><b>Total unique users:</b></td><td id="users"></td></tr>
-	<tr><td colspan="2" style="padding-top: 10px;"><a href="{% prefix %}/stats">Look at your own statistics</a></td></tr>
+	<tr><td colspan="2" style="padding-top: 10px;"><a href="/stats">Look at your own statistics</a></td></tr>
 </table>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/apps/stats/room.html b/src/templates/apps/stats/room.html
index 7a2a25f..d5e35dd 100644
--- a/src/templates/apps/stats/room.html
+++ b/src/templates/apps/stats/room.html
@@ -1,9 +1,8 @@
 {% extends "base.html" %}
 {% load datehumanize %}
-{% load prefix %}
 {% block widgets %}
 $.ajax({
-	url: '{% prefix %}/api/stats/room/{{room.id}}',
+	url: '/api/stats/room/{{room.id}}',
 	method: 'GET',
 	success: function (resp) {
 	    var graph = $('#graph');
@@ -26,7 +25,7 @@ $.ajax({
 <table>
 	<tr><td><b>Total minutes:</b></td><td id="minutes"></td></tr>
 	<tr><td><b>Total unique users:</b></td><td id="users"></td></tr>
-	<tr><td colspan="2" style="padding-top: 10px;"><a href="{% prefix %}/stats">Look at your own statistics</a></td></tr>
+	<tr><td colspan="2" style="padding-top: 10px;"><a href="/stats">Look at your own statistics</a></td></tr>
 </table>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/apps/stats/user.html b/src/templates/apps/stats/user.html
index 35a40fb..8b08c6c 100644
--- a/src/templates/apps/stats/user.html
+++ b/src/templates/apps/stats/user.html
@@ -1,9 +1,8 @@
 {% extends "base.html" %}
 {% load datehumanize %}
-{% load prefix %}
 {% block widgets %}
 $.ajax({
-	url: '{% prefix %}/api/stats/user/{{username}}',
+	url: '/api/stats/user/{{username}}',
 	method: 'GET',
 	success: function (resp) {
 	    var graph = $('#graph');
@@ -26,7 +25,7 @@ $.ajax({
 <table>
 	<tr><td><b>Total minutes:</b></td><td id="minutes"></td></tr>
 	<tr><td><b>Total rooms:</b></td><td id="rooms"></td></tr>
-	<tr><td colspan="2" style="padding-top: 10px;"><a href="{% prefix %}/stats/domain/{{domain}}">Look at statistics for {{domain}}</a></td></tr>
+	<tr><td colspan="2" style="padding-top: 10px;"><a href="/stats/domain/{{domain}}">Look at statistics for {{domain}}</a></td></tr>
 </table>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/base.html b/src/templates/base.html
index 0df70d7..4bd9d80 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -1,68 +1,42 @@
-{% load prefix %}
 <!DOCTYPE html>
 <html>
 <head>
 	<title>Meeting Tools</title>
 	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
-    <link type="text/css" href="{% prefix %}/static/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
-    <link href="{% prefix %}/static/css/prettify.css" rel="stylesheet"/>
-    <!-- link href="{% prefix %}/static/css/lavish.less" rel="stylesheet/less" type="text/css" / -->
-    <link href="{% prefix %}/static/css/style.css" rel="stylesheet" type="text/css" />
-	<!-- link href="{% prefix %}/static/css/gs.css" rel="stylesheet" type="text/css" / -->
-    <!-- link type="text/css" href="{% prefix %}/static/css/sunet/jquery-ui-1.8.11.custom.css" rel="stylesheet" -->
-	{% block meta %}{% endblock %}
-    <script type="text/javascript" src="{% prefix %}/static/js/jquery-1.7.2.min.js"></script>
-    <script type="text/javascript" src="{% prefix %}/static/js/less-1.3.0.min.js"></script>
-    <script type="text/javascript" src="{% prefix %}/static/bootstrap/js/bootstrap.min.js"></script>
-    <!-- script type="text/javascript" src="{% prefix %}/static/js/jquery-ui-1.8.11.custom.min.js"></script -->
-    <script type="text/javascript" src="{% prefix %}/static/js/jquery.validate.js"></script>
-    <script type="text/javascript" src="{% prefix %}/static/js/bbq.js"></script>
-    <!-- script type="text/javascript" src="{% prefix %}/static/js/jquery.form.wizard-3.0.4.js"></script-->
-	<script type="text/javascript" src="{% prefix %}/static/js/jquery.meetingtools.js"></script>
+    <link type="text/css" href="{{STATIC_URL}}/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="{{STATIC_URL}}/css/prettify.css" rel="stylesheet"/>
+    <link href="{{theme.base}}/lavish.less" rel="stylesheet/less" type="text/css" />
+    <link href="{{STATIC_URL}}/css/style.css" rel="stylesheet" type="text/css" />
+	<link href="{{STATIC_URL}}/css/gs.css" rel="stylesheet" type="text/css" />
+
+    <script type="text/javascript" src="{{STATIC_URL}}/js/jquery-1.7.2.min.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}/js/less-1.3.0.min.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}/bootstrap/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}/js/jquery.validate.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}/js/bbq.js"></script>
+	<script type="text/javascript" src="{{STATIC_URL}}/js/jquery.meetingtools.js"></script>
 
 	<!--[if lte IE 8]>
-    <script language="javascript" type="text/javascript" src="{% prefix %}/static/js/excanvas.min.js"></script>
+    <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/excanvas.min.js"></script>
     <![endif]-->
-	<script type="text/javascript" src="{% prefix %}/static/js/jquery.flot.min.js"></script>
-	<script type="text/javascript" src="{% prefix %}/static/js/spin.min.js"></script>
-	<script type="text/javascript" src="{% prefix %}/static/js/jquery.spin.js"></script>
-    <script type="text/javascript" src="{% prefix %}/static/js/prettify.js"></script>
-	<!--[if IE]>
-	<!-- link href="css/sunet-ie6.css" rel="stylesheet" type="text/css" /-->
-	<![endif]-->
-	<!--[if lt IE 8]>
-	<style>
+
+	<script type="text/javascript" src="{{STATIC_URL}}/js/jquery.flot.min.js"></script>
+	<script type="text/javascript" src="{{STATIC_URL}}/js/spin.min.js"></script>
+	<script type="text/javascript" src="{{STATIC_URL}}/js/jquery.spin.js"></script>
+    <script type="text/javascript" src="{{STATIC_URL}}/js/prettify.js"></script>
+
+    {% block meta %}{% endblock %}
+	<!-- style>
 	.menu li {
 		display: inline;
 	}
-	</style>
+	</style -->
 	<![endif]-->
     <!--[if lt IE 9]>
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
-	<!-- script type="text/javascript" charset="utf-8">
-	  var is_ssl = ("https:" == document.location.protocol);
-	  var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
-	  document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
-	</script -->
-	<!-- script type="text/javascript" charset="utf-8">
-	  var feedback_widget_options = {};
-	
-	  feedback_widget_options.display = "overlay";  
-	  feedback_widget_options.company = "sunet";
-	  feedback_widget_options.placement = "right";
-	  feedback_widget_options.color = "#222";
-	  feedback_widget_options.style = "idea";
-	  feedback_widget_options.product = "sunet_connect";
-	  		  
-	  feedback_widget_options.limit = "3";
-	  
-	  GSFN.feedback_widget.prototype.local_base_url = "http://getsatisfaction.com";
-	  GSFN.feedback_widget.prototype.local_ssl_base_url = "https://getsatisfaction.com";
-
-	  var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
-	</script -->
+	<script type="text/javascript" src="{{theme.base}}/theme.js"></script>
 	{% block js %}{% endblock %}
 	<script type="text/javascript">
 	$(function() {
@@ -78,12 +52,12 @@
                 <a class="brand logo" href="#">Meeting Tools</a>
                 {% if user.is_authenticated %}
                 <div class="login pull-right">
-                    <a style="margin-right:10px;" href="/user/home">{{user}}</a>
+                    <a style="margin-right:10px;" href="/rooms">{{user}}</a>
                     <a style="vertical-align: bottom;" class="btn btn-mini" href="/accounts/logout"><i class="icon-off"></i> Logout</a>
                 </div>
                 {% else %}
                 <div class="login pull-right">
-                    <a href="/accounts/login-federated">Login</a>
+                    <a style="vertical-align: bottom;" class="btn btn-mini" href="/accounts/login-federated"><i class="icon-home"></i> Login</a>
                 </div>
                 {% endif %}
         </div>
@@ -105,9 +79,9 @@
 			<div class="span3">
                 <ul class="unstyled">
                     <li><h3>Users</h3></li>
-                    <li><a class="tip" title="Your list of meeting resources.." href="{% prefix %}/rooms">My Profile</a></li>
-                    <li><a class="tip" title="Find out how much you use e-meetings..." href="{% prefix %}/stats">Usage Statistics</a></li>
-                    <li><a class="tip" title="Logout" id="logout" href="{% prefix %}/accounts/logout">Logout</a></li>
+                    <li><a class="tip" title="Your list of meeting resources.." href="/rooms">My Profile</a></li>
+                    <li><a class="tip" title="Find out how much you use e-meetings..." href="/stats">Usage Statistics</a></li>
+                    <li><a class="tip" title="Logout" id="logout" href="/accounts/logout">Logout</a></li>
                 </ul>
 	        </div>
             <div class="span3">
@@ -121,9 +95,9 @@
                 <ul class="unstyled">
                     <li><h3>Developers</h3></li>
                     {% if tagstring %}
-                    <li><a href="{% prefix %}/widget/+{{tagstring}}">Meetingtools jQuery widget</a></li>
+                    <li><a href="/widget/+{{tagstring}}">Meetingtools jQuery widget</a></li>
                     {% else %}
-                    <li><a href="{% prefix %}/widget/+example">Meetingtools jQuery widget</a></li>
+                    <li><a href="/widget/+example">Meetingtools jQuery widget</a></li>
                     {% endif %}
                 </ul>
             </div>
diff --git a/src/templates/edit.html b/src/templates/edit.html
index b3ea958..5d04b3f 100644
--- a/src/templates/edit.html
+++ b/src/templates/edit.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load prefix %}
 {% block content %}
 {% block beforeform %}{% endblock %}
 <div class="page-header">
@@ -22,7 +21,7 @@
             {% endif %}
           {% endfor %}
         <div class="form-actions">
-            <input type="button" class="btn" onClick="document.location='{% prefix %}/rooms'" value="{{cancelname}}"/>
+            <input type="button" class="btn" onClick="document.location='/rooms'" value="{{cancelname}}"/>
             <input class="btn btn-success" type="submit" value="{{submitname}}" />
         </div>
         </form>
diff --git a/src/templates/form.html b/src/templates/form.html
index 27feb42..38dd0ea 100644
--- a/src/templates/form.html
+++ b/src/templates/form.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load prefix %}
 {% block content %}
    <div class="page-header">
     <h1>{% block formtitle %}{{formtitle}}{% endblock %}</h1>