tagging

3 files changed, 41 insertions, 26 deletions

diff --git a/src/templates/apps/room/list.html b/src/templates/apps/room/list.html
index 6c39e12..fb47ca1 100644
--- a/src/templates/apps/room/list.html
+++ b/src/templates/apps/room/list.html
@@ -34,6 +34,7 @@
 		   	  <ul class="ilist">
 		   	     <!-- 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>
+		   	     <li><div class="button"><a href="{% prefix %}/room/{{r.id}}/tag">Room Tags</a></li>
 		   	  </ul>
 		   </div>
 		</div>
diff --git a/src/templates/apps/room/tag.html b/src/templates/apps/room/tag.html
new file mode 100644
index 0000000..d8c666e
--- /dev/null
+++ b/src/templates/apps/room/tag.html
@@ -0,0 +1,21 @@
+{% extends "edit.html" %}
+{% load prefix %}
+{% load datehumanize %}
+{% load roomurl %}
+{% load prefix %}
+{% block widgets %}
+
+{% endblock %}
+{% block beforeform %}
+	<h1>Tags for {{room.name}}</h1>
+	{% if tags %}
+	<ul class="ilist">
+	  {% for tag in tags %}
+	    <li class="ui-widget ui-state-highlight ui-corner-all" style="padding: 6px 10px;"><a href="{%prefix%}/+{{tag}}">{{tag}}</a>&nbsp;<a href="{% prefix %}/room/{{room.id}}/untag/{{tag}}"><span style="vertical-align: middle;" class="ui-icon ui-icon-closethick"></span></a></li>
+	  {% endfor %}
+	</ul>
+	{% else %}
+	<em>There are no tags yet...</em>
+	{% endif %}
+	<br/>
+{% endblock %}
\ No newline at end of file
diff --git a/src/templates/edit.html b/src/templates/edit.html
index 961fe66..400a087 100644
--- a/src/templates/edit.html
+++ b/src/templates/edit.html
@@ -2,31 +2,24 @@
 {% 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='{% prefix %}/rooms'" value="Cancel"/>
-    </div>
+<h1>{{formtitle}}</h1>
+<form method="POST" class="ui-widget ui-corner-all ui-state-highlight bbq infopanel" style="width: 50%">
+<ul class="links">
+  {% for field in form %}
+    {% if field.is_hidden %}
+      {{ field }}
+    {% else %}
+      <li class="links {% if field.field.required %}required{% endif %}" {{ field.row_attrs }} style="margin-bottom: 10px;">
+        {{ field.errors }}
+        <label for="id_{{ field.html_name }}" class="fieldlabel" style="border-bottom: 1px solid #CECECE;"><em>{{ field.label }}{% if field.field.required %}<b>*</b>{% endif %}</em></label>
+        <div class="fieldinput">{{ field }}</div>
+      </li>
+    {% endif %}
+  {% endfor %}
+</ul>
+<ul class="ilist" style="padding-top: 10px; padding-bottom: 5px;">
+    <li class="button"><input type="submit" value="{{submitname}}" /></li>
+    <li class="button right"><input type="button" onClick="document.location='{% prefix %}/rooms'" value="Cancel"/></li>
+</ul>
 </form>
 {% endblock %}
\ No newline at end of file