diff options
Diffstat (limited to 'src/templates/apps/room')
| -rw-r--r-- | src/templates/apps/room/launch.html | 7 | ||||
| -rw-r--r-- | src/templates/apps/room/list.html | 29 | ||||
| -rw-r--r-- | src/templates/apps/room/recordings.html | 12 | ||||
| -rw-r--r-- | src/templates/apps/room/retry.html | 6 | ||||
| -rw-r--r-- | src/templates/apps/room/tag.html | 6 | ||||
| -rw-r--r-- | src/templates/apps/room/widget.html | 13 |
6 files changed, 28 insertions, 45 deletions
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 @@ </div> <br/> <div> - <a class="btn btn-large" href="{% prefix %}/rooms#{{room.id}}">Cancel</a> + <a class="btn btn-large" href="/rooms#{{room.id}}">Cancel</a> {%if room.nhosts == 0 %} - <a class="btn btn-large btn-success" href="{% prefix %}/accounts/login-federated?next=/promote/{{room.id}}">Enter as Host</a> + <a class="btn btn-large btn-success" href="/accounts/login-federated?next=/promote/{{room.id}}">Enter as Host</a> {% endif %} - <a class="btn btn-large btn-primary" href="{% prefix %}/launch/{{room.id}}">Enter as Participant</a> + <a class="btn btn-large btn-primary" href="/launch/{{room.id}}">Enter as Participant</a> </div> {% 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 %} -<link rel="alternate" type="application/rss+xml" title="{{title}} (RSS 2.0)" href="{% prefix %}/room/+{{tags}}.rss" /> -<link rel="alternate" type="application/atom+xml" title="{{title}} (ATOM 1.0)" href="{% prefix %}/room/+{{tags}}.atom" /> +<link rel="alternate" type="application/rss+xml" title="{{title}} (RSS 2.0)" href="/room/+{{tags}}.rss" /> +<link rel="alternate" type="application/atom+xml" title="{{title}} (ATOM 1.0)" href="/room/+{{tags}}.atom" /> {% endif %} {% endblock %} {% block content %} @@ -36,25 +35,25 @@ <p><a target="_connect" href="{{r|roomurl}}">{{r|roomurl}}</a></p> <p class="well">{% if r.description %}{{r.description|safe}}{% else %}<em>No description available...</em>{% endif %}</p> <ul class="unstyled" style="padding-left: 2px;"> - <li>» Tags: {% for tag in tags %}<a style="margin-right: 5px;" href="{% prefix %}/room/+{{tag}}">{{tag}}</a>{% endfor %} {%if edit %}<a style="font-size: 75%;" href="{% prefix %}/room/{{r.id}}/tag"><em>... manage room tags</em></a>{%endif%}</li> + {% if tags %}<li>» {% for tag in tags %}<a class="badge" href="/room/+{{tag}}">{{tag}}</a>{% endfor %}{%if edit %} <a class="btn btn-mini btn-info" href="/room/{{r.id}}/tag">manage room tags</a>{%endif%}</li>{% endif %} <li>» Created by {{r.creator}} {{r.timecreated|datehumanize}}.</li> <li>» <span class="occupation"><span class="occupation-info">{%if r.nusers%}There are {{r.nusers}} users present, {{r.nhosts}} of whom are hosts.{%else%}The room is currently unoccupied.{%endif%}</span><a href="#" class="btn btn-mini btn-info"><i class="icon-refresh"> </i>refresh</a></span></li> {% if r.self_cleaning %}<li>» Room will be reset when empty.</li>{%else%}<li>» Room state is preserved between sessions.</li>{% endif %} {% if r.allow_host %}<li>» First participant can elect to become host.</li>{% endif %} {% if r.lastvisited %}<li>» Last visited {{r.lastvisited|datehumanize}}</li>{%endif%} - <li>» Hosted on {{r.acc.name}} <a class="btn btn-mini btn-info" href="{% prefix %}/stats/room/{{r.id}}">room usage plot</a></li> + <li>» Hosted on {{r.acc.name}} <a class="btn btn-mini btn-info" href="/stats/room/{{r.id}}">room usage plot</a></li> </ul> <br/> <div class="btn-group"> - <a class="btn" target="_blank" href="{% prefix %}/go/{{r.id}}">Enter Room</a> + <a class="btn" target="_blank" href="/go/{{r.id}}">Enter Room</a> {% if edit %} - <a class="btn" href="{% prefix %}/room/{{r.id}}/tag">Room Tags</a> - <a class="btn" href="{% prefix %}/room/{{r.id}}/recordings">Room Recordings</a> - <a class="btn" href="{% prefix %}/room/{{r.id}}/modify">Modify Room</a> + <a class="btn" href="/room/{{r.id}}/tag">Room Tags</a> + <a class="btn" href="/room/{{r.id}}/recordings">Room Recordings</a> + <a class="btn" href="/room/{{r.id}}/modify">Modify Room</a> {% if room.is_locked %} - <a class="btn" href="{% prefix %}/room/{{r.id}}/unlock">Unlock Room</a> + <a class="btn" href="/room/{{r.id}}/unlock">Unlock Room</a> {% endif %} - <a class="btn btn-danger" href="{% prefix %}/room/{{r.id}}/delete">Delete Room</a> + <a class="btn btn-danger" href="/room/{{r.id}}/delete">Delete Room</a> {% endif %} </div> </div> @@ -68,13 +67,13 @@ <br/> {% if edit %} <div class="btn-group"> - <a class="btn btn-success" href="{% prefix %}/room/create">Create a New Room</a> + <a class="btn btn-success" href="/room/create">Create a New Room</a> </div> {% endif %} {% endblock %} {% block validators %} {% if tags %} -<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}{% prefix %}/room/+{{tags}}.atom"><img src="{% prefix %}/site-media/img/valid-atom.png" alt="[Valid Atom 1.0]" title="Validate my Atom 1.0 feed" /></a> -<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}{% prefix %}/room/+{{tags}}.rss"><img src="{% prefix %}/site-media/img/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a> +<a href="http://feed1.w3.org/check.cgi?url=/room/+{{tags}}.atom"><img src="{{STATIC_URL}}/img/valid-atom.png" alt="[Valid Atom 1.0]" title="Validate my Atom 1.0 feed" /></a> +<a href="http://feed1.w3.org/check.cgi?url=/room/+{{tags}}.rss"><img src="{{STATIC_URL}}/img/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a> {% 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 %} -<link rel="alternate" type="application/rss+xml" title="{{title}} recordings (RSS 2.0)" href="{% prefix %}/room/{{room.id}}/recordings.rss" /> -<link rel="alternate" type="application/atom+xml" title="{{title}} recordings (ATOM 1.0)" href="{% prefix %}/room/{{room.id}}/recordings.atom" /> +<link rel="alternate" type="application/rss+xml" title="{{title}} recordings (RSS 2.0)" href="/room/{{room.id}}/recordings.rss" /> +<link rel="alternate" type="application/atom+xml" title="{{title}} recordings (ATOM 1.0)" href="/room/{{room.id}}/recordings.atom" /> {% endblock %} {% block content %} <div class="page-header"> @@ -38,9 +38,9 @@ $(".collapse").collapse({'parent': '#recordings'}); <p>No recordings right now...</p> {% endif %} <br/> - <a class="btn" href="{%prefix%}/room#{{room.id}}">Back to '{{room.name}}'</a> + <a class="btn" href="/room#{{room.id}}">Back to '{{room.name}}'</a> {% endblock %} {% block validators %} -<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}{% prefix %}/room/{{room.id}}/recordings.atom"><img src="{% prefix %}/static/img/valid-atom.png" alt="[Valid Atom 1.0]" title="Validate my Atom 1.0 feed" /></a> -<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}{% prefix %}/room/{{room.id}}/recordings.rss"><img src="{% prefix %}/static/img/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a> +<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}/room/{{room.id}}/recordings.atom"><img src="{{STATIC_URL}}/img/valid-atom.png" alt="[Valid Atom 1.0]" title="Validate my Atom 1.0 feed" /></a> +<a href="http://feed1.w3.org/check.cgi?url={% baseurl %}/room/{{room.id}}/recordings.rss"><img src="{{STATIC_URL}}/img/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a> {% 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 %} + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> -<meta HTTP-EQUIV="REFRESH" content="{{wait}}; url={% prefix %}/go/{{room.urlpath}}"/> +<meta HTTP-EQUIV="REFRESH" content="{{wait}}; url=/go/{{room.urlpath}}"/> </head> <body> <h1>Room is temporarily locked</h1> <p>Retrying room in {{wait}} seconds...</p> -<img src="{% prefix %}/site-media/img/ajax-loader.gif"/> +<img src="{{STATIC_URL}}img/ajax-loader.gif"/> </body> </html>
\ 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" <div> {% for tag in tags %} <span class="btn-group"> - <a class="btn btn-small" href="{%prefix%}/room/+{{tag}}">{{tag}}</a> - <a class="btn btn-small btn-warning" href="{% prefix %}/room/{{room.id}}/untag/{{tag}}"><i class="icon-remove"></i></a> + <a class="btn btn-small" href="/room/+{{tag}}">{{tag}}</a> + <a class="btn btn-small btn-warning" href="/room/{{room.id}}/untag/{{tag}}"><i class="icon-remove"></i></a> </span> {% endfor %} </div> 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 %} -<!-- script type="text/javascript" src="{% prefix %}/site-media/js/xregexp-min.js"></script> -<script type="text/javascript" src="{% prefix %}/site-media/js/shCore.js"></script> -<script type="text/javascript" src="{% prefix %}/site-media/js/shAutoloader.js"></script> -<script type="text/javascript" src="{% prefix %}/site-media/js/shLegacy.js"></script> -<script type="text/javascript" src="{% prefix %}/site-media/js/shBrushXml.js"></script> -<link href="{% prefix %}/site-media/css/shCore.css" rel="stylesheet" type="text/css" /> -<link href="{% prefix %}/site-media/css/shThemeDefault.css" rel="stylesheet" type="text/css" / --> -{% endblock %} {% block content %} <div class="page-header"> <h1>{{title}}</h1> |