diff options
Diffstat (limited to 'src/templates')
| -rw-r--r-- | src/templates/apps/room/list.html | 26 | ||||
| -rw-r--r-- | src/templates/apps/room/tag.html | 13 | ||||
| -rw-r--r-- | src/templates/edit.html | 4 |
3 files changed, 36 insertions, 7 deletions
diff --git a/src/templates/apps/room/list.html b/src/templates/apps/room/list.html index fb47ca1..6423296 100644 --- a/src/templates/apps/room/list.html +++ b/src/templates/apps/room/list.html @@ -3,6 +3,7 @@ {% load datehumanize %} {% load roomurl %} {% load prefix %} +{% load tagging_tags %} {% block widgets %} $("#rooms").accordion({ header: 'h3', @@ -22,11 +23,26 @@ <div id="{{r.id}}"> <h3 class="listheader">{{r.name}}</h3> <div> - <ul> - <li>Created by {{r.creator}} {{r.timecreated|datehumanize}}.</li> - {% if r.lastvisited %}<li>Last visited {{r.lastvisited|datehumanize}}{% if r.user_count %}when there was {{r.user_count}} user{{r.user_count|pluralize}} in the room{%endif%}.</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> - </ul> + <ul class="ilist"> + <li style="vertical-align: top;"> + <ul class="nlist"> + {% if r.self_cleaning %}<li>Room will be reset when empty.</li>{% endif %} + <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%} + <li>Meeting room URL: <a href="{{r|roomurl}}">{{r|roomurl}}<span style="vertical-align: bottom;" class="ui-icon ui-icon-extlink"></span></a></li> + </ul> + </li> + {% tags_for_object r as tags %} + <li style="vertical-align: top;"> + <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> + </ul> + </li> + </ul> + <br/> {% if r.description %} <p class="ui-widget">{{r.description|safe}}</p> diff --git a/src/templates/apps/room/tag.html b/src/templates/apps/room/tag.html index d8c666e..6bf01a0 100644 --- a/src/templates/apps/room/tag.html +++ b/src/templates/apps/room/tag.html @@ -6,8 +6,19 @@ {% block widgets %} {% 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> + <br/> +{% endblock %} {% block beforeform %} - <h1>Tags for {{room.name}}</h1> + <h1>Current tags for {{room.name}}</h1> {% if tags %} <ul class="ilist"> {% for tag in tags %} diff --git a/src/templates/edit.html b/src/templates/edit.html index 400a087..a5986bb 100644 --- a/src/templates/edit.html +++ b/src/templates/edit.html @@ -3,7 +3,8 @@ {% block content %} {% block beforeform %}{% endblock %} <h1>{{formtitle}}</h1> -<form method="POST" class="ui-widget ui-corner-all ui-state-highlight bbq infopanel" style="width: 50%"> +<form method="POST" class="ui-widget ui-corner-all ui-state-highlight bbq infopanel" style="width: 66%"> +{% block beforefields %}{% endblock %} <ul class="links"> {% for field in form %} {% if field.is_hidden %} @@ -19,6 +20,7 @@ </ul> <ul class="ilist" style="padding-top: 10px; padding-bottom: 5px;"> <li class="button"><input type="submit" value="{{submitname}}" /></li> + <li class="button"><input type="button" onClick="document.location='{% prefix %}/rooms'" value="Done"/></li> <li class="button right"><input type="button" onClick="document.location='{% prefix %}/rooms'" value="Cancel"/></li> </ul> </form> |