From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 7 May 2013 08:32:34 +0000 (+0200)
Subject: Fixes worker dialog issues
X-Git-Tag: 2.0.0_Beta_1~238
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=196e0bd2efee3619980e92694626633823b87607;p=GitHub%2FWoltLab%2FWCF.git

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 693a7d9279..e4522d6f67 100644
--- 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 9d9eb801b2..4055b28147 100644
--- 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 d928958c3b..cd43203ed9 100644
--- 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());
-		
 	}
 	
 	/**