From 8729e4acbde0f180a84f73247f6871167682ed37 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 11 May 2011 15:16:23 +0200 Subject: new views for listing tags --- src/templates/apps/room/list.html | 33 +++++++++++++++++---------------- src/templates/apps/room/tag.html | 36 ++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 34 deletions(-) (limited to 'src/templates/apps/room') 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 %} -

Your meeting rooms

+

{{title}}

{% if rooms %}
{% for r in rooms %} @@ -25,32 +25,31 @@
  • -
      - {% if r.self_cleaning %}
    • Room will be reset when empty.
      • {% endif %} +
      • Created by {{r.creator}} {{r.timecreated|datehumanize}}.
        • - {% if r.lastvisited %}
      • Last visited {{r.lastvisited|datehumanize}} when there was {{r.nusers}} user{{r.nusers|pluralize}} in the room.
        • {%endif%} + {% if r.self_cleaning %}
      • Room will be reset when empty.
        • {%else%}
      • Room state is preserved between sessions.
        • {% endif %} + {% if r.lastvisited %}
      • Last visited {{r.lastvisited|datehumanize}}
        • {%endif%}
      • Meeting room URL: {{r|roomurl}}
        • +
      • Hosted on {{r.acc.name}}
      {% tags_for_object r as tags %} -
    • +
      • -
      • Room tags: - {% for tag in tags %} - {{tag}} - {% endfor %} ... manage room tags
        • +
      • {{r.name}}

        {% if r.description %}{{r.description|safe}}{% else %}No description available...{% endif %}

        • +
      • Tags: {% for tag in tags %}{{tag}}{% endfor %} {%if edit %}... manage room tags{%endif%}

    - {% if r.description %} -

    {{r.description|safe}}

    - {% endif %}
@@ -60,7 +59,9 @@

You don't have any rooms listed right now...

{% endif %}
+ {% if edit %} + {% 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 %}
-
-

- Note Well 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.

-
+
+

+ Note Well 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.

-
+
+
{% endblock %} {% block beforeform %} -

Current tags for {{room.name}}

- {% if tags %} - - {% else %} - There are no tags yet... - {% endif %} -
+

Current tags for {{room.name}}

+{% if tags %} + +{% else %} +There are no tags yet... +{% endif %} +
{% endblock %} \ No newline at end of file -- cgit v1.1