diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/meetingtools/urls.py | 4 | ||||
| -rw-r--r-- | src/templates/apps/room/list.html | 6 | ||||
| -rw-r--r-- | src/templates/base.html | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/meetingtools/urls.py b/src/meetingtools/urls.py index 7fc5f6e..d134d6b 100644 --- a/src/meetingtools/urls.py +++ b/src/meetingtools/urls.py @@ -28,7 +28,9 @@ urlpatterns = patterns('', (r'^room/(\d+)/delete$','meetingtools.apps.room.views.delete'), (r'^room/(\d+)/tag$','meetingtools.apps.room.views.tag'), (r'^room/(\d+)/untag/(.+)$','meetingtools.apps.room.views.untag'), - (r'^room/\+(.+)','meetingtools.apps.room.views.list_by_tag'), + (r'^widget/\+(.+)$','meetingtools.apps.room.views.widget'), + (r'^room/\+(.+)\.(?:[^\.]+)$','meetingtools.apps.room.views.list_by_tag'), + (r'^room/\+(.+)$','meetingtools.apps.room.views.list_by_tag'), # Uncomment the admin/doc line below to enable admin documentation: # (r'^admin/doc/', include('django.contrib.admindocs.urls')), diff --git a/src/templates/apps/room/list.html b/src/templates/apps/room/list.html index a8c8954..126c591 100644 --- a/src/templates/apps/room/list.html +++ b/src/templates/apps/room/list.html @@ -2,7 +2,6 @@ {% load prefix %} {% load datehumanize %} {% load roomurl %} -{% load prefix %} {% load tagging_tags %} {% block widgets %} $("#rooms").accordion({ @@ -15,6 +14,11 @@ autoHeight: false }); {% endblock %} +{% block meta %} +{% if tags %} +<link rel="alternate" type="application/rss+xml" title="{{title}} (RSS 2.0)" href="{% prefix %}/room/+{{tags}}.rss" /> +{% endif %} +{% endblock %} {% block content %} <h1>{{title}}</h1> {% if rooms %} diff --git a/src/templates/base.html b/src/templates/base.html index a405345..202ad1c 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -10,12 +10,13 @@ <link type="text/css" href="{% prefix %}/site-media/css/sunet/jquery-ui-1.8.11.custom.css" rel="stylesheet"> <link href="{% prefix %}/site-media/css/style.css" rel="stylesheet" type="text/css" /> <link href="{% prefix %}/site-media/css/gs.css" rel="stylesheet" type="text/css" /> + {% block meta %}{% endblock %} <script type="text/javascript" src="{% prefix %}/site-media/js/jquery-1.5.1.min.js"></script> <script type="text/javascript" src="{% prefix %}/site-media/js/jquery-ui-1.8.11.custom.min.js"></script> <script type="text/javascript" src="{% prefix %}/site-media/js/jquery.validate.js"></script> <script type="text/javascript" src="{% prefix %}/site-media/js/bbq.js"></script> <script type="text/javascript" src="{% prefix %}/site-media/js/jquery.form.wizard-3.0.4.js"></script> - + <script type="text/javascript" src="{% prefix %}/site-media/js/jquery.meetingtools.js"></script> <!--[if IE]> <link href="css/sunet-ie6.css" rel="stylesheet" type="text/css" /> <![endif]--> |