Merge pull request #552 from ChicagoWorldcon/development

1.7.0-rc2

app/javascript/reports/reports_screen.vue

@@ -92,9 +92,10 @@
       <li>
         <a href="/report/people_reports/record_stream_permissions" target="_blank">Participant Recording and Streaming Permissions</a>
         <p class="ml-2">
-          <strong><em>Description</em></strong>: List of participants with their recording and streaming permissions and exclusions.<br />
-          <strong><em>Fields</em></strong>: Person published names, primary email, attendance type, participant status, permission to stream, exclusions for streaming, permission to record, exclusions to recording, and their schedule.<br />
-          <strong><em>Person data included</em></strong>: Moderators and participants on scheduled sessions.
+          <strong><em>Description</em></strong>: List of participants with their recording and streaming permissions and exclusions, one line per person<br />
+          <strong><em>Fields</em></strong>: Person name, published name, primary email, attendance type, participant status, permission to stream, exclusions for streaming, permission to record, exclusions to recording, schedule<br />
+          <strong><em>Session data included</em></strong>: all scheduled sessions<br />
+          <strong><em>Person data included</em></strong>: moderators, participants
         </p>
       </li>
     </ul>

app/javascript/schedule/schedule_settings.vue

@@ -2,7 +2,6 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-12">
-        <h5>Release schedule to participants</h5>
         <b-form-group label-cols="auto" class="align-items-center">
           <template #label>Release <strong>Draft</strong> Schedule to Participants</template>
           <b-form-checkbox switch v-model="localDraftSchedule" :disabled="localDraftSchedule" @change="openDraftConfirm" id="draft-schedule-checkbox" aria-describedby="draft-schedule-date"></b-form-checkbox>
@@ -16,10 +15,9 @@
           <b-button variant="primary" @click="reset()">Reset for Testing</b-button>
           <span>THIS DELETES THE SNAPSHOT AND YOU CAN'T EVER GET IT BACK</span>
         </div>
-        <hr />
       </div>
     </div>
-    <div class="row">
+    <!-- <div class="row">
       <div class="col-12">
         <h5>Publish schedule to public</h5>
         <b-table-simple borderless fixed small>
@@ -51,7 +49,7 @@
           </b-tbody>
         </b-table-simple>
       </div>
-    </div>
+    </div> -->
     <plano-modal id="confirm-draft-modal" @cancel="cancelDraft()" @close="cancelDraft()" no-close-on-backdrop @ok="confirmDraft()">
       <template #modal-title>Publish Draft Schedule Confirmation</template>
       {{SCHEDULE_DRAFT_CONFIRM_MESSAGE}}

app/javascript/sessions/session_sidebar.vue

@@ -76,7 +76,7 @@
                 switch
                 v-model="selected.streamed"
                 disabled
-              >Will be live-streamed</b-form-checkbox>
+              >Will be livestreamed</b-form-checkbox>
             </b-form-group>
           </div>
         </div>

app/javascript/sessions/session_summary.vue

@@ -93,7 +93,7 @@
             switch
             v-model="session.streamed"
             @change="saveSession()"
-          >Will be live-streamed</b-form-checkbox>
+          >Will be livestreamed</b-form-checkbox>
         </b-form-group>
         <b-form-group label="Status" label-cols="auto">
           <b-form-select  id="session-status" v-model="session.status" @change="saveSession()">

app/views/xml_templates/schedule.nokogiri

@@ -2,21 +2,21 @@
 # XML template for a collection of sessions
 #
 xml.schedule {
-  # We need a <day> header at the start of the document, so 
-  # before_1st_session needs to be at least 86400 seconds (the 
+  # We need a <day> header at the start of the document, so
+  # before_1st_session needs to be at least 86400 seconds (the
   # number of seconds in a day) earlier than the 1st session
   before_1st_session = @instance.first.start_time - 86401
   day = Date.parse(before_1st_session.strftime("%Y-%m-%d"))
   timeslot = Time.parse(before_1st_session.strftime("%Y-%m-%d %l:%M"))
-  @instance.each do |session|  
-    # Check if this is the 1st session of the day, in which case, 
+  @instance.each do |session|
+    # Check if this is the 1st session of the day, in which case,
     # create a <day> heading.
     this_day = Date.parse(session.start_time.strftime("%Y-%m-%d"))
     if this_day > day
       day = this_day
       xml.day(session.start_time.strftime("%A"))
     end
-    # Check if this is the 1st session at this time, in which case, 
+    # Check if this is the 1st session at this time, in which case,
     # create a <timeslot> subheading.
     if session.start_time.utc > timeslot.utc
       timeslot = session.start_time.utc
@@ -25,17 +25,18 @@ xml.schedule {
     xml.session {
       xml.id(session.pub_reference_number)
       xml.title(session.title)
-      # timeduration, roomareasformat, and participants will each be a 
-      # block-level paragraph with span-level elements. The line 
-      # breaks & spacing will be removed in publications_controller.rb. 
+      # timeduration, roomareasformat, and participants will each be a
+      # block-level paragraph with span-level elements. The line
+      # breaks & spacing will be removed in publications_controller.rb.
       # Otherwise InDesign would render the white space in print.
       xml.timeduration{
         xml.start_time(session.start_time.strftime("%-l:%M"))
         xml.duration(session.duration)
       }
       xml.roomareasformat{
         xml.room(session.room.name)
-        xml.areas(session.area_list.join(", "))
+        # Areas are for internal use only, not for the public
+        # xml.areas(session.area_list.join(", "))
         xml.format(session.format.name)
       }
       xml.description(session.description)