From: Alexander Ebert Date: Sat, 24 Oct 2015 12:09:45 +0000 (+0200) Subject: Fixed WCFSetup X-Git-Tag: 3.0.0_Beta_1~2030^2~273 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=962f116453cf388ed88f1f126ff2d1c48dc80dde;p=GitHub%2FWoltLab%2FWCF.git Fixed WCFSetup It still looks a bit broken here and then though --- diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js index 353f8e8da7..c59cc36285 100644 --- a/wcfsetup/install/files/acp/js/WCF.ACP.js +++ b/wcfsetup/install/files/acp/js/WCF.ACP.js @@ -71,7 +71,7 @@ WCF.ACP.Application.SetAsPrimary = Class.extend({ // insert icon $headline = $('.boxHeadline > h1'); $headline.html($headline.html() + ' '); - $('').appendTo($headline); + $('').appendTo($headline); WCF.DOMNodeInsertedHandler.execute(); }, this) @@ -437,7 +437,7 @@ WCF.ACP.Package.Installation = Class.extend({ _failure: function() { if (this._dialog !== null) { $('#packageInstallationProgress').removeAttr('value'); - this._setIcon('remove'); + this._setIcon('times'); } if (!this._allowRollback) { @@ -549,7 +549,7 @@ WCF.ACP.Package.Installation = Class.extend({ // handle success if (data.step === 'success') { - this._setIcon('ok'); + this._setIcon('check'); this._purgeTemplateContent($.proxy(function() { var $form = $('
').appendTo($('#packageInstallationInnerContent')); @@ -705,7 +705,7 @@ WCF.ACP.Package.Installation = Class.extend({ * @param string iconName */ _setIcon: function(iconName) { - this._dialog.find('.jsPackageInstallationStatus').removeClass('icon-ok icon-question icon-remove icon-spinner').addClass('icon-' + iconName); + this._dialog.find('.jsPackageInstallationStatus').removeClass('fa-check fa-question fa-times fa-spinner').addClass('icon-' + iconName); } }); @@ -2161,10 +2161,10 @@ WCF.ACP.User.BanHandler = { var $button = $(button); if (WCF.inArray($button.data('objectID'), data.objectIDs)) { if (data.actionName == 'unban') { - $button.data('banned', false).data('tooltip', $button.data('banMessage')).removeClass('icon-lock').addClass('icon-unlock'); + $button.data('banned', false).data('tooltip', $button.data('banMessage')).removeClass('fa-lock').addClass('fa-unlock'); } else { - $button.data('banned', true).data('tooltip', $button.data('unbanMessage')).removeClass('icon-unlock').addClass('icon-lock'); + $button.data('banned', true).data('tooltip', $button.data('unbanMessage')).removeClass('fa-unlock').addClass('fa-lock'); } } }); @@ -2331,10 +2331,10 @@ WCF.ACP.User.EnableHandler = { var $button = $(button); if (WCF.inArray($button.data('objectID'), data.objectIDs)) { if (data.actionName == 'disable') { - $button.data('enabled', false).data('tooltip', $button.data('enableMessage')).removeClass('icon-check').addClass('icon-check-empty'); + $button.data('enabled', false).data('tooltip', $button.data('enableMessage')).removeClass('fa-check-square-o').addClass('fa-square-o'); } else { - $button.data('enabled', true).data('tooltip', $button.data('disableMessage')).removeClass('icon-check-empty').addClass('icon-check'); + $button.data('enabled', true).data('tooltip', $button.data('disableMessage')).removeClass('fa-square-o').addClass('fa-check-square-o'); } } }); @@ -2467,7 +2467,7 @@ WCF.ACP.Import.Manager = Class.extend({ _invoke: function() { this._index++; if (this._index >= this._objectTypes.length) { - this._dialog.find('.icon-spinner').removeClass('icon-spinner').addClass('icon-ok'); + this._dialog.find('.fa-spinner').removeClass('fa-spinner').addClass('fa-check'); this._dialog.find('h1').text(WCF.Language.get('wcf.acp.dataImport.completed')); var $form = $('
').appendTo(this._dialog.find('#workerContainer')); diff --git a/wcfsetup/install/files/acp/templates/footer.tpl b/wcfsetup/install/files/acp/templates/footer.tpl index 0e28d03bfc..3e023b4674 100644 --- a/wcfsetup/install/files/acp/templates/footer.tpl +++ b/wcfsetup/install/files/acp/templates/footer.tpl @@ -1,28 +1,29 @@ -
- + - @@ -31,5 +32,5 @@ - + diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl index f60bbe28f5..92e002f2ee 100644 --- a/wcfsetup/install/files/acp/templates/index.tpl +++ b/wcfsetup/install/files/acp/templates/index.tpl @@ -147,7 +147,7 @@
{lang}wcf.acp.index.credits.designer{/lang}
    -
  • Harald Szekely
    • +
  • Alexander Ebert
  • Marcel Werk
diff --git a/wcfsetup/install/files/acp/templates/pageHeader.tpl b/wcfsetup/install/files/acp/templates/pageHeader.tpl index a9ac2cb917..b0e30eee10 100644 --- a/wcfsetup/install/files/acp/templates/pageHeader.tpl +++ b/wcfsetup/install/files/acp/templates/pageHeader.tpl @@ -1,6 +1,6 @@