Fixes worker dialog issues

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 693a7d927948e53a509ec3dc1178ed5af36f6219..e4522d6f67c909b09f15ae78dc7fffe30bdadb97 100644 (file)
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -1692,6 +1692,10 @@ WCF.ACP.Worker = Class.extend({
                        });
                }
                
+               if (data.template) {
+                       this._dialog.html(data.template);
+               }
+               
                // update progress
                this._dialog.find('progress').attr('value', data.progress).text(data.progress + '%').next('span').text(data.progress + '%');
                
@@ -1708,7 +1712,7 @@ WCF.ACP.Worker = Class.extend({
                else {
                        // display continue button
                        var $formSubmit = $('<div class="formSubmit" />').appendTo(this._dialog);
-                       $('<button>' + WCF.Language.get('wcf.global.button.next') + '</button>').appendTo($formSubmit).click(function() { window.location = data.proceedURL; });
+                       $('<button class="buttonPrimary">' + WCF.Language.get('wcf.global.button.next') + '</button>').appendTo($formSubmit).click(function() { window.location = data.proceedURL; });
                        
                        this._dialog.wcfDialog('render');
                }

diff --git a/wcfsetup/install/files/acp/templates/worker.tpl b/wcfsetup/install/files/acp/templates/worker.tpl
index 9d9eb801b26bc8771d7ce9eb43a82f63e8acc668..4055b281471dfbcf566903e14445259ea7f3f754 100644 (file)
--- a/wcfsetup/install/files/acp/templates/worker.tpl
+++ b/wcfsetup/install/files/acp/templates/worker.tpl
@@ -2,7 +2,9 @@
        <header class="box48 boxHeadline">
                <span class="icon icon48 icon-spinner"></span>
                
-               <h1>{lang}wcf.global.worker.executing{/lang}</h1>
-               <small><progress value="0" max="100">0%</progress> <span>0%</span></small>
+               <div>
+                       <h1>{lang}wcf.global.worker.executing{/lang}</h1>
+                       <small><progress value="0" max="100">0%</progress> <span>0%</span></small>
+               </div>
        </header>
 </div>

diff --git a/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php b/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
index d928958c3be26cd6767a64bd88c0a2f37c057c18..cd43203ed9773051c7085f03fcd5348a2bbd2d6e 100644 (file)
--- a/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
@@ -87,7 +87,6 @@ class WorkerProxyAction extends AJAXInvokeAction {
                
                // send current state
                $this->sendResponse($progress, $this->worker->getParameters(), $this->worker->getProceedURL());
-               
        }
        
        /**