SAK-42037 Switch standardized primary and secondary buttons (sakaipro…

…ject#7082)
susowrc · Jul 9, 2019 · b1b704d · b1b704d
1 parent 4b77ab7
commit b1b704d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/admin-tools/src/webapp/vm/archive/chef_archive-batch.vm b/admin-tools/src/webapp/vm/archive/chef_archive-batch.vm
@@ -30,7 +30,7 @@
     				#end
     			</select>
     		</p>
-    		<p class="act"><input type="submit" name="eventSubmit_doBatch_Archive_PreProcess" value="$tlang.getString("archive.vm.archive1")" class="indnt1" /></p>
+    		<p class="act"><input type="submit" name="eventSubmit_doBatch_Archive_PreProcess" value="$tlang.getString("archive.vm.archive1")" class="indnt1 active" /></p>
     		<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
 		</form>
 
@@ -55,7 +55,7 @@
 			</label>	
 			<input type="file" name="importFile"   id="importFile"  />
 		</p>	
-		<p class="act"><input type="submit" name="eventSubmit_doBatch_Import" value="$tlang.getString("archive.vm.import")" class="indnt1" /></p>
+		<p class="act"><input type="submit" name="eventSubmit_doBatch_Import" value="$tlang.getString("archive.vm.import")" class="indnt1 active" /></p>
 		<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
 	</form>
 </div>

diff --git a/admin-tools/src/webapp/vm/archive/chef_archive.vm b/admin-tools/src/webapp/vm/archive/chef_archive.vm
@@ -25,7 +25,7 @@
 		    </label>
 			<input type="checkbox" name="zip-id" value="true" id="zip-id" />
 		</p>
-		<p class="act"><input type="submit" name="eventSubmit_doArchive" value="$tlang.getString("archive.vm.archive1")" class="indnt1" /></p>		
+		<p class="act"><input type="submit" name="eventSubmit_doArchive" value="$tlang.getString("archive.vm.archive1")" class="indnt1 active" /></p>
 
 		<hr class="itemSeparator" />
 
@@ -42,7 +42,7 @@
 				</label>	
 				<input type="text" size="80" name="import-id" id="import-id" />
 			</p>
-			<p class="act"><input type="submit" name="eventSubmit_doImport" value="$tlang.getString("archive.vm.import")" class="indnt1" /></p>
+			<p class="act"><input type="submit" name="eventSubmit_doImport" value="$tlang.getString("archive.vm.import")" class="indnt1 active" /></p>
 		<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
 	</form>
 </div>

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
@@ -30,11 +30,11 @@
 			<br /><div class="messageValidation">$validator.escapeHtml($alertMessage)</div><div class="clear"></div>
 		#end
 			<div class="navPanel">
-				<div class="navIntraToolLink viewNav">
+				<div class="navIntraToolLink viewNav act">
 						<span>
 								<input id="restore-button" type="button" value="$tlang.getString("restore.restore")"
 									onclick="this.disabled = true; submitThis('restoreForm','restore')"
-									disabled="disabled" alt="$tlang.getString("restore.restore")" />
+									disabled="disabled" alt="$tlang.getString("restore.restore")" class="active"/>
 								<input id="remove-button" type="button" value="$tlang.getString("restore.remove")"
 									onclick="this.disabled = true; submitThis('restoreForm','remove')"
 									disabled="disabled" alt="$tlang.getString("restore.remove")" />

diff --git a/mailarchive/mailarchive-tool/tool/src/webapp/vm/mailarchive/chef_mailbox-List.vm b/mailarchive/mailarchive-tool/tool/src/webapp/vm/mailarchive/chef_mailbox-List.vm
@@ -40,9 +40,9 @@
 				<label for="search" class="skip">$tlang.getString('lis.search')</label>
 				<input size="15" value="$validator.escapeHtml($!search)" name="search" id="search" type="text" class="searchField"  />
 				<input type="hidden" name="eventSubmit_doSearch" id="eventSubmit_doSearch" value="Search for emails" />
-				<a href="#" title="$tlang.getString('lis.search')" onclick="location = '#toolLink("$action" "doSearch")'+buildQueryString('toolbar');document.getElementById('submitnotifwrap').style.visibility='visible';return false;" style="text-decoration:none !important"><input type="button" value="$tlang.getString('lis.search')" /></a>
+				<a href="#" title="$tlang.getString('lis.search')" onclick="location = '#toolLink("$action" "doSearch")'+buildQueryString('toolbar');document.getElementById('submitnotifwrap').style.visibility='visible';return false;" style="text-decoration:none !important" class="act"><input type="button" class="active" value="$tlang.getString('lis.search')" /></a>
 				#if (($!search) && (!$search.equals("")))
-					<a href="#" title="$tlang.getString('lis.clear')" onclick="location = '#toolLink("$action" "doSearch_clear")';return false;" style="text-decoration:none !important"><input type="button" value="$tlang.getString('lis.clear')" /></a>
+					<a href="#" title="$tlang.getString('lis.clear')" onclick="location = '#toolLink("$action" "doSearch_clear")';return false;" style="text-decoration:none !important" ><input type="button" value="$tlang.getString('lis.clear')" /></a>
 				#end
 				<div id="submitnotifwrap" style="padding:6px 0;visibility:hidden"><span id="submitnotif">$tlang.getString("lis.searchnotif")</span></div>								
 			</div>

diff --git a/roster2/tool/src/handlebars/overview.handlebars b/roster2/tool/src/handlebars/overview.handlebars
@@ -27,7 +27,7 @@
 
         <div class="sakai-table-searchFilter">
             <label for="roster-search-field">{{translate 'roster_search_text'}}</label>
-            <div class="sakai-table-searchFilterControls">
+            <div class="sakai-table-searchFilterControls act">
                 <input id="roster-search-field" type="text" value="{{#if searchQuery}}{{searchQuery}}{{/if}}" class="sakai-table-searchFilter-searchField" />
                 <input id="roster-search-button" class="active" type="button" value="{{translate 'roster_search_button'}}" />
                 <input id="roster_form_clear_button" type="button" value="{{translate 'roster_clear_button'}}" />

diff --git a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-list.vm b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-list.vm
@@ -72,9 +72,9 @@
 			</div>
 
 			#if (($!superUser || (!$!superUser && $viewSelected != $tlang.getString("java.my"))))
-				<div class="sakai-table-buttonContainer">
+				<div class="sakai-table-buttonContainer act">
 					#if ($viewSelected != $viewDeleted)
-						<input type="button" id="btnEdit1" name="btnEdit1" class="actionButton" value="$tlang.getString("java.revise")" disabled="disabled"
+						<input type="button" id="btnEdit1" name="btnEdit1" class="actionButton active" value="$tlang.getString("java.revise")" disabled="disabled"
 							onclick="SPNR.disableControlsAndSpin( this, null );document.getElementById('sakai_action').value='doGet_site';document.getElementById('sitesForm').submit();return false;" />
 						<input type="button" id="btnSoftDelete1" name="btnSoftDelete1" class="actionButton" value="$tlang.getString("java.delete")" disabled="disabled"
 							onclick="SPNR.disableControlsAndSpin( this, null );document.getElementById('sakai_action').value='doMenu_site_delete';document.getElementById('sitesForm').submit();return false;" />
@@ -305,8 +305,8 @@
 				</div>
 
 				#if ($!superUser || (!$!superUser && $viewSelected != $tlang.getString("java.my")))
-					<div class="sakai-table-buttonContainer actionButtons">
-						<input type="button" id="btnEdit2" name="btnEdit2" class="actionButton" value="$tlang.getString("java.revise")" disabled="disabled"
+					<div class="sakai-table-buttonContainer actionButtons act">
+						<input type="button" id="btnEdit2" name="btnEdit2" class="actionButton active" value="$tlang.getString("java.revise")" disabled="disabled"
 							onclick="SPNR.disableControlsAndSpin( this, null );document.getElementById('sakai_action').value='doGet_site';document.getElementById('sitesForm').submit();return false;" />
 						<input type="button" id="btnSoftDelete2" name="btnSoftDelete2" class="actionButton" value="$tlang.getString("java.delete")" disabled="disabled"
 							onclick="SPNR.disableControlsAndSpin( this, null );document.getElementById('sakai_action').value='doMenu_site_delete';document.getElementById('sitesForm').submit();return false;" />

diff --git a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-editClass.vm b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-editClass.vm
@@ -59,7 +59,7 @@
 						<tr>
 							<td headers="class">
 								<h5>
-									<label for="mcl$manualCourseListNum">
+									<label for="mcl$manualCourseListNum">`
 										$id $tlang.getString("sitedicla.requested")
 									</label>
 								</h5>
@@ -86,7 +86,7 @@
 				<p class="act">
 					<input type="hidden" name="back" value="12" />
 					<input type="hidden" name="templateIndex" value="$!templateIndex" />
-					<input type="submit" name="eventSubmit_doBack" value="$tlang.getString("sitedicla.can")" aria-label=""$tlang.getString("sitedicla.can")" onclick="SPNR.disableControlsAndSpin( this, null );" />
+					<input type="submit" name="eventSubmit_doBack" class="active" value="$tlang.getString("sitedicla.can")" aria-label=""$tlang.getString("sitedicla.can")" onclick="SPNR.disableControlsAndSpin( this, null );" />
 				</p>
 			#end
 			<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />

diff --git a/...ge/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-manageParticipants.vm b/...ge/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-manageParticipants.vm
@@ -31,7 +31,7 @@
                 #searchFilterPanel("searchFilter1", $userSearch, "doUser_search", "doUser_search_clear")
             #end
         </div>
-        <div class ="sakai-table-buttonContainer">
+        <div class ="sakai-table-buttonContainer act">
             <input type="button" accesskey="s" class="active" value="$tlang.getString("sitegen.siteinfolist.update")" onclick="updateParticipants(this);"
                 #if($participantList.isEmpty()) disabled="disabled" #end />
             <input type="button" accesskey="x" value="$tlang.getString("gen.cancel")" onclick="cancel('#toolLink("$action" "doCancel")', this);"
@@ -243,7 +243,7 @@
                 #viewFilterPanel("viewFilter2", "view", $viewSelectOptions, "do_manageParticipants_changeFilter")
                 #searchFilterPanel("searchFilter2", $userSearch, "doUser_search", "doUser_search_clear")
             </div>
-            <div class ="sakai-table-buttonContainer">
+            <div class ="sakai-table-buttonContainer act">
                 <input type="button" accesskey="s" class="active" value="$tlang.getString("sitegen.siteinfolist.update")" onclick="updateParticipants(this);" />
                 <input type="button" accesskey="x" value="$tlang.getString("gen.cancel")" onclick="cancel('#toolLink("$action" "doCancel")', this);" />
             </div>