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

Merged in [11780] from rjsparks@nostrum.com:

Browse source 
Removed bluesheet upload from the secr/ bluesheets generation page. Added navigation to session details from the meeting materials view rows.
 - Legacy-Id: 11815
Note: SVN reference [11780] has been migrated to Git commit 9b295b1b5e346afafdcaf3d00b0b120a1b826e7f
This commit is contained in:
Henrik Levkowetz 2016-08-17 22:52:11 +00:00
parent f1ad6a0e8e
commit 72d9017d63
4 changed files with 10 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/meeting/templatetags/proceedings_filters.py
View file

@ -1,5 +1,7 @@
from django import template
import debug # pyflakes:ignore
register = template.Library()
@register.filter

41
ietf/secr/templates/meetings/blue_sheet.html
View file

@ -39,48 +39,9 @@
<hr />
<p>
Use the form below to upload individual scanned blue sheet documents.
Use the session details page for a group to upload scanned bluesheets. The session details pages for a group can be reached from the meeting's <a href="{% url 'ietf.meeting.views.materials' num=meeting.number %}">materials page</a>.
</p>
<form id="rolodex-add-form" enctype="multipart/form-data" action="" method="post">{% csrf_token %}
<table class="full-width amstable">
<col width="200">
{{ form.as_table }}
</table>
<div class="button-group">
<ul>
<li><button type="submit" name="submit" value="Submit">Submit</button></li>
<li><button type="button" onclick="window.location='../'">Back</button></li>
</ul>
</div> <!-- button-group -->
</form>
</div> <!-- module -->
{% if uploaded_files %}
<br>
<div class="module interim-container">
<h2>Uploaded Files</h2>
<div class="inline-related last-related">
<table class="full-width">
<thead>
<tr>
<th>Filename</th>
</tr>
</thead>
<tbody>
{% for file in uploaded_files %}
<tr class="{% cycle 'row1' 'row2' %}">
<td>{{ file }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div> <!-- inline-related -->
</div> <!-- module -->
{% endif %}
{% endblock %}

4
ietf/templates/meeting/edit_materials_button.html Normal file
View file

@ -0,0 +1,4 @@
{% load ietf_filters session_filters %}
{% if user|has_role:"Secretariat" or session|can_manage_materials:user and not session.is_material_submission_cutoff %}
<a class="button btn-default btn-sm" href="{% url 'ietf.meeting.views.session_details' num=session.meeting.number acronym=session.group.acronym %}">Edit</a>
{% endif %}

6
ietf/templates/meeting/group_materials.html
View file

@ -1,5 +1,5 @@
{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
{% load ietf_filters %}
{% load ietf_filters proceedings_filters %}
<tr>
<td>
{% comment %}
@ -8,9 +8,9 @@
<a name="session.group-{{ session.group.acronym }}"></a>
{% endcomment %}
{% if session.name %}
<div class="anchor-target" id="{{ session.name|slugify }}">{{ session.name }}</div>
<div class="anchor-target" id="{{ session.name|slugify }}">{{ session.name }}{% include "meeting/edit_materials_button.html" %}</div>
{% else %}
<div class="anchor-target" id="{{session.group.acronym}}"><a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{session.group.acronym}}</a></div>
<div class="anchor-target" id="{{session.group.acronym}}"><a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{session.group.acronym}}</a>{% include "meeting/edit_materials_button.html" %}</div>
{% if session.group.state.slug == "bof" %}
<span class="label label-success">{{ session.group.state.slug|upper }}</span>
{% endif %}