From 23cdddf696b5aea0ff695082fa97ce67d66b034e Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 19 Sep 2013 18:21:16 +0000 Subject: [PATCH] Added overview pages for non-ietf-stream documents (ise, iab, irtf). - Legacy-Id: 6202 --- ietf/group/stream_urls.py | 14 +++++++++++ ietf/group/views.py | 29 ++++++++++++++++++++++ ietf/templates/base_leftmenu.html | 6 +++++ ietf/templates/group/index.html | 26 +++++++++++++++++++ ietf/templates/group/stream_documents.html | 15 +++++++++++ ietf/urls.py | 1 + 6 files changed, 91 insertions(+) create mode 100644 ietf/group/stream_urls.py create mode 100644 ietf/group/views.py create mode 100644 ietf/templates/group/index.html create mode 100644 ietf/templates/group/stream_documents.html diff --git a/ietf/group/stream_urls.py b/ietf/group/stream_urls.py new file mode 100644 index 000000000..c256c41a7 --- /dev/null +++ b/ietf/group/stream_urls.py @@ -0,0 +1,14 @@ +# Copyright The IETF Trust 2008, All Rights Reserved + +from django.conf.urls.defaults import patterns, include + +import views + +urlpatterns = patterns('', + (r'^$', views.streams), + (r'^(?P[a-zA-Z0-9-]+)/$', views.stream_documents, None), +# (r'^(?P[a-zA-Z0-9-]+)/history/$', views.stream_history), +# (r'^(?P[a-zA-Z0-9-]+)/edit/$', views.stream_edit) + (r'^management/', include('ietf.ietfworkflows.urls')), + +) diff --git a/ietf/group/views.py b/ietf/group/views.py new file mode 100644 index 000000000..9d7eefbbd --- /dev/null +++ b/ietf/group/views.py @@ -0,0 +1,29 @@ +# Copyright The IETF Trust 2008, All Rights Reserved + +from django.shortcuts import render_to_response +from django.template import RequestContext, loader +from django.http import Http404, HttpResponse + +from ietf.group.models import Group +from ietf.doc.models import Document +from ietf.doc.views_search import SearchForm, retrieve_search_results +from ietf.name.models import StreamName + +import debug + +def streams(request): + streams = [ s.slug for s in StreamName.objects.all().exclude(slug__in=['ietf', 'legacy']) ] + streams = Group.objects.filter(acronym__in=streams) + return render_to_response('group/index.html', {'streams':streams}, context_instance=RequestContext(request)) + +def stream_documents(request, acronym): + streams = [ s.slug for s in StreamName.objects.all().exclude(slug__in=['ietf', 'legacy']) ] + if not acronym in streams: + raise Http404("No such stream: %s" % acronym) + stream = StreamName.objects.get(slug=acronym) + form = SearchForm({'by':'stream', 'stream':acronym, + 'rfcs':'on', 'activedrafts':'on'}) + docs, meta = retrieve_search_results(form) + return render_to_response('group/stream_documents.html', {'stream':stream, 'docs':docs, 'meta':meta }, context_instance=RequestContext(request)) + + \ No newline at end of file diff --git a/ietf/templates/base_leftmenu.html b/ietf/templates/base_leftmenu.html index be10b1501..834a2aceb 100644 --- a/ietf/templates/base_leftmenu.html +++ b/ietf/templates/base_leftmenu.html @@ -95,6 +95,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  • Drafts & RFCs
  • Document search:
    • +
  • +
    Streams:
    + IAB + IRTF + ISE +
  • Submit a draft
    • {% if user|in_group:"WG Chair" %}
  • Approve a draft
    • diff --git a/ietf/templates/group/index.html b/ietf/templates/group/index.html new file mode 100644 index 000000000..21bfda238 --- /dev/null +++ b/ietf/templates/group/index.html @@ -0,0 +1,26 @@ +{# Copyright The IETF Trust 2009, All Rights Reserved #} + +{% extends "base.html" %} +{% load ietf_filters %} +{% block title %}Other Streams{% endblock %} + +{% block morecss %} +.ietf-wg-table { width: 100%; max-width:50em; } +.ietf-wg-table tr { vertical-align:top; } +{% endblock morecss %} + +{% block content %} +

    Other Streams

    + +
    + + {% for stream in streams %} + + + + + + {% endfor %} +
    {{ stream.acronym }}{{ stream.name }}{% with stream.get_chair as role %}{{role.person}} ({{role.name}}){% endwith %}
    +
    +{% endblock %} diff --git a/ietf/templates/group/stream_documents.html b/ietf/templates/group/stream_documents.html new file mode 100644 index 000000000..f086805fc --- /dev/null +++ b/ietf/templates/group/stream_documents.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2013, All Rights Reserved #} + +{% block title %}{{ stream }} Stream Documents{% endblock %} + +{% block content %} +

    {{ stream }} Stream Documents

    + +{% include "doc/search/search_results.html" %} +{% endblock %} + +{% block js %} + + +{% endblock %} diff --git a/ietf/urls.py b/ietf/urls.py index bba907b93..bf635ed21 100644 --- a/ietf/urls.py +++ b/ietf/urls.py @@ -66,6 +66,7 @@ urlpatterns = patterns('', (r'^submit/', include('ietf.submit.urls')), (r'^sync/', include('ietf.sync.urls')), (r'^wg/', include('ietf.wginfo.urls')), + (r'^stream/', include('ietf.group.stream_urls')), (r'^nomcom/', include('ietf.nomcom.urls')), (r'^templates/', include('ietf.dbtemplate.urls')),