SAK-31629 use links instead of labels to ensure keyboard focus (sakai…

…project#4329)
DaweiXia · Apr 25, 2017 · 16aebcf · 16aebcf
1 parent 8ccc327
commit 16aebcf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/signup/tool/src/webapp/signup/newMeeting/assignStudents.jsp b/signup/tool/src/webapp/signup/newMeeting/assignStudents.jsp
@@ -151,10 +151,10 @@
 								</h:column>
 							</h:dataTable>
 							<h:panelGroup id="addAttendee">
-								<h:outputLabel onclick="showHideAddPanel('#{timeSlot.positionInTSlist}');" styleClass="addAttendee">
+								<h:outputLink value="javascript:showHideAddPanel('#{timeSlot.positionInTSlist}');" styleClass="addAttendee">
 						   			<h:graphicImage value="/images/add.png"  alt="add an attendee" title="#{msgs.event_tool_tips_add}" styleClass="addButton" style="border:none" />
 						   			<h:outputText value="#{msgs.event_add_attendee}" escape="false"/>
-						   		</h:outputLabel>
+						   		</h:outputLink>
 						   	</h:panelGroup>
 
 				   			<h:panelGroup id="addPanel" style="display: none;" >

diff --git a/signup/tool/src/webapp/signup/organizer/orgSignupMeeting.jsp b/signup/tool/src/webapp/signup/organizer/orgSignupMeeting.jsp
@@ -677,10 +677,10 @@
 					   					<h:panelGroup id="addAttendee" rendered="#{!OrganizerSignupMBean.meetingWrapper.meeting.meetingExpired}">
 					   						<%-- TODO add spacer only if the attendees exist in atleast one timeslot --%>
 					   						<h:graphicImage value="/images/spacer.gif" width="20" height="16" alt="spacer" style="border:none"/>
-						   					<h:outputLabel onclick="showHideAddPanel('#{timeSlotWrapper.positionInTSlist}');" styleClass="addAttendee">
+						   					<h:outputLink value="javascript:showHideAddPanel('#{timeSlotWrapper.positionInTSlist}');" styleClass="addAttendee">
 						   						<h:graphicImage value="/images/add.png"  alt="add an attendee" title="#{msgs.event_tool_tips_add}" style="border:none" styleClass="openCloseImageIcon"/>
 						   						<h:outputText value="#{msgs.event_add_attendee}" escape="false" />
-						   					</h:outputLabel>	
+						   					</h:outputLink>
 						   				</h:panelGroup>
 
 						   				<h:panelGroup id="addPanel" style="display: none;" >
@@ -779,11 +779,11 @@
 									   			</h:dataTable>
 
 									   			<h:panelGroup id="addWaiter" rendered="#{!OrganizerSignupMBean.meetingWrapper.meeting.meetingExpired}">
-									   				<h:outputLabel rendered="#{!timeSlotWrapper.timeSlot.available}" onclick="showHideAddWaiterPanel('#{timeSlotWrapper.positionInTSlist}');" styleClass="addWaiter">
+									   				<h:outputLink rendered="#{!timeSlotWrapper.timeSlot.available}" value="javascript:showHideAddWaiterPanel('#{timeSlotWrapper.positionInTSlist}');" styleClass="addWaiter">
 									   					<h:graphicImage value="/images/spacer.gif" width="4" height="16" alt="spacer" style="border:none"/>
 								   						<h:graphicImage value="/images/add.png"  alt="add an waiter"  title="#{msgs.event_tool_tips_add}" style="border:none"  styleClass="openCloseImageIcon"/>
 								   						<h:outputText value="#{msgs.event_add_attendee}" escape="false" />	
-								   					</h:outputLabel>
+								   					</h:outputLink>
 								   					<h:panelGroup rendered="#{timeSlotWrapper.timeSlot.available}" style="margin-left: 2px;">
 								   						<h:graphicImage value="/images/addDisabled.png"  alt="add an waiter" title="#{msgs.event_tool_tips_action_disabled_label}" style="border:none" />
 								   						<h:outputText value="#{msgs.event_add_attendee}" escape="false" styleClass="disabledAddAttendee"/>