SAK-42462 two accessibility fixes: a) unique id and b) frame title (s…

…akaiproject#7408)
vijaya1618 · Oct 4, 2019 · 8c5f655 · 8c5f655
1 parent f43d948
commit 8c5f655
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/help/help-tool/src/java/org/sakaiproject/jsf/help/ContextSensitiveTreeRender.java b/help/help-tool/src/java/org/sakaiproject/jsf/help/ContextSensitiveTreeRender.java
@@ -180,9 +180,9 @@ private void encodeRecursive(ResponseWriter writer, Set categories,
           {
             writer.write("<h2>");
             writer.write("<img src=\"../image/topic.gif\" alt=\"\"/>");            
-            writer.write("<a id=\"" + resource.getDocId()
+            writer.write("<a id=\"toc-" + resource.getDocId()
                 + "\" href=\"content.hlp?docId=" + resource.getDocId()
-                + "\" target = \"content\">" + resource.getName() + "</a>");            
+                + "\" target=\"content\">" + resource.getName() + "</a>");            
             writer.write("</h2></li>\n");
           }
         }

diff --git a/help/help-tool/src/java/org/sakaiproject/jsf/help/HelpFrameSetRender.java b/help/help-tool/src/java/org/sakaiproject/jsf/help/HelpFrameSetRender.java
@@ -102,8 +102,8 @@ public void encodeBegin(FacesContext context, UIComponent component)
     writer.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\" \"http://www.w3.org/TR/html4/frameset.dtd\">\n");
     writer.write("<html><head><title>" + helpWindowTitle + "</title></head>\n");
     writer.write("<FRAMESET cols=\"20%, 80%\"><FRAMESET rows=\"150, 450\">");
-    writer.write("<FRAME src=\"" + searchToolUrl + "\" name=\"search\">");
-    writer.write("<FRAME src=\"" + tocToolUrl + "\" name=\"toc\">");
+    writer.write("<FRAME src=\"" + searchToolUrl + "\" name=\"search\" title=\"Search\">");
+    writer.write("<FRAME src=\"" + tocToolUrl + "\" name=\"toc\" title=\"Table of Contents\">");
     writer.write("</FRAMESET>\n");
 
     Application app = context.getApplication();
@@ -112,14 +112,14 @@ public void encodeBegin(FacesContext context, UIComponent component)
 
     if(manager.getWelcomePage() == null) {
         if (welcomepage == DEFAULT_WELCOME_PAGE) {
-      	  writer.write("<FRAME src=\"content.hlp?docId=" + welcomepage + "\" name=\"content\">");
+      	  writer.write("<FRAME src=\"content.hlp?docId=" + welcomepage + "\" name=\"content\" title=\"Help Content\">");
         } else {
-          writer.write("<FRAME src=\"" + welcomepage + "\" name=\"content\">");
+          writer.write("<FRAME src=\"" + welcomepage + "\" name=\"content\" title=\"Help Content\">");
         }
 
     }
     else {
-      writer.write("<FRAME src=\"content.hlp?docId=" + manager.getWelcomePage() + "\" name=\"content\">");             
+      writer.write("<FRAME src=\"content.hlp?docId=" + manager.getWelcomePage() + "\" name=\"content\" title=\"Help Content\">");
     }
 
     writer.write("</FRAMESET></html>\n");