Skip to content

Commit

Permalink
SAK-41985 accesskey c is reserved for the portal 'jump to content' so…
Browse files Browse the repository at this point in the history
… any tool needs to use a different accesskey (sakaiproject#7038)
  • Loading branch information
ottenhoff authored and adrianfish committed Jun 24, 2019
1 parent ebd064d commit 0476e85
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ $(function () {
value="#{msgs.cdfm_button_bar_delete_topic}" rendered="#{ForumTool.selectedTopic.markForDeletion}" styleClass="blockMeOnClick">
<f:param value="#{ForumTool.selectedTopic.topic.id}" name="topicId" />
</h:commandButton>
<h:commandButton immediate="true" action="#{ForumTool.processActionHome}" value="#{msgs.cdfm_button_bar_cancel}" accesskey="c" />
<h:commandButton immediate="true" action="#{ForumTool.processActionHome}" value="#{msgs.cdfm_button_bar_cancel}" accesskey="x" />
<h:outputText styleClass="messageProgress" style="display:none" value="#{msgs.cdfm_processing_submit_message}" />
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<sakai:button_bar>
<h:commandButton action="#{ForumTool.processAddGroupsUsersSubmit}" accesskey="s" value="Submit" />
<h:commandButton action="#{ForumTool.processAddGroupsUsersCancel}" accesskey="c" value="Cancel" />
<h:commandButton action="#{ForumTool.processAddGroupsUsersCancel}" accesskey="x" value="Cancel" />
</sakai:button_bar>
</h:form>
</sakai:view>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
<h:panelGroup styleClass="itemNav" rendered="#{mfStatisticsBean.selectedAssign != 'Default_0'}">
<h:commandButton action="#{mfStatisticsBean.proccessActionSubmitGrades}" value="#{msgs.stat_forum_submit_grades}" accesskey="s"
onclick="warn = false;SPNR.disableControlsAndSpin( this, null );" />
<h:commandButton value="#{msgs.stat_forum_submit_grades_cancel}" accesskey="c"
<h:commandButton value="#{msgs.stat_forum_submit_grades_cancel}" accesskey="x"
onclick="warn = false;SPNR.disableControlsAndSpin( this, null );" />
</h:panelGroup>
</h:panelGrid>
Expand Down
2 changes: 1 addition & 1 deletion podcasts/podcasts-app/src/webapp/podcasts/podAdd.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<sakai:button_bar_item action="#{podHomeBean.processAdd}" value="#{msgs.add}"
accesskey="a" title="Add a Podcast" styleClass="active" />
<sakai:button_bar_item action="#{podHomeBean.processCancelAdd}" value="#{msgs.cancel}"
accesskey="c" title="Cancel a Podcast" />
accesskey="x" title="Cancel a Podcast" />
</sakai:button_bar>
</h:form>
</sakai:view>
Expand Down
4 changes: 2 additions & 2 deletions podcasts/podcasts-app/src/webapp/podcasts/podDelete.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<sakai:button_bar_item action="#{podHomeBean.processDeletePodcast}" value="#{msgs.delete}"
accesskey="s" title="Delete the Podcast" styleClass="active" />
<sakai:button_bar_item action="#{podHomeBean.processCancelDelete}" value="#{msgs.cancel}"
accesskey="c" title="Cancel Changes" />
accesskey="x" title="Cancel Changes" />
</sakai:button_bar>
</h:form>

</sakai:view>
</f:view>
</f:view>
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<sakai:button_bar_item action="#{podfeedBean.processRevisePodcast}" value="#{msgs.change_submit}"
accesskey="s" title="#{msgs.change_submit}" styleClass="active" />
<sakai:button_bar_item action="#{podfeedBean.processCancelPodfeedRevise}" value="#{msgs.cancel}"
accesskey="c" title="#{msgs.cancel}" />
accesskey="x" title="#{msgs.cancel}" />
</sakai:button_bar>

</h:form>
Expand Down
2 changes: 1 addition & 1 deletion podcasts/podcasts-app/src/webapp/podcasts/podOptions.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<sakai:button_bar_item action="#{podOptions.processOptionChange}" value="#{msgs.change_submit}"
accesskey="s" title="Save Podcast Display Options" styleClass="active"/>
<sakai:button_bar_item action="#{podOptions.processOptionCancel}" value="#{msgs.cancel}"
accesskey="c" title="Cancel Podcast Display Options" />
accesskey="x" title="Cancel Podcast Display Options" />
</sakai:button_bar>
</h:form>

Expand Down
2 changes: 1 addition & 1 deletion podcasts/podcasts-app/src/webapp/podcasts/podRevise.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<sakai:button_bar_item action="#{podHomeBean.processRevisePodcast}" value="#{msgs.change_submit}"
accesskey="s" title="#{msgs.change_submit}" styleClass="active" />
<sakai:button_bar_item action="#{podHomeBean.processCancelRevise}" value="#{msgs.cancel}"
accesskey="c" title="#{msgs.cancel}" />
accesskey="x" title="#{msgs.cancel}" />
</sakai:button_bar>
</h:form>
</sakai:view>
Expand Down
2 changes: 1 addition & 1 deletion syllabus/syllabus-app/src/webapp/syllabus/main_edit.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
title="#{msgs.cancel}"
rendered="#{SyllabusTool.addOrEdit == 'true'}"
onclick="assignWarningClick(this);"
accesskey="c" />
accesskey="x" />
<f:verbatim></p></f:verbatim>
</syllabus:syllabus_if>

Expand Down

0 comments on commit 0476e85

Please sign in to comment.