From ee1a49c4be871d9b0ca78cf801d44f52c4fd2dc4 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 26 Mar 2011 15:59:19 +0000 Subject: [PATCH] Merged [2961] from kivinen@iki.fi: Restructured to be cleaner. Implemented text version of the list of working group drafts. - Legacy-Id: 2969 Note: SVN reference [2961] has been migrated to Git commit 4c59872221f66de1d9d00bdcee9d699751c335a6 --- ietf/templates/wginfo/wg_documents.txt | 2 ++ ietf/templates/wginfo/wg_documents_entry.txt | 1 + ietf/wginfo/urls.py | 3 ++- ietf/wginfo/views.py | 12 +++++++++--- 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 ietf/templates/wginfo/wg_documents.txt create mode 100644 ietf/templates/wginfo/wg_documents_entry.txt diff --git a/ietf/templates/wginfo/wg_documents.txt b/ietf/templates/wginfo/wg_documents.txt new file mode 100644 index 000000000..3b46a8249 --- /dev/null +++ b/ietf/templates/wginfo/wg_documents.txt @@ -0,0 +1,2 @@ +{% load ietf_filters %}{% regroup docs by view_sort_group as grouped_docs %}{% for doc_group in grouped_docs %}{% for doc in doc_group.list %}{% include "wginfo/wg_documents_entry.txt" %}{% endfor %}{% endfor %}{% regroup docs_related by view_sort_group as grouped_docs_related %}{% for doc_group in grouped_docs_related %}{% for doc in doc_group.list %}Related {% include "wginfo/wg_documents_entry.txt" %}{% endfor %}{% endfor %} + diff --git a/ietf/templates/wginfo/wg_documents_entry.txt b/ietf/templates/wginfo/wg_documents_entry.txt new file mode 100644 index 000000000..13115a09c --- /dev/null +++ b/ietf/templates/wginfo/wg_documents_entry.txt @@ -0,0 +1 @@ +{{doc_group.grouper}} {% if doc.rfc %}{{doc.rfc.rfc_number}} {{doc.rfc.title}}{% else %}{{doc.id.draft_name_and_revision}} {{doc.id.title}}{% endif %} diff --git a/ietf/wginfo/urls.py b/ietf/wginfo/urls.py index 00475e7d9..70560cec6 100644 --- a/ietf/wginfo/urls.py +++ b/ietf/wginfo/urls.py @@ -13,6 +13,7 @@ urlpatterns = patterns('', (r'^1wg-summary-by-acronym.txt', views.wg_summary_acronym), (r'^1wg-charters.txt', views.wg_charters), (r'^1wg-charters-by-acronym.txt', views.wg_charters_by_acronym), - (r'^(?P[^/]+)/$', views.wg_documents), + (r'^txt/(?P[^/]+)/$', views.wg_documents_txt), + (r'^(?P[^/]+)/$', views.wg_documents_html), (r'^(?P[^/]+)/charter/$', views.wg_charter), ) diff --git a/ietf/wginfo/views.py b/ietf/wginfo/views.py index 64ec4af57..47c491564 100644 --- a/ietf/wginfo/views.py +++ b/ietf/wginfo/views.py @@ -83,9 +83,15 @@ def wg_documents(request, acronym): if ( len(parts) >= 3): if parts[1] != "ietf" and parts[2].startswith(wg.group_acronym.acronym+"-"): docs_related_pruned.append(d) - - return render_to_response('wginfo/wg_documents.html', {'wg': wg, 'concluded':concluded, 'selected':'documents', 'docs':docs, 'meta':meta, - 'docs_related':docs_related_pruned, 'meta_related':meta_related}, RequestContext(request)) + return wg, concluded, docs, meta, docs_related_pruned, meta_related + +def wg_documents_txt(request, acronym): + wg, concluded, docs, meta, docs_related, meta_related = wg_documents(request, acronym) + return HttpResponse(loader.render_to_string('wginfo/wg_documents.txt', {'wg': wg, 'concluded':concluded, 'selected':'documents', 'docs':docs, 'meta':meta, 'docs_related':docs_related, 'meta_related':meta_related}),mimetype='text/plain; charset=UTF-8') + +def wg_documents_html(request, acronym): + wg, concluded, docs, meta, docs_related, meta_related = wg_documents(request, acronym) + return render_to_response('wginfo/wg_documents.html', {'wg': wg, 'concluded':concluded, 'selected':'documents', 'docs':docs, 'meta':meta, 'docs_related':docs_related, 'meta_related':meta_related}, RequestContext(request)) def wg_charter(request, acronym): wg = get_object_or_404(IETFWG, group_acronym__acronym=acronym, group_type=1)