Merge branch 'unraid:master' into master

emhttp/plugins/dynamix/include/DefaultPageLayout/BodyInlineJS.php

@@ -208,10 +208,6 @@ $(window).scroll(function() {
   } else {
     $('.back_to_top').fadeOut(scrollDuration);
   }
-<?if ($themeHelper->isTopNavTheme()):?>
-  // banner
-  $('div.upgrade_notice').css($(this).scrollTop() > 24 ? {position:'fixed',top:'0'} : {position:'absolute',top:'24px'});
-<?endif;?>
 });
 
 $('.move_to_end').click(function(event) {

emhttp/plugins/dynamix/include/DefaultPageLayout/HeadInlineJS.php

@@ -268,7 +268,7 @@ function openVMAction(cmd,title,plg,func,start=0,button=0) {
       $(".upgrade_notice").addClass('alert');
       return;
     }
-    swal({title:title,text:"<pre id='swaltext'></pre><hr>",html:true,animation:'none',showConfirmButton:button!=0,confirmButtonText:"<?=_('Close')?>"},function(close){
+    swal({title:title + ' - <span id="pluginProgressTitle"><?=_('In Progress');?> <i class="fa fa-refresh fa-spin"></i></span>',text:"<pre id='swaltext'></pre><hr>",html:true,animation:'none',showConfirmButton:button!=0,confirmButtonText:"<?=_('Close')?>"},function(close){
       nchan_vmaction.stop();
       $('div.spinner.fixed').hide();
       $('.sweet-alert').hide('fast').removeClass('nchan');
@@ -331,6 +331,7 @@ function openDone(data) {
         ca_done_override = false;
       }
     }
+    $('#pluginProgressTitle').text("<?=_('Finished');?>");
     return true;
   }
   return false;
@@ -340,6 +341,7 @@ function openError(data) {
   if (data == '_ERROR_') {
     $('div.spinner.fixed').hide();
     $('button.confirm').text("<?=_('Error')?>").prop('disabled',false).show();
+    $('#pluginProgressTitle').text("<?=_('Error');?>");
     return true;
   }
   return false;

emhttp/plugins/dynamix/styles/default-base.css

@@ -1677,20 +1677,25 @@ a.bannerInfo {
     display: none;
 }
 .upgrade_notice {
-    position: fixed;
-    top: 24px;
-    left: 50%;
-    margin-left: -480px;
-    width: 900px;
-    height: 38px;
-    line-height: 38px;
-    color: var(--orange-300);
+    color: var(--black);
     background-color: var(--yellow-200);
     border: 1px solid var(--orange-300);
-    border-radius: 38px;
+    position: fixed;
+    top: 1rem;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 95%;
+    max-width: 100ch;
+    padding: 1rem;
+    border-radius: 1rem;
     text-align: center;
     font-size: 1.4rem;
     z-index: 999;
+    box-sizing: border-box;
+}
+/* Add padding to the right so the icon can sit absolutely positioned in the padding */
+.upgrade_notice:has(i) {
+    padding-right: 3.5rem;
 }
 .upgrade_notice.done {
     color: var(--green-800);
@@ -1703,7 +1708,10 @@ a.bannerInfo {
     border-color: var(--red-600);
 }
 .upgrade_notice i {
-    float: right;
+    position: absolute;
+    top: 50%;
+    right: 1rem;
+    transform: translateY(-50%);
     cursor: pointer;
 }
 .back_to_top,