new views for listing tags

2 files changed, 35 insertions, 34 deletions

diff --git a/src/templates/apps/room/list.html b/src/templates/apps/room/list.html
index 6423296..a8c8954 100644
--- a/src/templates/apps/room/list.html
+++ b/src/templates/apps/room/list.html
@@ -16,7 +16,7 @@
    	});
 {% endblock %}
 {% block content %}
-	<h1>Your meeting rooms</h1>
+	<h1>{{title}}</h1>
 	{% if rooms %}
 	<div id="rooms">
 		{% for r in rooms %}
@@ -25,32 +25,31 @@
 		   <div>
 		      <ul class="ilist">
 		        <li style="vertical-align: top;">
-		           <ul class="nlist">
-			         {% if r.self_cleaning %}<li>Room will be reset when empty.</li>{% endif %}
+		           <ul class="nlist square" style="margin-top: 5px;">
 			         <li>Created by {{r.creator}} {{r.timecreated|datehumanize}}.</li>
-			         {% if r.lastvisited %}<li>Last visited {{r.lastvisited|datehumanize}} when there was {{r.nusers}} user{{r.nusers|pluralize}} in the room.</li>{%endif%} 
+			         {% if r.self_cleaning %}<li>Room will be reset when empty.</li>{%else%}<li>Room state is preserved between sessions.</li>{% endif %}
+			         {% if r.lastvisited %}<li>Last visited {{r.lastvisited|datehumanize}}</li>{%endif%} 
 			   	     <li>Meeting room URL: <a href="{{r|roomurl}}">{{r|roomurl}}<span style="vertical-align: bottom;" class="ui-icon ui-icon-extlink"></span></a></li>
+			  	     <li>Hosted on {{r.acc.name}}</li>
 			  	   </ul>
 			  	</li>
 			  	{% tags_for_object r as tags %}
-			  	<li style="vertical-align: top;">
+			  	<li style="vertical-align: top; width: 45%;">
 			  		<ul class="nlist">
-			  		   <li>Room tags: 
-			  		    {% for tag in tags %}
-			  			<a href="{% prefix %}/+{{tag}}">{{tag}}</a>
-			  		    {% endfor %} ... <a href="{% prefix %}/room/{{r.id}}/tag"><em>manage room tags</em></a></li>
+		   	  		   <li style="margin-top: 5px;" class="infopanel ui-widget ui-corner-all ui-state-highlight"><strong>{{r.name}}</strong><p>{% if r.description %}{{r.description|safe}}{% else %}<em>No description available...</em>{% endif %}</p></li>
+			  		   <li style="margin-top: 5px;">Tags: {% for tag in tags %}<a style="margin-right: 5px;" class="ui-widget" 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>
 			  		</ul>
 			  	</li>
 			  </ul>
 			   	 
 		   	  <br/>
-		   	  {% if r.description %}
-		   	  <p class="ui-widget">{{r.description|safe}}</p>
-		   	  {% endif %}
 		   	  <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>
+		   	  	 <li class="button"><a href="{% prefix %}/go/{{r.id}}">Enter Room</a></li>
+		   	  	 {% if edit %}
+		   	  	 <li class="button"><a href="{% prefix %}/room/{{r.id}}/tag">Room Tags</a></li>
+		   	     <li class="button"><a href="{% prefix %}/room/{{r.id}}/modify">Modify Room</a></li>
+		   	     <li class="button"><a href="{% prefix %}/room/{{r.id}}/delete">Delete Room</a></li> 
+		   	  	 {% endif %}
 		   	  </ul>
 		   </div>
 		</div>
@@ -60,7 +59,9 @@
 	<p>You don't have any rooms listed right now...</p>
 	{% endif %}
 	<br/>
+	{% if edit %}
 	<ul class="ilist">
-	   <li><div class="button"><a href="{% prefix %}/room/create">Create a new room</a></div></li>
+	   <li><div class="button"><a href="{% prefix %}/room/create">Create a New Room</a></div></li>
 	</ul>
+	{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/apps/room/tag.html b/src/templates/apps/room/tag.html
index 7e0a93b..2a19304 100644
--- a/src/templates/apps/room/tag.html
+++ b/src/templates/apps/room/tag.html
@@ -8,25 +8,25 @@
 {% endblock %}
 {% block beforefields %}
 <div class="ui-widget">
-		<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;"> 
-			<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
-			<strong>Note Well</strong> Tags are a way to group related rooms together. Tagging your 
-			room makes your room show up in public lists of rooms hosted on this service and it
-			therefore makes your room more visible.</p>
-		</div>
+	<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;"> 
+		<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
+		<strong>Note Well</strong> Tags are a way to group related rooms together. Tagging your 
+		room makes your room show up in public lists of rooms hosted on this service and it
+		therefore makes your room more visible.</p>
 	</div>
-	<br/>
+</div>
+<br/>
 {% endblock %}
 {% block beforeform %}
-	<h1>Current 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/>
+<h1>Current 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%}/room/+{{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