From f3947d0fb2dcf2abb1f5a200df183b84716e7275 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 9 Feb 2011 13:16:52 +0100
Subject: more prefix

---
 src/templates/apps/room/list.html |  9 +++---
 src/templates/edit.html           | 58 +++++++++++++++++++--------------------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/templates/apps/room/list.html b/src/templates/apps/room/list.html
index 199dc89..0bbc842 100644
--- a/src/templates/apps/room/list.html
+++ b/src/templates/apps/room/list.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
+{% load prefix %}
 {% load datehumanize %}
 {% load roomurl %}
+{% load prefix %}
 {% block widgets %}
     $("#rooms").accordion({
    		header: 'h3',
@@ -23,8 +25,8 @@
 		   	<p>Meeting room URL: <a href="{{r|roomurl}}">{{r|roomurl}}</a></p>
 		   	<div class="buttons">
 		   		<ul>
-		   			<li><div class="button"><a href="/room/{{r.id}}/modify">Modify Room</a></li>
-		   			<li><div class="button"><a href="/room/{{r.id}}/delete">Delete Room</a></li>
+		   			<li><div class="button"><a href="{% prefix %}/room/{{r.id}}/modify">Modify Room</a></li>
+		   			<li><div class="button"><a href="{% prefix %}/room/{{r.id}}/delete">Delete Room</a></li>
 		   		</ul>
 		   	</div>
 		   </div>
@@ -37,8 +39,7 @@
 	<br/>
 	<div class="buttons">
 		<ul>
-		   <li><div class="button"><a href="/room/create">Create a new room</a></div></li>
-		   <!-- li><div class="button"><a href="/room/import">Modify an existing room</a></div></li -->
+		   <li><div class="button"><a href="{% prefix %}/room/create">Create a new room</a></div></li>
 		</ul>
 	</div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/edit.html b/src/templates/edit.html
index f896a52..709be53 100644
--- a/src/templates/edit.html
+++ b/src/templates/edit.html
@@ -1,32 +1,32 @@
 {% extends "base.html" %}
+{% load prefix %}
 {% block content %}
-    {% block beforeform %}
-    {% endblock %}
-	<form method="POST">
-		<div class="ui-widget-content ui-corner-all infopanel">
-		    <h1>{{formtitle}}</h1>
-			<table class="formtable">
-		      {% for field in form %}
-		        <tr style="padding-top: 10px;">
-		          <td>
-			          {% if not field.is_hidden %}
-			          <div class="ui-widget fieldlabel">{{ field.label_tag }}</div>
-			          {% endif %}
-			          {% if field.errors %}
-			          <div class="ui-widget ui-state-error">{{ field.errors }}</div>
-			          {% endif %}
-			      </td>
-			      <td>
-			          <div class="ui-widget">{{ field }}</div>
-		          </td>
-		        </tr>
-		      {% endfor %}
-		    </table>
-		</div>
-		<br/>
-		<div class="button">
-		    <input type="submit" value="{{submitname}}" />
-		    <input type="button" onClick="document.location='/'" value="Cancel"/>
-	    </div>
-	</form>
+{% block beforeform %}{% endblock %}
+<form method="POST">
+	<div class="ui-widget-content ui-corner-all infopanel">
+	    <h1>{{formtitle}}</h1>
+		<table class="formtable">
+	      {% for field in form %}
+	        <tr style="padding-top: 10px;">
+	          <td>
+		          {% if not field.is_hidden %}
+		          <div class="ui-widget fieldlabel">{{ field.label_tag }}</div>
+		          {% endif %}
+		          {% if field.errors %}
+		          <div class="ui-widget ui-state-error">{{ field.errors }}</div>
+		          {% endif %}
+		      </td>
+		      <td>
+		          <div class="ui-widget">{{ field }}</div>
+	          </td>
+	        </tr>
+	      {% endfor %}
+	    </table>
+	</div>
+	<br/>
+	<div class="button">
+	    <input type="submit" value="{{submitname}}" />
+	    <input type="button" onClick="document.location='{% prefix %}'" value="Cancel"/>
+    </div>
+</form>
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.1