From a8f72fab3a15120da2332c314836c1b521e9091a Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Thu, 4 Oct 2012 15:11:49 +0200 Subject: settings cleanup remove broken prefix-handler --- src/templates/apps/auth/login.html | 15 +++++---------- src/templates/apps/room/launch.html | 7 +++---- src/templates/apps/room/list.html | 29 ++++++++++++++--------------- src/templates/apps/room/recordings.html | 12 ++++++------ src/templates/apps/room/retry.html | 6 +++--- src/templates/apps/room/tag.html | 6 ++---- src/templates/apps/room/widget.html | 13 ------------- src/templates/apps/stats/domain.html | 5 ++--- src/templates/apps/stats/room.html | 5 ++--- src/templates/apps/stats/user.html | 5 ++--- 10 files changed, 39 insertions(+), 64 deletions(-) (limited to 'src/templates/apps') diff --git a/src/templates/apps/auth/login.html b/src/templates/apps/auth/login.html index 4bb819c..e72e73a 100644 --- a/src/templates/apps/auth/login.html +++ b/src/templates/apps/auth/login.html @@ -1,16 +1,11 @@ {% extends "base.html" %} -{% load prefix %} {% block headline %}Login{% endblock %} {% block title %}SUNET Meeting Tools{% endblock %} {% block content %} -

The SUNET meetingtools is an alternative interface to Adobe Connect. With this tool you can...

Create self-cleaning rooms.
Tag rooms to provide easy access to lists of rooms for your university or research group.
Display lists of rooms on your own website.
Manage recordings for your rooms.

Online Meetings

Welcome to the meeting tools. Either Login to manage + your meeting rooms and recordings, or ...

+ Click here to Start a Meeting Now »»

{% endblock %} \ No newline at end of file diff --git a/src/templates/apps/room/launch.html b/src/templates/apps/room/launch.html index 00f40c1..204345d 100644 --- a/src/templates/apps/room/launch.html +++ b/src/templates/apps/room/launch.html @@ -1,6 +1,5 @@ {% extends "base.html" %} {% load datehumanize %} -{% load prefix %} {% block widgets %} {% endblock %} {% block content %} @@ -25,11 +24,11 @@

- Cancel + Cancel {%if room.nhosts == 0 %} - Enter as Host + Enter as Host {% endif %} - Enter as Participant + 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 1ac034a..4e83466 100644 --- a/src/templates/apps/room/list.html +++ b/src/templates/apps/room/list.html @@ -1,12 +1,11 @@ {% extends "base.html" %} -{% load prefix %} {% load datehumanize %} {% load roomurl %} {% load tagging_tags %} {% block widgets %} $(".collapse").collapse({'parent': '#rooms'}); $(".occupation").click(function(e) { - $(this).find(".occupation-info").first().load("{% prefix %}/api/room/"+$(this).parents('.accordion-body').attr('id')+"/occupation") + $(this).find(".occupation-info").first().load("/api/room/"+$(this).parents('.accordion-body').attr('id')+"/occupation") }); $(".occupation").ajaxStart(function() { $(".occupation i.icon-refresh").removeClass("icon-refresh").addClass("spinner").spin("custom"); @@ -17,8 +16,8 @@ {% endblock %} {% block meta %} {% if tags %} - - + + {% endif %} {% endblock %} {% block content %} @@ -36,25 +35,25 @@

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

» Tags: {% for tag in tags %}{{tag}}{% endfor %} {%if edit %}... manage room tags{%endif%}
» {% 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
» Room will be reset when empty.
» Room state is preserved between sessions.
» First participant can elect to become host.
» Last visited {{r.lastvisited|datehumanize}}
» Hosted on {{r.acc.name}} room usage plot
» Hosted on {{r.acc.name}} room usage plot

- Enter Room + Enter Room {% if edit %} - Room Tags - Room Recordings - Modify Room + Room Tags + Room Recordings + Modify Room {% if room.is_locked %} - Unlock Room + Unlock Room {% endif %} - Delete Room + Delete Room {% endif %}

@@ -68,13 +67,13 @@
{% if edit %}

- Create a New Room + Create a New Room

{% endif %} {% endblock %} {% block validators %} {% if tags %} -

{% endif %} {% endblock %} \ No newline at end of file diff --git a/src/templates/apps/room/recordings.html b/src/templates/apps/room/recordings.html index 7c3b863..8e95b09 100644 --- a/src/templates/apps/room/recordings.html +++ b/src/templates/apps/room/recordings.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load prefix %} + {% load datehumanize %} {% load roomurl %} {% load tagging_tags %} @@ -7,8 +7,8 @@ $(".collapse").collapse({'parent': '#recordings'}); {% endblock %} {% block meta %} - - + + {% endblock %} {% block content %}

@@ -38,9 +38,9 @@ $(".collapse").collapse({'parent': '#recordings'});

No recordings right now...

{% endif %}
- Back to '{{room.name}}' + Back to '{{room.name}}' {% endblock %} {% block validators %} -

{% endblock %} \ No newline at end of file diff --git a/src/templates/apps/room/retry.html b/src/templates/apps/room/retry.html index 0e27e77..28054cc 100644 --- a/src/templates/apps/room/retry.html +++ b/src/templates/apps/room/retry.html @@ -1,13 +1,13 @@ -{% load prefix %} + - +

Room is temporarily locked

Retrying room in {{wait}} seconds...

\ No newline at end of file diff --git a/src/templates/apps/room/tag.html b/src/templates/apps/room/tag.html index dae2f81..087862f 100644 --- a/src/templates/apps/room/tag.html +++ b/src/templates/apps/room/tag.html @@ -1,8 +1,6 @@ {% extends "edit.html" %} -{% load prefix %} {% load datehumanize %} {% load roomurl %} -{% load prefix %} {% block widgets %} {% endblock %} @@ -22,8 +20,8 @@ class="form-inline"

{% for tag in tags %} - {{tag}} - + {{tag}} + {% endfor %}

diff --git a/src/templates/apps/room/widget.html b/src/templates/apps/room/widget.html index a602c7e..a658a17 100644 --- a/src/templates/apps/room/widget.html +++ b/src/templates/apps/room/widget.html @@ -1,17 +1,4 @@ {% extends "base.html" %} -{% load prefix %} -{% block widgets %} - //SyntaxHighlighter.all() -{% endblock %} -{% block meta %} - -{% endblock %} {% block content %}

diff --git a/src/templates/apps/stats/domain.html b/src/templates/apps/stats/domain.html index 93fb1a9..f7d9ad3 100644 --- a/src/templates/apps/stats/domain.html +++ b/src/templates/apps/stats/domain.html @@ -1,9 +1,8 @@ {% extends "base.html" %} {% load datehumanize %} -{% load prefix %} {% block widgets %} $.ajax({ - url: '{% prefix %}/api/stats/domain/{{domain}}', + url: '/api/stats/domain/{{domain}}', method: 'GET', success: function (resp) { var graph = $('#graph'); @@ -28,7 +27,7 @@ $.ajax({ Total minutes: Total rooms: Total unique users: - Look at your own statistics + Look at your own statistics

{% endblock %} \ No newline at end of file diff --git a/src/templates/apps/stats/room.html b/src/templates/apps/stats/room.html index 7a2a25f..d5e35dd 100644 --- a/src/templates/apps/stats/room.html +++ b/src/templates/apps/stats/room.html @@ -1,9 +1,8 @@ {% extends "base.html" %} {% load datehumanize %} -{% load prefix %} {% block widgets %} $.ajax({ - url: '{% prefix %}/api/stats/room/{{room.id}}', + url: '/api/stats/room/{{room.id}}', method: 'GET', success: function (resp) { var graph = $('#graph'); @@ -26,7 +25,7 @@ $.ajax({ - +

Total minutes:
Total unique users:
Look at your own statistics
Look at your own statistics

{% endblock %} \ No newline at end of file diff --git a/src/templates/apps/stats/user.html b/src/templates/apps/stats/user.html index 35a40fb..8b08c6c 100644 --- a/src/templates/apps/stats/user.html +++ b/src/templates/apps/stats/user.html @@ -1,9 +1,8 @@ {% extends "base.html" %} {% load datehumanize %} -{% load prefix %} {% block widgets %} $.ajax({ - url: '{% prefix %}/api/stats/user/{{username}}', + url: '/api/stats/user/{{username}}', method: 'GET', success: function (resp) { var graph = $('#graph'); @@ -26,7 +25,7 @@ $.ajax({ - +

Total minutes:
Total rooms:
Look at statistics for {{domain}}
Look at statistics for {{domain}}

{% endblock %} \ No newline at end of file -- cgit v1.1

Online Meetings

Room is temporarily locked

{{title}}