Changed default for apply_to_all for Slide uploads to False.

Added redirect for non-secretariat users from ietf.secr.proceedings.views.select to ietf.meeting.views.materials.
Added a note to the secr upload_footer pointing to where material upload is now done.
Modified the links on the group meetings page to make it less likely to miss the link to the session materials.
Used class anchor target to clean up landing on the right session of multiple sessions on a group's session details page. Modified the materials page to only add a fragment asking for that anchor for non-ag/wg/rg groups.
Only show the link to the (now) secretariat-only proceedings manipulation page if the user is the secretariat. Relabelled the link to better reflect the page's remaining purpose.
Changed the session_details "Artifacts" panel header to "Agenda, Minutes, and Bluesheets". Added a footer to the "Slides" panel calling out drag-and-drop reordering.
Commit ready for merge.
 - Legacy-Id: 12018

Author: rjsparks

ietf/meeting/views.py

@@ -1352,7 +1352,7 @@ def upload_session_agenda(request, session_id, num):
 class UploadSlidesForm(forms.Form):
     title = forms.CharField(max_length=255)
     file = forms.FileField(label='Slides file to upload.')
-    apply_to_all = forms.BooleanField(label='Apply to all group sessions at this meeting',initial=True,required=False)
+    apply_to_all = forms.BooleanField(label='Apply to all group sessions at this meeting',initial=False,required=False)
 
     def __init__(self, num_sessions, *args, **kwargs):
         super(UploadSlidesForm, self).__init__(*args, **kwargs)

ietf/secr/proceedings/views.py

@@ -391,12 +391,14 @@ def recording_edit(request, meeting_num, name):
     )
 
 # TODO - should probably rename this since it's not selecting groups anymore
-@role_required('Secretariat')
 def select(request, meeting_num):
     '''
         Provide the secretariat only functions related to meeting materials management
     '''
 
+    if not has_role(request.user,'Secretariat'):
+        return HttpResponseRedirect(reverse('ietf.meeting.views.materials', kwargs={'num':meeting_num}))
+
     meeting = get_object_or_404(Meeting, number=meeting_num)
     proceedings_url = get_proceedings_url(meeting)
 

ietf/secr/templates/includes/upload_footer.html

@@ -1,3 +1,5 @@
     <li><a href="https://www.ietf.org/instructions/meeting_materials_tool.html" target="_blank">Instructions</a>.</li>
     <li>If you require assistance in using this tool, or wish to report a bug, then please send a message to <a href="mailto:ietf-action@ietf.org">ietf-action@ietf.org</a>.</li>
     <li>To submit your materials via email, please send agendas to <a href="mailto:agenda@ietf.org">agenda@ietf.org</a> and minutes/presentation slides to <a href="mailto:proceedings@ietf.org">proceedings@ietf.org</a>.</li>
+    <li><bold>Note:</bold> Normal session materials materials management is now performed using the {% if meeting.number %}<a href="{% url 'ietf.meeting.views.materials' num=meeting.number %}">{% endif %}materials page{% if meeting.number %}</a>{% endif %}
+

ietf/templates/group/meetings-row.html

@@ -15,9 +15,7 @@
          <td>
 	   {% ifchanged s.meeting %}
 	     {% if s.meeting.type.slug == 'ietf' %}
-	       <a href="{% url 'ietf.meeting.views.agenda' num=s.meeting.number %}">
-	       IETF {{s.meeting.number}}
-	       </a>
+	       IETF {{s.meeting.number}} 
 	     {% else %}
 	       {{s.meeting.number}}
 	     {% endif %}

ietf/templates/meeting/edit_materials_button.html

@@ -1,4 +1,6 @@
 {% 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 %}#session_{{session.pk}}">Edit</a>
+{% with gt=session.group.type_id %}
+<a class="button btn-default btn-sm" href="{% url 'ietf.meeting.views.session_details' num=session.meeting.number acronym=session.group.acronym %}{% if gt == 'wg' or gt == 'rg' or gt == 'ag' %}{% else %}#session_{{session.pk}}{% endif %}">Edit</a>
+{% endwith %}
 {% endif %}

ietf/templates/meeting/materials.html

@@ -27,7 +27,9 @@ <h1>IETF {{ meeting_num }} meeting materials</h1>
       {% endif %}
 
       <p>
-        <a class="btn btn-default" href="{% url "proceedings" %}">Meeting materials manager</a>
+        {% if user|has_role:"Secretariat" %}
+          <a class="btn btn-default" href="{% url "proceedings" %}">Secretariat proceedings functions</a>
+        {% endif %}
         <a class="btn btn-default" href="/meeting/{{meeting_num}}/requests">Meeting requests/conflicts</a>
       </p>
 

ietf/templates/meeting/session_details.html

@@ -15,7 +15,7 @@
   <h1>{{ meeting }} : {{ acronym }}</h1>
 
   {% for session in sessions %}
-    <h2 id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}{{ session.time }}{% if session.name %} : {{ session.name }}{% endif %}</h2>
+    <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}{{ session.time }}{% if session.name %} : {{ session.name }}{% endif %}</h2>
     {% if session.agenda_note %}<h3>{{session.agenda_note}}</h3>{% endif %}
 
     {% if can_manage_materials %}
@@ -32,7 +32,7 @@ <h2 id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.c
     {% endif %}
 
     <div class="panel panel-default">
-      <div class="panel-heading">Artifacts</div>
+      <div class="panel-heading">Agenda, Minutes, and Bluesheets</div>
       <div class="panel-body">
         <table class="table table-condensed table-striped">
           {% for pres in session.filtered_artifacts %}
@@ -106,6 +106,9 @@ <h2 id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.c
           <a class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number %}">Upload New Slides</a>
         {% endif %}
       </div>
+      {% if can_manage_materials %}
+        <div class="panel-footer small">Drag-and-drop to reorder slides</div>
+      {% endif %}
     </div>
     <div class="panel panel-default">
       <div class="panel-heading">Drafts