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/create.html | 7 -- src/templates/apps/room/launch.html | 14 ++-- src/templates/apps/room/list.html | 87 ++++++++++--------- src/templates/apps/room/modify.html | 13 +-- src/templates/apps/room/recordings.html | 51 +++++------- src/templates/apps/room/tag.html | 46 ++++++----- src/templates/apps/room/widget.html | 27 +++--- src/templates/base.html | 142 ++++++++++++++++++-------------- src/templates/edit.html | 47 ++++++----- src/templates/form.html | 62 +++++++------- 10 files changed, 252 insertions(+), 244 deletions(-) (limited to 'src/templates') diff --git a/src/templates/apps/room/create.html b/src/templates/apps/room/create.html index 7989856..b8b3b68 100644 --- a/src/templates/apps/room/create.html +++ b/src/templates/apps/room/create.html @@ -1,8 +1 @@ {% extends "apps/room/modify.html" %} -{% block beforeform %} -
-

- -Here you can create a new meeting room... -

-{% endblock %} \ No newline at end of file diff --git a/src/templates/apps/room/launch.html b/src/templates/apps/room/launch.html index 145d475..00f40c1 100644 --- a/src/templates/apps/room/launch.html +++ b/src/templates/apps/room/launch.html @@ -4,7 +4,9 @@ {% block widgets %} {% endblock %} {% block content %} -

Entering {{room.name}}

+
+

Entering {{room.name}}

+

@@ -22,10 +24,12 @@


- + Enter as Participant + + {% endblock %} \ No newline at end of file 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}}

+
+

{{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
    • -
-
- +
+
{{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%} 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 %} - +
+ Create a New Room +
{% endif %} {% endblock %} {% block validators %} diff --git a/src/templates/apps/room/modify.html b/src/templates/apps/room/modify.html index e76d01f..a2e1b3a 100644 --- a/src/templates/apps/room/modify.html +++ b/src/templates/apps/room/modify.html @@ -1,14 +1,3 @@ -{% extends "form.html" %} +{% extends "edit.html" %} {% block widgets %} - $('#wizard').formwizard({ - validationEnabled: true, - focusFirstInput: true, - textSubmit: "{{submitname}}", - validationOptions: { - rules: { - name: 'required', - urlpath: 'required' - } - } - }); {% endblock %} \ No newline at end of file diff --git a/src/templates/apps/room/recordings.html b/src/templates/apps/room/recordings.html index fde50ac..7c3b863 100644 --- a/src/templates/apps/room/recordings.html +++ b/src/templates/apps/room/recordings.html @@ -4,39 +4,32 @@ {% load roomurl %} {% load tagging_tags %} {% block widgets %} - $("#recordings").accordion({ - header: 'h3', - active: false, - event: "click", - collapsible: true, - navigation: true, - animated: true, - autoHeight: false - }); +$(".collapse").collapse({'parent': '#recordings'}); {% endblock %} {% block meta %} {% endblock %} {% block content %} -

Recordings in '{{room.name}}'

+
+

Recordings in '{{room.name}}'

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

{{r.name}}

-
-

{{r.url}}

-

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

-
    -
  • » Created {{r.date_created|datehumanize}}.
    • -
  • » Modified {{r.date_modified|datehumanize}}.
    • -
  • » Hosted on {{room.acc.name}}
    • -
-
- +
+
{{r.name}}
+
+
+

{{r.url}}

+
{% if r.description %}{{r.description|safe}}{% else %}No description available...{% endif %}
+
    +
  • » Created {{r.date_created|datehumanize}}.
    • +
  • » Modified {{r.date_modified|datehumanize}}.
    • +
  • » Hosted on {{room.acc.name}}
    • +
+ Play Recording +
{% endfor %} @@ -45,11 +38,9 @@

No recordings right now...

{% endif %}
- + Back to '{{room.name}}' {% endblock %} {% block validators %} -[Valid Atom 1.0] -[Valid RSS] +[Valid Atom 1.0] +[Valid RSS] {% endblock %} \ No newline at end of file diff --git a/src/templates/apps/room/tag.html b/src/templates/apps/room/tag.html index 2a19304..dae2f81 100644 --- a/src/templates/apps/room/tag.html +++ b/src/templates/apps/room/tag.html @@ -6,27 +6,29 @@ {% block widgets %} {% 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.

-
+{% block formstyle %} +class="form-inline" +{% endblock %} +{% block justbeforeform %} +
+
+ + 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 visible. This does not mean that anyone can access + your room. +
+ {% if tags %} +
+ {% for tag in tags %} + + {{tag}}  + + + {% endfor %} +
+ {% else %} +
There are no tags yet...
-
+ {% endif %} {% endblock %} -{% block beforeform %} -

Current tags for {{room.name}}

-{% if tags %} -
    - {% for tag in tags %} -
  • {{tag}} 
    • - {% endfor %} -
-{% else %} -There are no tags yet... -{% endif %} -
-{% endblock %} \ No newline at end of file diff --git a/src/templates/apps/room/widget.html b/src/templates/apps/room/widget.html index ee5ea75..a602c7e 100644 --- a/src/templates/apps/room/widget.html +++ b/src/templates/apps/room/widget.html @@ -1,36 +1,39 @@ {% extends "base.html" %} {% load prefix %} {% block widgets %} - SyntaxHighlighter.all() + //SyntaxHighlighter.all() {% endblock %} {% block meta %} - + {% endblock %} {% block content %} -

{{title}}

+
+

{{title}}

+
-
-
-

+

+ The meetingtools jquery widget allows you to easily embed lists of meetings in your own web page using the popular jQuery javascript library. -

Copy the sample html below in order to list rooms tagged with {{tags}}.

-
+
 <html>
    <head>
-      <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
-      <script type="text/javascript" src="{% baseurl %}/site-media/js/jquery.meetingtools.js"></script>
-      <link href="{% baseurl %}/site-media/css/jquery.meetingtools.css" rel="stylesheet" type="text/css" />
+      <script type="text/javascript"
+                 src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+      <script type="text/javascript"
+                 src="{% baseurl %}/site-media/js/jquery.meetingtools.js"></script>
+      <link href="{% baseurl %}/site-media/css/jquery.meetingtools.css"
+               rel="stylesheet" type="text/css" />
       <script type="text/javascript">
          $(function() {
             $("#meetings").meetingtools({tags: '{{tags}}',url: '{% baseurl %}'});
diff --git a/src/templates/base.html b/src/templates/base.html
index 5db54d4..0df70d7 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -1,27 +1,35 @@
 {% load prefix %}
-
-
+
+
 
 	Meeting Tools
 	
 	
-	
-	
-	
+    
+    
+    
+    
+	
+    
 	{% block meta %}{% endblock %}
-    
-    
+    
+    
+    
+    
     
     
-    
+    
 	
-		
+
+	
 	
 	
 	
+    
 	
 	
 	
-	
-	
+	
 	{% block js %}{% endblock %}
 	
 	
 
 
-	

-		
-		

-		   
{% block content %}{% endblock %}

-		

-		

-