From ec839d583fff6b279c7cdec2fdf87762f81f9aa5 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 2 Oct 2012 22:23:54 +0200 Subject: - bootstrap - cleanup - bugfixes --- src/templates/apps/room/list.html | 87 +++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 45 deletions(-) (limited to 'src/templates/apps/room/list.html') diff --git a/src/templates/apps/room/list.html b/src/templates/apps/room/list.html index 34f5b6e..1ac034a 100644 --- a/src/templates/apps/room/list.html +++ b/src/templates/apps/room/list.html @@ -4,22 +4,15 @@ {% load roomurl %} {% load tagging_tags %} {% block widgets %} - $("#rooms").accordion({ - header: 'h3', - event: "click", - collapsible: true, - navigation: true, - animated: true, - autoHeight: false - }); + $(".collapse").collapse({'parent': '#rooms'}); $(".occupation").click(function(e) { - $(this).find(".occupation-info").first().load("{% prefix %}/api/room/"+$(this).parents('.room').first().attr('id')+"/occupation") + $(this).find(".occupation-info").first().load("{% prefix %}/api/room/"+$(this).parents('.accordion-body').attr('id')+"/occupation") }); $(".occupation").ajaxStart(function() { - $(".occupation > span.ui-icon-refresh").removeClass("ui-icon-refresh").removeClass("ui-icon").addClass("spinner").spin("custom"); + $(".occupation i.icon-refresh").removeClass("icon-refresh").addClass("spinner").spin("custom"); }).ajaxStop(function() { - $(".occupation > span.spinner").spin(false); - $(".occupation > span.spinner").addClass("ui-icon-refresh").addClass("ui-icon").removeClass("spinner"); + $(".occupation i.spinner").spin(false); + $(".occupation i.spinner").addClass("icon-refresh").removeClass("spinner"); }); {% endblock %} {% block meta %} @@ -29,38 +22,42 @@ {% endif %} {% endblock %} {% block content %} -

{{title}}

+ {% if rooms %} -
+
{% for r in rooms %} -
-

{{r.name}}

-
- {% tags_for_object r as tags %} -

{{r|roomurl}}

-

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

-
    -
  • » Tags: {% for tag in tags %}{{tag}}{% endfor %} {%if edit %}... manage room tags{%endif%}
  • -
  • » Created by {{r.creator}} {{r.timecreated|datehumanize}}.
  • -
  • » {%if r.nusers%}There are {{r.nusers}} users present, {{r.nhosts}} of whom are hosts.{%else%}The room is currently unoccupied.{%endif%}
  • - {% if r.self_cleaning %}
  • » Room will be reset when empty.
  • {%else%}
  • » Room state is preserved between sessions.
  • {% endif %} - {% if r.allow_host %}
  • » First participant can elect to become host.
  • {% endif %} - {% if r.lastvisited %}
  • » Last visited {{r.lastvisited|datehumanize}}
  • {%endif%} -
  • » Hosted on {{r.acc.name}} - room usage plot
  • -
-
- +
+ +
+
+ {% tags_for_object r as tags %} +

{{r|roomurl}}

+

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

+
    +
  • » Tags: {% for tag in tags %}{{tag}}{% endfor %} {%if edit %}... manage room tags{%endif%}
  • +
  • » Created by {{r.creator}} {{r.timecreated|datehumanize}}.
  • +
  • » {%if r.nusers%}There are {{r.nusers}} users present, {{r.nhosts}} of whom are hosts.{%else%}The room is currently unoccupied.{%endif%} refresh
  • + {% if r.self_cleaning %}
  • » Room will be reset when empty.
  • {%else%}
  • » Room state is preserved between sessions.
  • {% endif %} + {% if r.allow_host %}
  • » First participant can elect to become host.
  • {% endif %} + {% if r.lastvisited %}
  • » Last visited {{r.lastvisited|datehumanize}}
  • {%endif%} +
  • » Hosted on {{r.acc.name}} room usage plot
  • +
+
+
+ Enter Room + {% if edit %} + Room Tags + Room Recordings + Modify Room + {% if room.is_locked %} + Unlock Room + {% endif %} + Delete Room + {% endif %} +
+
{% endfor %} @@ -70,9 +67,9 @@ {% endif %}
{% if edit %} - + {% endif %} {% endblock %} {% block validators %} -- cgit v1.1