Skip to content

Commit a16af08

Browse files
committed
/wg/acronym/: show concluded WGs differently
- Legacy-Id: 2053
1 parent bc0d157 commit a16af08

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

ietf/templates/wginfo/wg_base.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@
4747

4848
.ietf-wg-details { background:#edf5ff; border:1px solid #cccccc; float:right; padding: 4px;margin-top:16px; margin-left: 16px; }
4949
.ietf-wg-details tr { vertical-align: top; }
50+
.ietf-concluded-wg {background-color: #F8F8D0; }
5051
{% endblock morecss %}
5152

5253
{% block content %}
53-
<h1>{{wg.group_acronym.name}} ({{wg.group_acronym.acronym}})</h1>
54+
<div {% if concluded %}class="ietf-concluded-wg"{% endif %}>
55+
<h1>{{wg.group_acronym.name}} ({{wg.group_acronym.acronym}}){% if concluded %}<br/>(concluded WG){% endif %}</h1>
5456

5557
<div class="ietf-navset">
5658
{% ifequal selected "documents" %}<span class="selected">Documents</span>{% else %}<a href="/wg/{{wg}}/">Documents</a>{% endifequal %} |
@@ -62,4 +64,5 @@ <h1>{{wg.group_acronym.name}} ({{wg.group_acronym.acronym}})</h1>
6264
{% block wg_content %}
6365
{% endblock wg_content %}
6466

67+
</div>
6568
{% endblock content %}

ietf/wginfo/views.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,16 @@ def wg_charters_by_acronym(request):
7676
from ietf.idrfc.views_search import SearchForm, search_query
7777

7878
def wg_documents(request, acronym):
79-
wg = get_object_or_404(IETFWG, group_acronym__acronym=acronym)
79+
wg = get_object_or_404(IETFWG, group_acronym__acronym=acronym, group_type=1)
80+
concluded = (wg.status != 1)
8081
form = SearchForm({'by':'group', 'group':str(wg.group_acronym.acronym),
8182
'rfcs':'on', 'activeDrafts':'on'})
8283
if not form.is_valid():
8384
raise ValueError("form did not validate")
8485
(docs,meta) = search_query(form.cleaned_data)
85-
return render_to_response('wginfo/wg_documents.html', {'wg': wg, 'selected':'documents', 'docs':docs, 'meta':meta}, RequestContext(request))
86+
return render_to_response('wginfo/wg_documents.html', {'wg': wg, 'concluded':concluded, 'selected':'documents', 'docs':docs, 'meta':meta}, RequestContext(request))
8687

8788
def wg_charter2(request, acronym):
88-
wg = get_object_or_404(IETFWG, group_acronym__acronym=acronym)
89-
return render_to_response('wginfo/wg_charter.html', {'wg': wg, 'selected':'charter'}, RequestContext(request))
89+
wg = get_object_or_404(IETFWG, group_acronym__acronym=acronym, group_type=1)
90+
concluded = (wg.status != 1)
91+
return render_to_response('wginfo/wg_charter.html', {'wg': wg, 'concluded':concluded, 'selected':'charter'}, RequestContext(request))

0 commit comments

Comments
 (0)