Updates from develop for accessibility

themes/default/conf/app.conf

@@ -130,5 +130,41 @@ compare_images = {
 #
 
 registration_security = sum_equation
-google_recaptcha_sitekey = 
-google_recaptcha_secretkey = 
+
+
+# --------------------
+# Alt text templates for media
+# --------------------
+ca_objects_alt_text_template = "<case><ifnotdef code='ca_object_representations.preferred_labels.name'>^ca_objects.preferred_labels.name</ifnotdef><if rule='^ca_object_representations.preferred_labels.name =~ /[BLANK]/'>^ca_objects.preferred_labels.name</if><if rule='^ca_object_representations.preferred_labels.name !~ /[BLANK]/'>^ca_object_representations.preferred_labels.name</if></case>"
+ca_object_representations_alt_text_template = "<case><ifnotdef code='ca_object_representations.preferred_labels.name'>^ca_objects.preferred_labels.name</ifnotdef><if rule='^ca_object_representations.preferred_labels.name =~ /[BLANK]/'>^ca_objects.preferred_labels.name</if><if rule='^ca_object_representations.preferred_labels.name !~ /[BLANK]/'>^ca_object_representations.preferred_labels.name</if></case>"
+
+# --------------------
+# Formatting of download file name.
+# --------------------
+# Can be one of the following:
+# idno, idno_and_version, idno_and_rep_id_and_version, original_name
+#
+# You may also set this to a display template evaluated relative to representation being
+# downloaded. Ex. "DOWNLOAD_^ca_object_representations.original_filename" will name the file
+# using the originally uploaded file name prefixed with "DOWNLOAD_"; "^ca_object_representations.md5"
+# will name the downloaded file with the MD5 checksum of the originally uploaded file.
+# 
+# Your template should not include an extension as it will be added to the end of your
+# template. Values that include non-alphanumeric values such as mimetype will have those
+# characters converted to underscores. You can surround tags with curly brackets {} to 
+# ensure that your tags don't blend into the file name. An example template that 
+# includes idno and original file name:
+#
+#      download_{^ca_object_representations.idno}<ifdef code='ca_object_representations.original_filename'>_{^ca_object_representations.original_filename}</ifdef>
+#
+# For TIFF media from object 2016.2 with an originally uploaded name of test_file.jpg this
+# template will return the file name "download_2016_2_test_file.tiff"
+#
+# You can set the naming policy on a per-table basis (Eg. representations related to an object 
+# can be named following one format and representations related to an occurrence another) using
+# the <table name>_downloaded_file_naming directive (Ex. ca_objects_downloaded_file_naming = idno_and_version)
+#
+# You can set a global policy to be applied if a table-specific policy is not defined using the
+# downloaded_file_naming directive.
+# 
+downloaded_file_naming = original_name

themes/default/conf/detail.conf

@@ -38,8 +38,16 @@ detailTypes = {
 			mapAttributes = [ca_objects.georeference],
 			mapWidth = 100%,
 			mapHeight = 200,	
-			mapZoomLevel = 12,			
-			mapContentTemplate = ^ca_objects.idno,
+
+			#mapMinZoomLevel - Minimum zoom level to allow; leave null if you don't want to enforce a limit
+			#mapMaxZoomLevel - Maximum zoom level to allow; leave null if you don't want to enforce a limit
+	 		#mapZoomLevel (also supports zoom_level) - Zoom map to specified level rather than fitting all markers into view; leave undefined if you don't want to specify a zoom level. IF this option is set minZoomLevel and maxZoomLevel will be ignored.
+
+			#mapZoomLevel = 12,
+			#mapMinZoomLevel = 3,
+			#mapMaxZoomLevel = 15,
+			mapLabelTemplate = ^ca_places.preferred_labels.name%delimiter=;_,
+			mapContentTemplate = ,
 
 			# Customize export download file names; can be set to a display template or static text
 			pdfExportTitle = ^ca_objects.preferred_labels.name,
@@ -124,4 +132,4 @@ detailTypes = {
 			enableShare = 0,
 		}
 	}
-}
+}

themes/default/conf/icons.conf

@@ -1,19 +1,19 @@
 # --- PLACEHOLDER ICONS
 # --- from detail.conf
-placeholder_large_media_icon = <i class='fa fa-picture-o fa-5x'></i>
+placeholder_large_media_icon = <i class='fa fa-picture-o fa-5x' aria-label='media placeholder'></i>
 
 # --- browse and sets
-placeholder_media_icon = <i class='fa fa-picture-o fa-2x'></i>
+placeholder_media_icon = <i class='fa fa-picture-o fa-2x' aria-label='media placeholder'></i>
 
 # --- placeholder media icons can be configured to be object type specific
 # --- if one is not defined for the type, the default variables placeholder_large_media_icon, and placeholder_media_icon will be used
 #placeholders = {
 #	documents = {
-#		placeholder_media_icon = <i class='fa fa-file-text-o fa-2x'></i>,
-#		placeholder_large_media_icon = <i class='fa fa-file-text-o fa-5x'></i>
+#		placeholder_media_icon = <i class='fa fa-file-text-o fa-2x' aria-label='media placeholder'></i>,
+#		placeholder_large_media_icon = <i class='fa fa-file-text-o fa-5x' aria-label='media placeholder'></i>
 #	},
 #	book = {
-#		placeholder_media_icon = <i class='fa fa-book fa-2x'></i>,
-#		placeholder_large_media_icon = <i class='fa fa-book fa-5x'></i>
+#		placeholder_media_icon = <i class='fa fa-book fa-2x' aria-label='media placeholder'></i>,
+#		placeholder_large_media_icon = <i class='fa fa-book fa-5x' aria-label='media placeholder'></i>
 #	}
-#}
+#}

themes/default/conf/lightbox.conf

@@ -87,7 +87,7 @@ secondarySortDirection = {
 sortControlType = dropdown
 
 # Icon to use for "add to lightbox" button
-addToLightboxIcon = <i class='fa fa-folder'></i>
+addToLightboxIcon = <i class='fa fa-folder' aria-label='Add'></i>
 
 # Template to use when captioning lightbox items
 # (if caption_template is not defined, preferred label will be used)
@@ -108,7 +108,7 @@ availableFacets = []
 # default number of results per page/ajax load
 defaultHitsPerBlock = 36
 
-backLink = <i class='fa fa-angle-double-left'></i><div class='small'>Back</div>
+backLink = <i class='fa fa-angle-double-left' aria-label='Back'></i><div class='small'>Back</div>
 
 # Display name for lightbox section                                        
 lightboxDisplayName = lightbox
@@ -119,4 +119,4 @@ lightboxSectionHeading = Lightbox
 lightbox_set_description_element_code = description
 
 # Customize export download file names; can be set to a display template or static text
-#pdfExportTitle = ^ca_sets.preferred_labels.name,
+#pdfExportTitle = ^ca_sets.preferred_labels.name,

themes/default/conf/media_display.conf

@@ -34,6 +34,7 @@ detail = {
 		display_version = h264_hi,
 		viewer_width = 100%, viewer_height = 96%,
 		poster_frame_version = mediumlarge,
+		viewer_poster_version = mediumlarge,
 		alt_display_version = large,
 		download_version = original,
 		no_overlay = 1,
@@ -45,6 +46,7 @@ detail = {
 		display_version = original,
 		viewer_width = 100%, viewer_height = 96%,
 		poster_frame_version = mediumlarge,
+		viewer_poster_version = mediumlarge,
 		alt_display_version = large,
 		download_version = original,
 		no_overlay = 1,
@@ -67,6 +69,7 @@ detail = {
 		alt_display_version = large,
 		viewer_width = 360, viewer_height = 235,
 		poster_frame_version = mediumlarge,
+		viewer_poster_version = mediumlarge,
 		download_version = original,
 		no_overlay = 1,
 
@@ -80,7 +83,7 @@ detail = {
 		download_version = original,
 		no_overlay = 0,
 
-		viewer = UniversalViewer
+		viewer = TileViewer
 	},
 	documents = {
 		mimetypes = {application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, application/vnd.ms-excel, 
@@ -167,6 +170,7 @@ media_overlay = {
 		display_version = h264_hi,
 		viewer_width = 100%, viewer_height = 100%,
 		poster_frame_version = mediumlarge,
+		viewer_poster_version = mediumlarge,
 		alt_display_version = large,
 		download_version = original,
 
@@ -177,6 +181,7 @@ media_overlay = {
 		display_version = original,
 		viewer_width = 100%, viewer_height = 100%,
 		poster_frame_version = mediumlarge,
+		viewer_poster_version = mediumlarge,
 		alt_display_version = large,
 		download_version = original,
 
@@ -337,4 +342,4 @@ download = {
 	}
 }
 
-# --------------------------------------------------------------------------------
+# --------------------------------------------------------------------------------

themes/default/templates/about.tmpl

@@ -1,8 +1,8 @@
-<h1>{{{title}}}</h1>
-<h3>{{{subtitle}}}</h3>
-
-<div class="bodytext">
-	{{{bodytext}}}
+<div class="row">
+	<div class="col-sm-12">
+		<H1>{{{title}}}</H1>
+		<h2>{{{subtitle}}}</h2>
+		{{{bodytext}}}
+		<div><em>Viewed {{{page_view_count}}} times </em></div>
+	</div>
 </div>
-
-<div><em>Viewed {{{page_view_count}}} times </em></div>

themes/default/templates/staffpage.tmpl

@@ -1,6 +1,6 @@
 <h1>{{{headline}}}</h1>
-<h3>{{{subhead}}}</h3>
+<h2>{{{subhead}}}</h2>
 
 <div class="bodytext">
 	{{{moretext}}}
-</div>
+</div>

themes/default/views/About/Index.php

@@ -9,12 +9,12 @@
 	</div>
 	<div class="row">
 		<div class="col-sm-8">
-			<h3>Contact The Archives</h3>
+			<h2>Contact The Archives</h2>
 			<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras nec ligula erat. Pellentesque nibh leo, pharetra et posuere vel, accumsan vitae sapien. Phasellus a tortor id felis scelerisque blandit. Curabitur a tristique tortor. Morbi non tortor eget dui blandit laoreet. Quisque lacus quam, auctor sit amet volutpat dictum, scelerisque sit amet neque. Vivamus non massa finibus, ultrices nunc vel, scelerisque dui. Aliquam commodo, quam eget fringilla finibus, enim diam sodales ligula, sollicitudin faucibus ligula lorem vitae arcu. Sed efficitur nisi sit amet lobortis malesuada. Ut quis imperdiet elit. Mauris blandit suscipit leo, non tristique est ultrices eu.</p>
 		</div>
 		<div class="col-sm-3 col-sm-offset-1">
-			<h6>&nbsp;</h6><address>Archives<br>			100 Second Avenue, 2nd floor<br>			New York, NY 10010</address>
+			<address>Archives<br>			100 Second Avenue, 2nd floor<br>			New York, NY 10010</address>
 
 			<address>Jennifer Smith, Archivist<br>			<span class="info">Phone</span> — 212 222.2222<br>			<span class="info">Fax</span> — 212 222.2223<br>			<span class="info">Email</span> — <a href="#">[email protected]</a></address>
 		</div>
-	</div>
+	</div>

themes/default/views/Browse/browse_refine_subview_html.php

@@ -41,11 +41,11 @@
 		print "<div id='bMorePanel'><!-- long lists of facets are loaded here --></div>";
 		print "<div id='bRefine'>";
 		print "<a href='#' class='pull-right' id='bRefineClose' onclick='jQuery(\"#bRefine\").toggle(); return false;'><span class='glyphicon glyphicon-remove-circle'></span></a>";
-		print "<H3>"._t("Filter by")."</H3>";
+		print "<H2>"._t("Filter by")."</H2>";
 		foreach($va_facets as $vs_facet_name => $va_facet_info) {
 
 			if ((caGetOption('deferred_load', $va_facet_info, false) || ($va_facet_info["group_mode"] == 'hierarchical')) && ($o_browse->getFacet($vs_facet_name))) {
-				print "<H5>".$va_facet_info['label_singular']."</H5>";
+				print "<H3>".$va_facet_info['label_singular']."</H3>";
 				print "<p>".$va_facet_info['description']."</p>";
 ?>
 					<script type="text/javascript">
@@ -57,7 +57,7 @@
 <?php
 			} else {				
 				if (!is_array($va_facet_info['content']) || !sizeof($va_facet_info['content'])) { continue; }
-				print "<H5>".$va_facet_info['label_singular']."</H5>"; 
+				print "<h3>".$va_facet_info['label_singular']."</h3>"; 
 				switch($va_facet_info["group_mode"]){
 					case "alphabetical":
 					case "list":
@@ -113,4 +113,4 @@
 	</script>
 <?php	
 	}
-?>
+?>