WCAG - Miscelanious

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java

@@ -53,7 +53,8 @@ protected ResponseValues processRequest(VitroRequest vreq) throws InstantiationE
         }*/
         body.put("dataServiceUrlVClassesForVClassGroup", UrlBuilder.getUrl("/dataservice?getVClassesForVClassGroup=1&classgroupUri="));
 	    body.put("geoFocusMapsEnabled", getGeoFocusMapsFlag(vreq));
-
+        body.put("title","Home");
+
         return new TemplateResponseValues(BODY_TEMPLATE, body);
     }
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java

@@ -267,6 +267,9 @@ private EditConfigurationVTwo setupEditConfiguration(String editConfGeneratorNam
     	String editKey = EditConfigurationUtils.getEditKey(vreq);
     	editConfig.setEditKey(editKey);
 
+        // Browser/tab title comes from EditConfigurationTemplateModel#getPageTitle:
+        // optional editConfig newResource "pageTitle" (set by a generator if needed),
+        // otherwise i18n key edit_page_title with optional subject name suffix.
 
         //put edit configuration in session so it can be accessed on form submit.
         EditConfigurationVTwo.putConfigInSession(editConfig, session);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java

@@ -135,8 +135,20 @@ private String getSelectedValue(String field) {
 	}
 
     public String getPageTitle() {
+		String title = editConfig.getNewResources().get("pageTitle");
+		if (title != null && !title.isEmpty()) {
+			return title;
+		}
+
         String pageTitle = i18n.text("edit_page_title");
-        return pageTitle != null ? pageTitle : "Edit";
+        if (StringUtils.isBlank(pageTitle)) {
+            pageTitle = "Edit";
+        }
+        Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq);
+        if (subject != null && StringUtils.isNotBlank(subject.getName())) {
+            pageTitle = pageTitle + " - " + subject.getName();
+        }
+        return pageTitle;
     }
 
 	private void setFormTitle() {

home/src/main/resources/rdf/i18n/en_US/interface-i18n/firsttime/vitro_UiLabel.ttl

@@ -3062,6 +3062,14 @@ uil-data:share_profile_uri.Vitro
         uil:hasKey      "share_profile_uri" ;
         uil:hasPackage  "Vitro-languages" .
 
+uil-data:uri_input_label.Vitro
+        rdf:type         owl:NamedIndividual ;
+        rdf:type         uil:UILabel ;
+        rdfs:label       "URI Link"@en-US ;
+        uil:hasApp      "Vitro" ;
+        uil:hasKey      "uri_input_label" ;
+        uil:hasPackage  "Vitro-languages" .
+
 uil-data:no_html_specified.Vitro
         rdf:type         owl:NamedIndividual ;
         rdf:type         uil:UILabel ;

webapp/src/main/webapp/js/individual/individualUriRdf.js

@@ -8,7 +8,7 @@ $(document).ready(function(){
         {
             querySelector: "span#iconControlsLeftSide > img#uriIcon",
             data: {
-                title: '<h5>' + i18nStringsUriRdf.shareProfileUri + '</h5> <input id="uriLink" type="text" value="' + $('#uriIcon').attr('title') + '" /><h5><a class ="rdf-url" href="' + individualRdfUrl + '">' + i18nStringsUriRdf.viewRDFProfile + '</a></h5><div class="close-footer"><a class="close" href="#">' + i18nStringsUriRdf.closeString + '</a></div>',
+                title: '<h5>' + i18nStringsUriRdf.shareProfileUri + '</h5> <input id="uriLink" title="'+ this.uriInputString +'" type="text" value="' + $('#uriIcon').attr('title') + '" /><h5><a class ="rdf-url" href="' + individualRdfUrl + '">' + i18nStringsUriRdf.viewRDFProfile + '</a></h5><div class="close-footer"><a class="close" href="#">' + i18nStringsUriRdf.closeString + '</a></div>',
                 trigger: "click",
                 customClass: "vitroTooltip",
                 placements: ['top', 'right', 'bottom', 'left'],
@@ -18,7 +18,7 @@ $(document).ready(function(){
         {
             querySelector: "span#iconControlsVitro > img#uriIcon",
             data: {
-                title: '<h5>' + i18nStringsUriRdf.shareProfileUri + '</h5> <input id="uriLink" type="text" value="' + $('#uriIcon').attr('title') + '" /><h5><a class ="rdf-url" href="' + individualRdfUrl + '">' + i18nStringsUriRdf.viewRDFProfile + '</a></h5><div class="close-footer"><a class="close" href="#">' + i18nStringsUriRdf.closeString + '</a></div>',
+                title: '<h5>' + i18nStringsUriRdf.shareProfileUri + '</h5> <input id="uriLink" title="'+ this.uriInputString +'" type="text" value="' + $('#uriIcon').attr('title') + '" /><h5><a class ="rdf-url" href="' + individualRdfUrl + '">' + i18nStringsUriRdf.viewRDFProfile + '</a></h5><div class="close-footer"><a class="close" href="#">' + i18nStringsUriRdf.closeString + '</a></div>',
                 trigger: "click",
                 customClass: "vitroTooltip",
                 placements: ['top', 'right', 'bottom', 'left'],
@@ -28,7 +28,7 @@ $(document).ready(function(){
         {
             querySelector: "span#iconControlsRightSide > img#uriIcon",
             data: {
-                title: '<h5>' + i18nStringsUriRdf.shareProfileUri + '</h5> <input id="uriLink" type="text" value="' + $('#uriIcon').attr('title') + '" /><h5><a class ="rdf-url" href="' + individualRdfUrl + '">' + i18nStringsUriRdf.viewRDFProfile + '</a></h5><div class="close-footer"><a class="close" href="#">' + i18nStringsUriRdf.closeString + '</a></div>',
+                title: '<h5>' + i18nStringsUriRdf.shareProfileUri + '</h5> <input id="uriLink" title="'+ this.uriInputString +'" type="text" value="' + $('#uriIcon').attr('title') + '" /><h5><a class ="rdf-url" href="' + individualRdfUrl + '">' + i18nStringsUriRdf.viewRDFProfile + '</a></h5><div class="close-footer"><a class="close" href="#">' + i18nStringsUriRdf.closeString + '</a></div>',
                 trigger: "click",
                 customClass: "vitroTooltip",
                 placements: ['top', 'left', 'bottom', 'right'],

webapp/src/main/webapp/js/individual/moreLessController.js

@@ -26,6 +26,7 @@ $(document).ready(function(){
                 $itemContainer.hide();
                 $(this).attr('href', '#show more content');
                 $(this).text(i18nStrings.displayMoreEllipsis);
+                $(this).focus();
                 togglePropDisplay.showMore($toggleLink, $itemContainer);
                 return false;
             });

webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl

@@ -91,7 +91,9 @@
     var i18nStringsUriRdf = {
         shareProfileUri: '${i18n().share_profile_uri?js_string}',
         viewRDFProfile: '${i18n().view_profile_in_rdf?js_string}',
-        closeString: '${i18n().close?js_string}'
+        closeString: '${i18n().close?js_string}',
+        uriInputString: '${i18n().uri_input_label?js_string}'
+
     };
 	var i18nStrings = {
 	    displayLess: '${i18n().display_less?js_string}',

webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl

@@ -20,11 +20,11 @@
     	    <#assign groupNameHtmlId = "${i18n().properties}" >
         </#if>
         <#if tabCount = 1 >
-            <li class="selectedGroupTab clickable" groupName="${groupNameHtmlId?replace("/","-")}">${groupName}</li>
+            <li class="selectedGroupTab clickable" groupName="${groupNameHtmlId?replace("/","-")}">${p.capitalizeGroupName(groupName)}</li>
             <li class="groupTabSpacer">&nbsp;</li>
             <#assign tabCount = 2>
         <#else>
-            <li class="nonSelectedGroupTab clickable" groupName="${groupNameHtmlId?replace("/","-")}">${groupName}</li>
+            <li class="nonSelectedGroupTab clickable" groupName="${groupNameHtmlId?replace("/","-")}">${p.capitalizeGroupName(groupName)}</li>
             <li class="groupTabSpacer">&nbsp;</li>
         </#if>
     </#if>
@@ -50,7 +50,7 @@
         <#if groupName?has_content>
 		    <#--the function replaces spaces in the name with underscores, also called for the property group menu-->
     	    <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
-            <h2 id="${groupNameHtmlId?replace("/","-")}" pgroup="tabs" class="hidden">${groupName}</h2>
+            <h2 id="${groupNameHtmlId?replace("/","-")}" pgroup="tabs" class="hidden">${p.capitalizeGroupName(groupName)}</h2>
         <#else>
             <h2 id="properties" pgroup="tabs" class="hidden">${i18n().properties_capitalized}</h2>
         </#if>

webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js

@@ -557,6 +557,7 @@ var customForm = {
         // boolean controls whether the acSelector value gets cleared.
 
         var clearAcSelectorVal = true;
+        let focus = null;
 
         if ( $(selectedObj).attr('id') == "typeSelector" ) {
             $acSelectionObj = customForm.acSelections[$(selectedObj).attr('acGroupName')];

webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl

@@ -348,3 +348,7 @@ name will be used as the label. -->
     <#local groupName = groupName?replace("&", "-and-")>
     <#return groupName>
 </#function>
+
+<#function capitalizeGroupName propertyGroupName>
+    <#return propertyGroupName?cap_first>
+</#function>

webapp/src/main/webapp/templates/freemarker/page/partials/title.ftl

@@ -1,3 +1,7 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<title>${(title?html)!siteName!}</title>
+<#if title?? && title?has_content>
+    <title>${title?html} | ${siteName}</title>
+<#else>
+    <title>${siteName}</title>
+</#if>