Merge pull request #97 from code4lib/iss89

Combine captioning data in conf.yml

Author: escowles

_data/conf.yml

@@ -162,6 +162,10 @@ slides:
   email: ''
 
 closed-captioning:
+  # display on home page and general-info/accessibility
+  show: true
+  # name of captioning company, URL is above under closed-captioning.url
+  service: Streambox
   url: https://2020archive.1capapp.com/event/code4lib/
 
 workshops:
@@ -461,12 +465,6 @@ diversity-scholarship-sponsors:
 ################
 # Other
 ################
-
-live-captioning:
-  show: true
-  # name of captioning company, URL is above under closed-captioning.url
-  service: Streambox
-
 quiet-room:
   show: true
   # Room number(s)

general-info/accessibility.html

@@ -29,17 +29,17 @@ <h1>Accessibility</h1>
 	<h2 id="contactus">Accommodation Requests or Questions</h2>
 	<p>Contact <a href="mailto:{{site.data.conf.accessibility-email}}">{{site.data.conf.accessibility-email}}</a> with any questions, concerns, or accommodation requests related to the conference.</p>
 
-	{% if site.data.conf.live-captioning.show %}
-		<h2 id="captioning">Live Captioning</h2>
-		<p>
-			During the general conference, Code4Lib {{site.data.conf.year}} will feature live captioning by {{site.data.conf.live-captioning.service}}. In order to improve the quality of this service, we ask everyone to speak slowly and clearly so the captioning service is able to accurately capture what you say. Any prerecorded sessions or talks will also be live captioned.
-			{% if site.data.conf.live-captioning.show %}
-				Attendees, both local and remote, may view the text stream at:
-				<a href="{{site.data.conf.closed-captioning.url}}">{{site.data.conf.closed-captioning.url}}</a>.
-			{% endif %}
-			These transcriptions will be applied to the captioning on the YouTube archive soon after the completion of the conference.
-		</p>
-	{% endif %}
+	<h2 id="captioning">Live Captioning</h2>
+	<p>
+		During the general conference, Code4Lib {{site.data.conf.year}} will feature live captioning{% if site.data.conf.closed-captioning.service %} by {{site.data.conf.closed-captioning.service}}{% endif %}. In order to improve the quality of this service, we ask everyone to speak slowly and clearly so the captioning service is able to accurately capture what you say. Any prerecorded sessions or talks will also be live captioned.
+		{% if site.data.conf.closed-captioning.show %}
+			Attendees, both local and remote, may view the text stream at:
+			<a href="{{site.data.conf.closed-captioning.url}}">{{site.data.conf.closed-captioning.url}}</a>
+		{% endif %}
+	</p>
+	<p>
+		These transcriptions will be applied to the captioning on the YouTube archive soon after the completion of the conference.
+	</p>
 
 	{% if site.data.conf.quiet-room.show %}
 		<h2 id="quietroom">Quiet Room</h2>