From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 21 Feb 2012 18:16:46 +0000 (+0100)
Subject: Fixed missing spinner icon
X-Git-Tag: 2.0.0_Beta_1~1321^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6954885273c09b8e2b2fab1e7ce5cc13e4635412;p=GitHub%2FWoltLab%2FWCF.git

Fixed missing spinner icon
---

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index 6886b393c0..a28b83adfe 100644
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -48,6 +48,7 @@
 	$(function() {
 		WCF.Language.addObject({
 			'wcf.global.button.next': '{lang}wcf.global.button.next{/lang}',
+			'wcf.global.button.edit': '{lang}wcf.global.button.edit{/lang}',
 			'wcf.global.error.title': '{lang}wcf.global.error.title{/lang}',
 			'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
 			'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
@@ -69,7 +70,7 @@
 		});
 		
 		WCF.Icon.addObject({
-			'wcf.icon.loading': '{icon size='S'}spinner{/icon}',
+			'wcf.icon.loading': '{icon size='S'}spinner1{/icon}',
 			'wcf.icon.opened': '{icon size='S'}opened2{/icon}',
 			'wcf.icon.closed': '{icon size='S'}closed2{/icon}',
 			'wcf.icon.previous': '{icon size='S'}previous1{/icon}',
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index c4341fa910..76701f428e 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -71,6 +71,9 @@
 				'wcf.global.confirmation.confirm': '{lang}wcf.global.confirmation.confirm{/lang}',
 				'wcf.global.confirmation.title': '{lang}wcf.global.confirmation.title{/lang}'
 			});
+			WCF.Icon.addObject({
+				'wcf.icon.loading': '{icon size='S'}spinner1{/icon}'
+			});
 			new WCF.Date.Time();
 			new WCF.Effect.SmoothScroll();
 			new WCF.Effect.BalloonTooltip();
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index e317eafe7e..2535c4e192 100644
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -1056,7 +1056,7 @@ WCF.Action.Proxy.prototype = {
 	_showLoadingOverlay: function() {
 		// create loading overlay on first run
 		if (this._loadingOverlay === null) {
-			this._loadingOverlay = $('<div id="actionProxyLoading" class="actionProxyLoading"><img src="' + WCF.Icon.get('wcf.global.loading') + '" alt="" />' + WCF.Language.get('wcf.global.loading') + '</div>').hide().appendTo($('body'));
+			this._loadingOverlay = $('<div id="actionProxyLoading" class="actionProxyLoading"><img src="' + WCF.Icon.get('wcf.icon.loading') + '" alt="" />' + WCF.Language.get('wcf.global.loading') + '</div>').hide().appendTo($('body'));
 		}
 
 		// fade in overlay