SAK-49135 Drop Box: Pink error banner displays when selecting Upload …

…files to multiple Drop Box folders tab (sakaiproject#11837)
botimer · Sep 4, 2023 · 84058dc · 84058dc
1 parent 842589e
commit 84058dc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/content/content-tool/tool/src/webapp/vm/content/sakai_resources_properties.vm b/content/content-tool/tool/src/webapp/vm/content/sakai_resources_properties.vm
@@ -9,7 +9,7 @@
 	#if ($alertMessage)
 		<div id="resourceAlert" class="sak-banner-error">$tlang.getString("label.alert") $formattedText.escapeHtml($alertMessage)</div>
 	#else
-		<div id="resourceAlert" class="sak-banner-error hide"></div>
+		<div id="resourceAlert" class="sak-banner-error d-none"></div>
 	#end
 
 	<p class="instruction">

diff --git a/content/content-tool/tool/src/webapp/vm/resources/sakai_create_uploads.vm b/content/content-tool/tool/src/webapp/vm/resources/sakai_create_uploads.vm
@@ -50,7 +50,7 @@
                     (<a href="#" onclick="openMoreInfoCopyrightWindow('copyright');" title="[$tlang.getString('cright.newwin')]"><span class="skip"> [$tlang.getString('cright.newwin')]</span>$tlang.getString('cright.fairuse')</a>)
                 </small>
             </div>
-            <div id="copyright_status"#if($model.copyrightStatus == $USE_THIS_COPYRIGHT) class="show"#else class="hide"#end>
+            <div id="copyright_status"#if($model.copyrightStatus == $USE_THIS_COPYRIGHT) class="d-block"#else class="d-none"#end>
                 <h4>$tlang.getString("cright.info")</h4>
                 <div class="form-group">
                     <textarea name="newcopyright" id="newcopyright" rows="2" cols="40" wrap="virtual">

diff --git a/content/content-tool/tool/src/webapp/vm/resources/sakai_create_urls.vm b/content/content-tool/tool/src/webapp/vm/resources/sakai_create_urls.vm
@@ -20,7 +20,7 @@
 	#if ($itemAlertMessage)
 		<div id="resourceAlert" class="sak-banner-success">$itemAlertMessage</div>
 	#else
-		<div id="resourceAlert" class="sak-banner-error hide"></div>
+		<div id="resourceAlert" class="sak-banner-error d-none"></div>
 	#end
 
 	<p class="instruction">
@@ -136,7 +136,7 @@
 		var alertDiv = document.getElementById("resourceAlert");
 		if (alertDiv)
 		{
-			alertDiv.classList.add("hide");
+			alertDiv.classList.add("d-none");
 			alertDiv.innerHTML = "";
 		}
 

diff --git a/content/content-tool/tool/src/webapp/vm/resources/sakai_dropbox_multiple_folders_upload.vm b/content/content-tool/tool/src/webapp/vm/resources/sakai_dropbox_multiple_folders_upload.vm
@@ -47,7 +47,7 @@
 			<small>
 				(<a href="#" onclick="openMoreInfoCopyrightWindow('copyright');" title="[$tlang.getString('cright.newwin')]"><span class="skip"> [$tlang.getString('cright.newwin')]</span>$tlang.getString('cright.fairuse')</a>)
 			</small>
-			<div id="copyright_status" #if (!$!copyrightStatus_selection || $!copyrightStatus_selection != ${USE_THIS_COPYRIGHT}) class="hide" #end>
+			<div id="copyright_status" #if (!$!copyrightStatus_selection || $!copyrightStatus_selection != ${USE_THIS_COPYRIGHT}) class="d-none" #end>
 				<label for="newcopyright">$tlang.getString("cright.info")</label>
 				#if ($!copyrightInfo_selection)
 					#set ($newCopyright = $!copyrightInfo_selection)
@@ -217,12 +217,12 @@
 		if (fileField.files[0].size > maxFileSize)
 		{
 			resourceAlert.innerText = "$tlang.getFormattedMessage('size.exceeded', $!uploadMaxSize)";
-			resourceAlert.classList.remove('hide');
+			resourceAlert.classList.remove('d-none');
 			submitButton.disabled = true;
 		}
 		else
 		{
-			resourceAlert.classList.add('hide');
+			resourceAlert.classList.add('d-none');
 			resourceAlert.innerText = '';
 			submitButton.disabled = false;
 		}

diff --git a/content/content-tool/tool/src/webapp/vm/resources/sakai_properties.vm b/content/content-tool/tool/src/webapp/vm/resources/sakai_properties.vm
@@ -274,7 +274,7 @@ button.btn.btn-default.multiselect-clear-filter{
 				(<a href="#" onclick="openMoreInfoCopyrightWindow('copyright');" title="[$tlang.getString('cright.newwin')]"><span class="skip"> [$tlang.getString('cright.newwin')]</span>$tlang.getString('cright.fairuse')</a>)
 			</small>
 		</p>
-		<div id="copyright_status"#if($model.copyrightStatus == $USE_THIS_COPYRIGHT) class="form-group show"#else class="hide"#end>
+		<div id="copyright_status"#if($model.copyrightStatus == $USE_THIS_COPYRIGHT) class="form-group show"#else class="d-none"#end>
 			<p class="shorttext">
 				<span class="reqStar">*</span>
 				<label for="newcopyright">

diff --git a/content/content-tool/tool/src/webapp/vm/resources/sakai_properties_scripts.vm b/content/content-tool/tool/src/webapp/vm/resources/sakai_properties_scripts.vm
@@ -1136,12 +1136,12 @@
 			{
 				if(selectionValue == "${USE_THIS_COPYRIGHT}")
 				{
-					copyrightDiv.className = "show";
+					copyrightDiv.className = "d-block";
 					resizeFrame('grow');
 				}
 				else
 				{
-					copyrightDiv.className = "hide";
+					copyrightDiv.className = "d-none";
 				}
 			}
 		}
@@ -1155,7 +1155,7 @@
 		if (requireChoice && copyrightSelect !== null && copyrightSelect.selectedIndex < 1)
 		{
 			$('#resourceAlert').html('$tlang.getString("label.alert") $copyrightError');
-			$('#resourceAlert').removeClass('hide');
+			$('#resourceAlert').removeClass('d-none');
 			window.scrollTo(0, 0);
 			copyrightSelect.focus();
 
@@ -1270,7 +1270,7 @@
 		// If errors were detected, display error messages
 		if (!noErrors)
 		{
-			$('#resourceAlert').removeClass('hide');
+			$('#resourceAlert').removeClass('d-none');
 			$('#resourceAlert').show();
 			window.scrollTo(0, 0);
 		}