From 2042f981bdf7f9930170e4ffe892fac453538cff Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 22 Sep 2016 20:15:57 +0000 Subject: [PATCH] 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 --- ietf/meeting/views.py | 2 +- ietf/secr/proceedings/views.py | 4 +++- ietf/secr/templates/includes/upload_footer.html | 2 ++ ietf/templates/group/meetings-row.html | 4 +--- ietf/templates/meeting/edit_materials_button.html | 4 +++- ietf/templates/meeting/materials.html | 4 +++- ietf/templates/meeting/session_details.html | 7 +++++-- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 654bf275f..204f76974 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -1352,7 +1352,7 @@ VALID_SLIDE_EXTENSIONS = ('.doc','.docx','.pdf','.ppt','.pptx','.txt') # Note th 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) diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py index 184c01846..27108661e 100644 --- a/ietf/secr/proceedings/views.py +++ b/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) diff --git a/ietf/secr/templates/includes/upload_footer.html b/ietf/secr/templates/includes/upload_footer.html index dfd49ed43..eff80b591 100755 --- a/ietf/secr/templates/includes/upload_footer.html +++ b/ietf/secr/templates/includes/upload_footer.html @@ -1,3 +1,5 @@
  • Instructions.
  • If you require assistance in using this tool, or wish to report a bug, then please send a message to ietf-action@ietf.org.
  • To submit your materials via email, please send agendas to agenda@ietf.org and minutes/presentation slides to proceedings@ietf.org.
    • +
  • Note: Normal session materials materials management is now performed using the {% if meeting.number %}{% endif %}materials page{% if meeting.number %}{% endif %} + diff --git a/ietf/templates/group/meetings-row.html b/ietf/templates/group/meetings-row.html index 042faeb43..1da9b420a 100644 --- a/ietf/templates/group/meetings-row.html +++ b/ietf/templates/group/meetings-row.html @@ -15,9 +15,7 @@ {% ifchanged s.meeting %} {% if s.meeting.type.slug == 'ietf' %} - - IETF {{s.meeting.number}} - + IETF {{s.meeting.number}} {% else %} {{s.meeting.number}} {% endif %} diff --git a/ietf/templates/meeting/edit_materials_button.html b/ietf/templates/meeting/edit_materials_button.html index 07e1c494a..f65338b7b 100644 --- a/ietf/templates/meeting/edit_materials_button.html +++ b/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 %} -Edit +{% with gt=session.group.type_id %} +Edit +{% endwith %} {% endif %} diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html index 6aee1a313..c00f6b24b 100644 --- a/ietf/templates/meeting/materials.html +++ b/ietf/templates/meeting/materials.html @@ -27,7 +27,9 @@ {% endif %}

    - Meeting materials manager + {% if user|has_role:"Secretariat" %} + Secretariat proceedings functions + {% endif %} Meeting requests/conflicts

    diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html index d332b7077..de893fa77 100644 --- a/ietf/templates/meeting/session_details.html +++ b/ietf/templates/meeting/session_details.html @@ -15,7 +15,7 @@

    {{ meeting }} : {{ acronym }}

    {% for session in sessions %} -

    {% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}{{ session.time }}{% if session.name %} : {{ session.name }}{% endif %}

    +

    {% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}{{ session.time }}{% if session.name %} : {{ session.name }}{% endif %}

    {% if session.agenda_note %}

    {{session.agenda_note}}

    {% endif %} {% if can_manage_materials %} @@ -32,7 +32,7 @@ {% endif %}
    -
    Artifacts
    +
    Agenda, Minutes, and Bluesheets
    {% for pres in session.filtered_artifacts %} @@ -106,6 +106,9 @@ Upload New Slides {% endif %} + {% if can_manage_materials %} +
    Drag-and-drop to reorder slides
    + {% endif %}
    Drafts