altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Resove ticket 139, move training session back to bottom of the page

Browse source 
- Legacy-Id: 560
This commit is contained in:
Michael Lee 2007-06-20 20:11:11 +00:00
parent 90947c8261
commit 56540c3d75
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/meeting/views.py
View file

@ -19,7 +19,7 @@ def show_html_materials(request, meeting_num=None):
if now > begin_date:
sub_began = 1
# List of WG sessions and Plenary sessions
queryset_list = WgMeetingSession.objects.filter(Q(meeting=meeting_num, group_acronym_id__gte = -3, status_id=4), Q(irtf__isnull=True) | Q(irtf=0))
queryset_list = WgMeetingSession.objects.filter(Q(meeting=meeting_num, group_acronym_id__gte = -2, status_id=4), Q(irtf__isnull=True) | Q(irtf=0))
queryset_irtf = WgMeetingSession.objects.filter(meeting=meeting_num, group_acronym_id__gte = -2, status_id=4, irtf__gt=0)
queryset_interim = []
queryset_training = []

24
ietf/templates/meeting/list.html
View file

@ -20,11 +20,12 @@ Updated as of {% now "F j, Y, H:i:s (T)" %}
</td>
</tr>
</table>
{% for wg in wgs.list|dictsort:"acronym" %}
{% ifequal wgs.grouper "Plenary Sessions" %}
{% for wg in wgs.list|dictsortreversed:"acronym" %}
<table cellpadding="0" cellspacing="0" border="2" width="80%">
<tr><a name="wg-{{ wg.acronym }}"></a>
<td align="center" bgcolor="#DDFFDD" width="20%"><b>{{ wg.acronym|upper }}{% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br>
{% if wg.agenda_file %}<a href="http://www3..ietf.org/proceedings/{{ wg.agenda_file }}">[Agenda]</a>{% endif %}{% if wg.minute_file %} <a href="http://www3.ietf.org/proceedings/{{ wg.minute_file }}">[Minutes]</a>{% endif %}</td>
{% if wg.agenda_file %}<a href="http://www3.ietf.org/proceedings/{{ wg.agenda_file }}">[Agenda]</a>{% endif %}{% if wg.minute_file %} <a href="http://www3.ietf.org/proceedings/{{ wg.minute_file }}">[Minutes]</a>{% endif %}</td>
<td><table border="1" width="100%">
{% include "meeting/submission_status_snippet.html" %}
{% for slide in wg.slides %}
@ -37,6 +38,25 @@ Updated as of {% now "F j, Y, H:i:s (T)" %}
</table>
{% endfor %}
{% else %}
{% for wg in wgs.list|dictsort:"acronym" %}
<table cellpadding="0" cellspacing="0" border="2" width="80%">
<tr><a name="wg-{{ wg.acronym }}"></a>
<td align="center" bgcolor="#DDFFDD" width="20%"><b>{{ wg.acronym|upper }}{% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br>
{% if wg.agenda_file %}<a href="http://www3.ietf.org/proceedings/{{ wg.agenda_file }}">[Agenda]</a>{% endif %}{% if wg.minute_file %} <a href="http://www3.ietf.org/proceedings/{{ wg.minute_file }}">[Minutes]</a>{% endif %}</td>
<td><table border="1" width="100%">
{% include "meeting/submission_status_snippet.html" %}
{% for slide in wg.slides %}
<tr><td><a href="http://www3.ietf.org/proceedings/{{ slide.file_loc }}">{{ slide.slide_name }}</a></td>
</tr>
{% endfor %}
</table>
</td>
</tr>
</table>
{% endfor %}
{% endifequal %}
{% endfor %}
<!--- Training Sessions --->
{% if training_list %}