Skip to content

Commit

Permalink
SAK-32491 Library: Redesigned and standardized the design and states …
Browse files Browse the repository at this point in the history
…of Sakai buttons; introduced primary and secondary action buttons (sakaiproject#6057)
  • Loading branch information
fostersdesign authored and Miguel Pellicer committed Oct 2, 2018
1 parent a705af7 commit 5cd629a
Show file tree
Hide file tree
Showing 86 changed files with 320 additions and 325 deletions.
2 changes: 1 addition & 1 deletion admin-tools/src/webapp/vm/authz-helper/chef_permissions.vm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</div>
#end
## end if there are any groups at all
<div class="actionItem itemAction" style="float:left;padding-top:.5em">
<div class="actionItem" style="float:left;padding-top:.5em">
<input type="button" value="$thelp.getString("per.lis.restoredef")" onclick="SPNR.disableControlsAndSpin( this, null );window.location.reload();" />
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ function resizeFrame(){
</table>
</div>
#end
<p class="act act-outer">
<p class="act">
<input type="button" class="active" name="post" accesskey="s" id="saveChanges" value=
#if ( $newAnn =="true")
"$tlang.getString("revise.add")"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -865,8 +865,7 @@
</div> <!-- End of the allowResubmitContainer -->
#end
<div class="navPanel">
<div class="viewNav highlight" style="width:70%;line-height:1.4em;padding-top:.75em;">
<span class="act">
<div class="act">
<input type="button" accesskey="d" class="active" name="save" value="$tlang.getString('gen.savdragra')"
onclick="SPNR.disableControlsAndSpin( this, null ); ASN.submitForm( 'gradeForm', 'savegrade', '$validator.escapeUrl( $submissionReference )', null ); return false;"
title="$tlang.getString("gen.savdratit")"/>
Expand Down Expand Up @@ -902,7 +901,6 @@
#if( $!prevUngradedWithSubmissionID )
<input type="hidden" name="prevUngradedWithSubmissionID" id="prevUngradedWithSubmissionID" value="$!prevUngradedWithSubmissionID"/>
#end
</span>
</div>
<div class="navigator">
<fieldset class="roundedBorder">
Expand Down
4 changes: 2 additions & 2 deletions basiclti/basiclti-portlet/src/webapp/edit.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ if ( document.getElementById("UISwitcher") ) switchui();

</p>
<% } %>
<p>
<input type="submit" value="<%=rb.getString("update.options")%>">
<p class="act">
<input type="submit" value="<%=rb.getString("update.options")%>" class="active">
<input type="submit" value="<%=rb.getString("edit.exit")%>"
onclick="window.location='<%=viewURL.toString()%>'; return false;"/>
</p>
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-tool/src/webapp/vm/lti_content.vm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<form action="#toolForm("")" method="post" name="customizeForm" >
<p class="act">
<input type="submit" accesskey ="i" value="$tlang.getString('content.add')"
onclick="location = '$sakai_ActionURL.setPanel("ContentPut")';return false;">
onclick="location = '$sakai_ActionURL.setPanel("ContentPut")';return false;" class="active">
<input type="submit" accesskey ="x" value="$tlang.getString('content.tools')"
onclick="location = '$sakai_ActionURL.setPanel("Main")';return false;">
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<p class="act">
<input type="submit" accesskey ="x" id="activate_button" style="display: none"
name="$tlang.getString('gen.activate')" value="$tlang.getString('gen.activate')"
onclick="location = '$sakai_ActionURL.setPanel("Activate")&id=$id';return false;">
onclick="location = '$sakai_ActionURL.setPanel("Activate")&id=$id';return false;" class="active">
<input type="submit" accesskey ="x" name="$tlang.getString('gen.cancel')" value="$tlang.getString('gen.cancel')"
onclick="location = '$sakai_ActionURL.setPanel("DeploySystem")';return false;">
</p>
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-tool/src/webapp/vm/lti_deploy_view.vm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
<p class="act">
<input type="submit" accesskey ="x" name="doDone" value="$tlang.getString('gen.done')"
onclick="location = '$sakai_ActionURL.setPanel("DeploySystem")';return false;">
onclick="location = '$sakai_ActionURL.setPanel("DeploySystem")';return false;" class="active">
#if ($reg_state == "0")
<input type="submit" accesskey ="r" name="doRegister" value="$tlang.getString('gen.register')"
onclick="location = '$sakai_ActionURL.setPanel("DeployRegister")&id=$id'; return false;"/>
Expand Down
2 changes: 1 addition & 1 deletion basiclti/basiclti-tool/src/webapp/vm/lti_tool_view.vm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
<p class="act">
<input type="submit" accesskey ="x" name="doDone" value="$tlang.getString('gen.done')"
onclick="location = '$sakai_ActionURL.setPanel("ToolSystem")';return false;">
onclick="location = '$sakai_ActionURL.setPanel("ToolSystem")';return false;" class="active">
<input type="submit" accesskey ="v" name="doShow" value="$tlang.getString('gen.toggle.priv')"
onclick="$('#lti13_tool_private').toggle();return false;">
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@
<script type="text/javascript">javascript:prepForms();</script>
</f:verbatim>

<%/* BUTTONS */%><p>
<h:panelGrid styleClass="act" columns="2">
<%/* BUTTONS */%>
<p class="act">
<h:commandButton
action="#{PrefsBean.update}"
value="#{msgs.update}"
Expand All @@ -147,7 +147,7 @@
<h:commandButton
action="#{PrefsBean.cancel}"
value="#{msgs.cancel}"/>
</h:panelGrid>
</p>
</h:form>
</sakai:view>
</f:view>
3 changes: 2 additions & 1 deletion chat/chat-tool/tool/src/webapp/jsp/deleteRoomConfirm.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
<sakai:button_bar>
<h:commandButton id="delete"
action="#{ChatTool.processActionDeleteRoom}"
value="#{msgs['gen.delete']}" />
value="#{msgs['gen.delete']}"
styleClass="active" />
<h:commandButton id="cancel"
action="#{ChatTool.processActionDeleteRoomCancel}"
value="#{msgs['gen.cancel']}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
<sakai:button_bar>
<h:commandButton id="delete"
action="#{ChatTool.processActionDeleteRoomMessages}"
value="#{msgs['gen.delete']}" />
value="#{msgs['gen.delete']}"
styleClass="active" />
<h:commandButton id="cancel"
action="#{ChatTool.processActionDeleteRoomMessagesCancel}"
value="#{msgs['gen.cancel']}" />
Expand Down
3 changes: 2 additions & 1 deletion chat/chat-tool/tool/src/webapp/jsp/editRoom.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@
<sakai:button_bar>
<h:commandButton id="submit"
action="#{ChatTool.processActionEditRoomSave}"
value="#{msgs['gen.save']}" />
value="#{msgs['gen.save']}"
styleClass="active" />
<h:commandButton id="cancel" immediate="true"
action="#{ChatTool.processActionEditRoomCancel}"
value="#{msgs['gen.cancel']}" />
Expand Down
3 changes: 2 additions & 1 deletion chat/chat-tool/tool/src/webapp/jsp/synopticOptions.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<sakai:button_bar>
<h:commandButton id="submit"
action="#{ChatTool.processActionSynopticOptionsSave}"
value="#{msgs.update_text}" />
value="#{msgs.update_text}"
styleClass="active" />
<h:commandButton id="reset"
action="#{ChatTool.processActionSynopticOptionsCancel}"
value="#{msgs['gen.cancel']}" />
Expand Down
6 changes: 4 additions & 2 deletions commons/tool/src/webapp/WEB-INF/templates/permissions.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,7 @@
{{/each}}
</tbody>
</table>
<input id="commons_permissions_save_button" type="button" value="{{tr 'commons' 'save'}}" aria-label="Save"/>
<input type="button" value="{{tr 'commons' 'cancel'}}" aria-label="Cancel" onclick="return commons.switchState('posts');"/>
<div class="act">
<input id="commons_permissions_save_button" class="active" type="button" value="{{tr 'commons' 'save'}}" aria-label="Save"/>
<input type="button" value="{{tr 'commons' 'cancel'}}" aria-label="Cancel" onclick="return commons.switchState('posts');"/>
</div>
4 changes: 2 additions & 2 deletions commons/tool/src/webapp/WEB-INF/templates/posts.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<div class="commons-editor-text"><div id="commons-post-creator-editor" contenteditable="true">{{tr 'commons' 'post_editor_initial_text'}}</div></div>
</div>
</div>
<div id="commons-editor-toolbar">
<button id="commons-editor-post-button" disabled="true">{{tr 'commons' 'post'}}</button>
<div id="commons-editor-toolbar" class="act">
<button id="commons-editor-post-button" class="active" disabled="true">{{tr 'commons' 'post'}}</button>
<button id="commons-editor-cancel-button" disabled="true">{{tr 'commons' 'cancel'}}</button>
<button id="commons-editor-link-button" class="commons-editor-special-button" title="{{tr 'commons' 'link_button_tooltip'}}"><span class="fa fa-link"></span></button>
<button id="commons-editor-image-button" class="commons-editor-special-button" title="{{tr 'commons' 'image_button_tooltip'}}"><span class="fa fa-picture-o"></span></button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
<p class="act">
<input type="submit" class="active" name="savechanges" id="saveChanges" onclick="showNotif('submitnotif','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesAction" "doMakeSitePage")';submitform('addContentForm');" value="$tlang.getString("button.addpage")" accesskey="s" />
<input type="button" name="cancel" onclick="document.getElementById('addContentForm').action='#toolLink("ResourcesAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
<span id="submitnotif" style="visibility:hidden">$tlang.getString("label.proces")</span>

</p>
<p id="submitnotif" style="visibility:hidden">$tlang.getString("label.proces")</p>

</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
<label for="dropboxHighlight">
<small>$clang.getString("dropbox_highlight")</small>
</label>
<select class="form-control " name="dropboxHighlight" id="dropboxHighlight" onchange="document.getElementById('sakai_action').value='doSetHotDropbox';document.getElementById('showForm').submit();">
<select name="dropboxHighlight" id="dropboxHighlight" onchange="document.getElementById('sakai_action').value='doSetHotDropbox';document.getElementById('showForm').submit();">
<option value="1"#if("$!dropboxHighlight" == "1") selected="selected"#end>$clang.getString("sh.1day")</option>
<option value="2"#if("$!dropboxHighlight" == "2") selected="selected"#end>$clang.getString("sh.2day")</option>
<option value="3"#if("$!dropboxHighlight" == "3") selected="selected"#end>$clang.getString("sh.3day")</option>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
<p class="act">
<input type="button" class="active" name="savechanges" id="saveChanges" onclick="showNotif('submitnotif03','saveChanges','addFolderForm');document.getElementById('addFolderForm').action='#toolLink("ResourcesHelperAction" "doCreateFolders")&flow=save';submitform('addFolderForm');" value="$tlang.getString("label.finfldr")" accesskey="s" />
<input type="button" name="cancel" onclick="document.getElementById('addFolderForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addFolderForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
<span class="messageProgress" id="submitnotif03" style="visibility:hidden">$tlang.getString("processmessage.folders")</span>
</p>
<p class="messageProgress" id="submitnotif03" style="visibility:hidden">$tlang.getString("processmessage.folders")</p>
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<p class="act">
<input type="button" class="active" name="savechanges" id="saveChanges" onclick="showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doContinue")';submitform('addContentForm');" value="$tlang.getString("label.continue")" accesskey="s" />
<input type="button" name="cancel" onclick="document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.html")</span>
</p>
<p id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.html")</p>
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<p class="act">
<input type="button" class="active" name="savechanges" id="saveChanges" onclick="showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doContinue")';submitform('addContentForm');" value="$tlang.getString("label.continue")" accesskey="s" />
<input type="button" name="cancel" onclick="document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.text")</span>
</p>
<p id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.text")</p>
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<p class="act">
<input type="button" class="active" name="savechanges" id="saveChanges" onclick="showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doUpload")';submitform('addContentForm');" value="$tlang.getString("label.continue")" accesskey="s" />
<input type="button" name="cancel" onclick="document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.file")</span>
</p>
<p id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.file")</p>
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
#end
#end
<p class="act">
<input type="button" name="finish" id="finish" disabled=true
<input type="button" class="active" name="finish" id="finish" disabled=true
onclick="document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doFinishUpload")';"
value="$tlang.getString("label.continue")" accesskey="x" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<p class="act">
<input type="button" class="active" name="savechanges" id="saveChanges" onclick="showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doContinue")';submitform('addContentForm');" value="$tlang.getString("label.continue")" accesskey="s" />
<input type="button" name="cancel" onclick="document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.url")</span>
</p>
<p id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.url")</p>
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
<p class="act">
<input type="button" class="active" name="savechanges" id="saveChanges" onclick="showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doAddUrls")&flow=save';submitform('addContentForm');" value="$tlang.getString("label.urlnow")" accesskey="s" />
<input type="button" name="cancel" onclick="document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.url")</span>
</p>
<p id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.url")</p>
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
<p class="act">
<input type="button" class="active" name="savechanges" id="saveChanges" onclick="showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLinkParam("ResourcesAction" "doMultipleFoldersUpload" "sakai_csrf_token=$validator.escapeUrl($sakai_csrf_token)")';submitform('addContentForm');" value="$tlang.getString("label.continue")" accesskey="s" />
<input type="button" name="cancel" onclick="document.getElementById('addContentForm').action='#toolLink("ResourcesAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.file")</span>
</p>
<p id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.file")</p>
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />

</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
<p class="act">
<input type="button" class="active" name="savechanges" id="saveChanges" onclick="showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLinkParam("ResourcesHelperAction" "doReplace" "sakai_csrf_token=$validator.escapeUrl($sakai_csrf_token)")';submitform('addContentForm');" value="$tlang.getString("label.upl")" accesskey="s" />
<input type="button" name="cancel" onclick="document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.save.file")</span>
</p>
<p id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.save.file")</p>

<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
<p class="act">
<input type="button" class="active" name="savechanges" id="saveChanges" onclick="showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doContinue")';submitform('addContentForm');" value="$tlang.getString("label.continue")" accesskey="s" />
<input type="button" name="cancel" onclick="document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.save.html")</span>
</p>
<p id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.save.html")</p>
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
<p class="act">
<input type="button" class="active" name="savechanges" id="saveChanges" onclick="showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doContinue")';submitform('addContentForm');" value="$tlang.getString("label.continue")" accesskey="s" />
<input type="button" name="cancel" onclick="document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.save.text")</span>
</p>
<p id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.save.text")</p>
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
</form>
</div>
Expand Down
Loading

0 comments on commit 5cd629a

Please sign in to comment.