SAK-42050 Resources, Gradebook, Tests and Quizzes, Rubrics standardiz…

…ing primary action buttons (sakaiproject#7098)
chundcm · Jul 9, 2019 · 4a69366 · 4a69366
1 parent 3ac47cd
commit 4a69366
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 32 deletions.
diff --git a/citations/citations-tool/tool/src/webapp/vm/citation/_listNestedCitations.vm b/citations/citations-tool/tool/src/webapp/vm/citation/_listNestedCitations.vm
@@ -31,7 +31,7 @@
 		$introduction
 	</div>
     <div id="buttonsDescription" class="buttonsDescription">
-        <input type="button" id="toggleDescription" class="active" value='$tlang.getString("nested.start.editing.button")'/>
+        <input type="button" id="toggleDescription" class="btn btn-default" value='$tlang.getString("nested.start.editing.button")' aria-label="Edit"/>
     </div>
 #end
 

diff --git a/citations/citations-tool/tool/src/webapp/vm/citation/import_citations.vm b/citations/citations-tool/tool/src/webapp/vm/citation/import_citations.vm
@@ -33,7 +33,7 @@ doubleDeep = true;
 </script>
 
 <!-- template: sakai_citation-import_citations.vm -->
-<div class="portletBody">
+<div class="portletBody act">
         #set ($fromListPage = $state.getAttribute("fromListPage"))
 
   <div class="indnt1">
@@ -47,7 +47,7 @@ doubleDeep = true;
 	  <input type="hidden" name="requestStateId" id="requestStateId" value="$!{requestStateId}" />
       <input name="searchType" id="searchType" value="$basicSearchType" type="hidden" />
 
-	  <input type="button" value='$tlang.getString("label.import")' id="import1"
+	  <input type="button" value='$tlang.getString("label.import")' class="active" id="import1"
 	         onclick="importCitations('$FORM_NAME', '$tlang.getString("import.alert")');"/>
 
 	  #if($fromListPage)
@@ -78,7 +78,7 @@ doubleDeep = true;
 	    <textarea cols="80" rows="4" name="ristext" id="ristext"></textarea>
 	  </span>
       <p />
-	  <input type="button" value='$tlang.getString("label.import")' id="import2"
+	  <input type="button" value='$tlang.getString("label.import")' class="active" id="import2"
 	         onclick="importCitations('$FORM_NAME', '$tlang.getString("import.alert")');"/>
 
 	  #if($fromListPage)

diff --git a/content/content-tool/tool/src/webapp/vm/content/sakai_filepicker_select.vm b/content/content-tool/tool/src/webapp/vm/content/sakai_filepicker_select.vm
@@ -583,7 +583,7 @@ $(document).ready(function() {
 			</table>
 
 			<p class="act">
-				<input type="button" name="attachButton2" id="attachButton2"  accesskey="s"
+				<input type="button" name="attachButton2" class="active" id="attachButton2"  accesskey="s"
 					onclick="SPNR.disableControlsAndSpin( this, null ); document.getElementById('attachForm').action='#toolLink("FilePickerAction" "doAddattachments")'; submitform('attachForm');" 
 					value="$tlang.getString("att.finish")" #if($list_has_changed) class="active" #else disabled="disabled" #end />
 				<input type="button" name="cancelButton" id="cancelButton"  accesskey="x" class="cancelButton"

diff --git a/content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm b/content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm
@@ -202,7 +202,7 @@
     <div class="container-fluid">
       <div class="row">
             #if($listActions || $showHotDropboxWidget)
-                    <div class="col-lg-6 col-md-8 col-sm-8 col-xs-12 btn-group btn-group-sm" role="group" style="padding-left:0;">
+                    <div class="col-lg-6 col-md-8 col-sm-8 col-xs-12 btn-group btn-group-sm act" role="group" style="padding-left:0;">
                         #if($listActions)
                                 #set ($itemsOnLine = 0)
                                 #foreach($key in $listActions.keySet())
@@ -270,7 +270,7 @@
                   <li class="dropdown-header"><span id="creatorTog"><input type="checkbox" id="creatorCol" checked="checked" /><label for ="creatorCol">&nbsp;&nbsp;$clang.getString("gen.created")</label></span></li>
                   <li class="dropdown-header"><span id="modifiedTog"><input type="checkbox" id="modifiedCol" checked="checked"/><label for="modifiedCol">&nbsp;&nbsp;$clang.getString("gen.last1")</label></span></li>
                   <li class="dropdown-header"><span id="sizeTog"><input type="checkbox" id="sizeCol" checked="checked"/><label for="sizeCol">&nbsp;&nbsp;$clang.getString("gen.size")</label></span></li>
-                  <li class="dropdown-header"><button class="btn btn-primary  btn-sm btn-block" id="saveCols">$clang.getString("gen.save")</button></li>
+                  <li class="dropdown-header act"><button class="active" id="saveCols">$clang.getString("gen.save")</button></li>
                 </ul>
               </span>
             #end
@@ -601,8 +601,8 @@
 						<tr class="exclude">
 							<td colspan="9" class="container-fluid">
                 <div class="row">
-							    <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-                    <button class="btn btn-default btn-sm" id="copy-button-other" type="button"
+							    <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3 act">
+                    <button class="btn btn-default" id="copy-button-other" type="button"
                         onclick="document.getElementById('sakai_action').value='doMultiItemDispatch';document.getElementById('rt_action').value='copy-other';document.getElementById('showForm').submit();"
                         disabled="disabled">$tlang.getString('action.copy')
                     </button>

diff --git a/content/content-tool/tool/src/webapp/vm/content/sakai_resources_restore.vm b/content/content-tool/tool/src/webapp/vm/content/sakai_resources_restore.vm
@@ -32,7 +32,7 @@
 			<div class="navPanel">
 				<div class="navIntraToolLink viewNav act">
 						<span>
-								<input id="restore-button" type="button" value="$tlang.getString("restore.restore")"
+								<input id="restore-button" type="button" class="active" value="$tlang.getString("restore.restore")"
 									onclick="this.disabled = true; submitThis('restoreForm','restore')"
 									disabled="disabled" alt="$tlang.getString("restore.restore")" class="active"/>
 								<input id="remove-button" type="button" value="$tlang.getString("restore.remove")"

diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SortGradeItemsPanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SortGradeItemsPanel.html
@@ -8,8 +8,8 @@
 			<form class="form-vertical gb-sorter-form" wicket:id="form">
 				<div wicket:id="tabs"></div>
 
-				<div class="gb-sorter-actions">
-					<button wicket:id="submit" class="button_color">
+				<div class="gb-sorter-actions act">
+					<button wicket:id="submit" class="active">
 						<wicket:container wicket:id="label"/>
 					</button>
 					<button class="button_color">

diff --git a/rubrics/tool/src/main/frontend/webcomponents/sakai-item-delete.js b/rubrics/tool/src/main/frontend/webcomponents/sakai-item-delete.js
@@ -57,8 +57,8 @@ export class SakaiItemDelete extends SakaiElement {
         <div class="arrow"></div>
         <div class="popover-title" tabindex="0">${tr("confirm_remove")} ${this.item.title}</div>
         <div class="popover-content">
-          <div class="buttons text-right">
-            <button title="${tr("confirm_remove")}" class="btn-primary save" @click="${this.saveDelete}">
+          <div class="buttons text-right act">
+            <button title="${tr("confirm_remove")}" class="active save" @click="${this.saveDelete}">
               <sr-lang key="remove_label" />
             </button>
             <button class="cancel" @click="${this.cancelDelete}">

diff --git a/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-criterion-edit.js b/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-criterion-edit.js
@@ -43,8 +43,8 @@ export class SakaiRubricCriterionEdit extends SakaiElement {
       <div id="edit_criterion_${this.criterion.id}" class="popover criterion-edit-popover bottom">
         <div class="arrow"></div>
         <div class="popover-title">
-          <div class="buttons">
-            <button class="btn btn-primary btn-xs save" @click="${this.saveEdit}">
+          <div class="buttons act">
+            <button class="active save" @click="${this.saveEdit}">
               <sr-lang key="save">Save</sr-lang>
             </button>
             <button class="btn btn-link btn-xs cancel" @click="${this.cancelEdit}">

diff --git a/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-criterion-rating-edit.js b/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-criterion-rating-edit.js
@@ -34,8 +34,8 @@ export class SakaiRubricCriterionRatingEdit extends SakaiElement {
       <div id="edit_criterion_rating_${this.rating.id}" class="popover rating-edit-popover bottom">
         <div class="arrow"></div>
         <div class="popover-title">
-          <div class="buttons">
-            <button class="btn btn-primary btn-xs save" title="${tr("save")} ${this.rating.title}" @click="${this.saveEdit}">
+          <div class="buttons act">
+            <button class="active btn-xs save" title="${tr("save")} ${this.rating.title}" @click="${this.saveEdit}">
               <sr-lang key="save">Save</sr-lang>
             </button>
             <button class="delete" title="${tr("remove_label")} ${this.rating.title}" @click="${this.deleteRating}"><sr-lang key="remove_label" /></button>

diff --git a/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-edit.js b/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-edit.js
@@ -40,8 +40,8 @@ export class SakaiRubricEdit extends SakaiElement {
       <div id="edit_rubric_${this.rubric.id}" @click="${this.eatEvent}" class="popover rubric-edit-popover bottom">
         <div class="arrow"></div>
         <div class="popover-title">
-          <div class="buttons">
-            <button class="btn btn-primary btn-xs save" @click="${this.saveEdit}">
+          <div class="buttons act">
+            <button class="active save" @click="${this.saveEdit}">
               <sr-lang key="save">Save</sr-lang>
             </button>
             <button class="btn btn-link btn-xs cancel" @click="${this.cancelEdit}">

diff --git a/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-grading-comment.js b/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-grading-comment.js
@@ -45,8 +45,8 @@ export class SakaiRubricGradingComment extends SakaiElement {
               <sr-lang key="comment_for_criterion" values="${JSON.stringify([this.criterion.title])}" />
             </label>
           </div>
-          <div class="buttons" style="flex: 0">
-            <button class="btn btn-primary btn-xs done" @click="${this.hideTooltip}"><sr-lang key="done" /></button>
+          <div class="buttons act" style="flex: 0">
+            <button class="active btn-xs done" @click="${this.hideTooltip}"><sr-lang key="done" /></button>
           </div>
         </div>
         <div class="popover-content form">

diff --git a/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-student-comment.js b/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric-student-comment.js
@@ -40,8 +40,8 @@ export class SakaiRubricStudentComment extends SakaiElement {
               <sr-lang key="comment_for_criterion" values="${JSON.stringify([this.criterion.title])}" />
             </label>
           </div>
-          <div class="buttons" style="flex: 0;">
-            <button class="btn btn-primary btn-xs done" @click="${this.toggleComment}"><sr-lang key="done" /></button>
+          <div class="buttons act" style="flex: 0;">
+            <button class="active btn-xs done" @click="${this.toggleComment}"><sr-lang key="done" /></button>
           </div>
         </div>
         <div class="popover-content">

diff --git a/rubrics/tool/src/main/frontend/webcomponents/sakai-rubrics-list.js b/rubrics/tool/src/main/frontend/webcomponents/sakai-rubrics-list.js
@@ -41,10 +41,12 @@ export class SakaiRubricsList extends SakaiElement {
         </div>
       </div>
       <br>
-      <button class="btn-primary add-rubric" @click="${this.createNewRubric}">
-        <span class="add fa fa-plus"></span>
-        <sr-lang key="add_rubric">add_rubric</sr-lang>
-      </button>
+      <div class="act">
+        <button class="active add-rubric" @click="${this.createNewRubric}">
+            <span class="add fa fa-plus"></span>
+            <sr-lang key="add_rubric">add_rubric</sr-lang>
+        </button>
+      </div>
     `;
   }
 

diff --git a/samigo/samigo-app/src/webapp/jsf/author/createAssessment_title.jsp b/samigo/samigo-app/src/webapp/jsf/author/createAssessment_title.jsp
@@ -82,8 +82,8 @@
                     </h:selectOneMenu>
                 </div>
 
-                <div class="form-group">
-                    <h:commandButton id="createnew" type="submit" value="#{authorFrontDoorMessages.button_create}" action="#{author.getOutcome}">
+                <div class="form-group act">
+                    <h:commandButton id="createnew" styleClass="active" type="submit" value="#{authorFrontDoorMessages.button_create}" action="#{author.getOutcome}">
                         <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.author.AuthorAssessmentListener" />
                     </h:commandButton>
                 </div>
@@ -94,7 +94,7 @@
             </div>
 
             <div id="samigo-create-import-box" class="col-md-5">
-                <div>
+                <div class="">
                     <h4>
                         <h:outputText value="#{authorFrontDoorMessages.assessment_import}" rendered="#{authorization.createAssessment}"/>
                     </h4>

diff --git a/samigo/samigo-app/src/webapp/jsf/evaluation/downloadFileSubmissions.jsp b/samigo/samigo-app/src/webapp/jsf/evaluation/downloadFileSubmissions.jsp
@@ -208,7 +208,7 @@
 <p class="act">
 
    <%-- <h:commandButton value="#{evaluationMessages.save_exit}" action="author"/> --%> 
-   <h:commandButton	value="#{evaluationMessages.download}" actionListener="#{downloadFileSubmissions.downloadFiles}" style="active" />
+   <h:commandButton	value="#{evaluationMessages.download}" actionListener="#{downloadFileSubmissions.downloadFiles}" styleClass="active" />
 
 </p>
 <f:verbatim></div></f:verbatim>