Improves icons in JavaScript environment

Improvements:

* Fixes violation of naming convention of arrow icons.
* Makes `add` icon globally available in JavaScript.
* Unifies the loaded icons in ACP and front-end (adds missing ones to ACP).

also:

* Removes old template variable for additional stylesheets in ACP.

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index f408b44b90042d57cce09ce4f90378e1865fa7c8..7a88cdbe0d89b390bc4541fcb81eba7243e7ac66 100644 (file)
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -71,21 +71,22 @@
                });
                
                WCF.Icon.addObject({
-                       'wcf.icon.loading': '{icon}spinner{/icon}',
-                       'wcf.icon.opened': '{icon}arrowDownInverse{/icon}',
+                       'wcf.icon.add': '{icon}add{/icon}',
+                       'wcf.icon.arrowDown': '{icon}arrowDown{/icon}',
+                       'wcf.icon.arrowLeft': '{icon}arrowLeft{/icon}',
+                       'wcf.icon.arrowRight': '{icon}arrowRight{/icon}',
+                       'wcf.icon.arrowUp': '{icon}arrowUp{/icon}',
+                       'wcf.icon.circleArrowDown': '{icon}circleArrowDown{/icon}',
+                       'wcf.icon.circleArrowLeft': '{icon}circleArrowLeft{/icon}',
+                       'wcf.icon.circleArrowRight': '{icon}circleArrowRight{/icon}',
+                       'wcf.icon.circleArrowUp': '{icon}circleArrowUp{/icon}',
                        'wcf.icon.closed': '{icon}arrowRightInverse{/icon}',
-                       'wcf.icon.arrow.left': '{icon}arrowLeft{/icon}',
-                       'wcf.icon.arrow.left.circle': '{icon}circleArrowLeft{/icon}',
-                       'wcf.icon.arrow.right': '{icon}arrowRight{/icon}',
-                       'wcf.icon.arrow.right.circle': '{icon}circleArrowRight{/icon}',
-                       'wcf.icon.arrow.down': '{icon}arrowDown{/icon}',
-                       'wcf.icon.arrow.down.circle': '{icon}circleArroDown{/icon}',
-                       'wcf.icon.arrow.up': '{icon}arrowUp{/icon}',
-                       'wcf.icon.arrow.up.circle': '{icon}circleArrowUp{/icon}',
                        'wcf.icon.dropdown': '{icon}dropdown{/icon}',
-                       'wcf.icon.edit': '{icon}edit{/icon}',
                        'wcf.icon.delete': '{icon}delete{/icon}',
-                       'wcf.icon.error': '{icon}errorRed{/icon}'
+                       'wcf.icon.edit': '{icon}edit{/icon}',
+                       'wcf.icon.error': '{icon}errorRed{/icon}',
+                       'wcf.icon.loading': '{icon}spinner{/icon}',
+                       'wcf.icon.opened': '{icon}arrowDownInverse{/icon}'
                        {event name='javascriptIconImport'}
                });
                
@@ -96,7 +97,7 @@
                WCF.Dropdown.init();
                
                {event name='javascriptInit'}
-
+               
                {if $executeCronjobs}
                        new WCF.Action.Proxy({
                                autoSend: true,

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index b9785a576f025ac707f7bcc57870d7ec0bc85d92..9ee86c0bd6bbc0762d6933964bae525425f0515c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -31,13 +31,6 @@
        {* work-around for unknown core-object during WCFSetup *}
        {@$__wcf->getStyleHandler()->getStylesheet()}
        
-       {*
-       {if $specialStyles|isset}
-               <!-- special styles -->
-               {@$specialStyles}
-       {/if}
-       *}
-       
        <script type="text/javascript">
                //<![CDATA[
                $(function() {
@@ -79,9 +72,23 @@
                                'wcf.global.form.edit.success': '{lang}wcf.global.form.edit.success{/lang}'
                        });
                        WCF.Icon.addObject({
+                               'wcf.icon.add': '{@$__wcf->getPath()}icon/add.svg',
+                               'wcf.icon.arrowDown': '{@$__wcf->getPath()}icon/arrowDown.svg',
+                               'wcf.icon.arrowLeft': '{@$__wcf->getPath()}icon/arrowLeft.svg',
+                               'wcf.icon.arrowRight': '{@$__wcf->getPath()}icon/arrowRight.svg',
+                               'wcf.icon.arrowUp': '{@$__wcf->getPath()}icon/arrowUp.svg',
+                               'wcf.icon.circleArrowDown': '{@$__wcf->getPath()}icon/circleArrowDown.svg',
+                               'wcf.icon.circleArrowLeft': '{@$__wcf->getPath()}icon/circleArrowLeft.svg',
+                               'wcf.icon.circleArrowRight': '{@$__wcf->getPath()}icon/circleArrowRight.svg',
+                               'wcf.icon.circleArrowUp': '{@$__wcf->getPath()}icon/circleArrowUp.svg',
                                'wcf.icon.closed': '{@$__wcf->getPath()}icon/arrowRightInverse.svg',
+                               'wcf.icon.dropdown': '{@$__wcf->getPath()}icon/dropdown.svg',
+                               'wcf.icon.delete': '{@$__wcf->getPath()}icon/delete.svg',
+                               'wcf.icon.edit': '{@$__wcf->getPath()}icon/edit.svg',
+                               'wcf.icon.error': '{@$__wcf->getPath()}icon/errorRed.svg',
                                'wcf.icon.loading': '{@$__wcf->getPath()}icon/spinner.svg',
                                'wcf.icon.opened': '{@$__wcf->getPath()}icon/arrowDownInverse.svg'
+                               {event name='javascriptIconImport'}
                        });
                        new WCF.Date.Time();
                        new WCF.Effect.SmoothScroll();

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index dd38ba567a433a02324935d2608f4f43cbb02f36..68c19db115efa3eaf188a5f34d153e0b518dffe1 100755 (executable)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -7289,9 +7289,9 @@ $.widget('ui.wcfPages', {
        _create: function() {
                if (this.options.nextPage === null) this.options.nextPage = WCF.Language.get('wcf.global.page.next');
                if (this.options.previousPage === null) this.options.previousPage = WCF.Language.get('wcf.global.page.previous');
-               if (this.options.previousIcon === null) this.options.previousIcon = WCF.Icon.get('wcf.icon.arrow.left.circle');
-               if (this.options.nextIcon === null) this.options.nextIcon = WCF.Icon.get('wcf.icon.arrow.right.circle');
-               if (this.options.arrowDownIcon === null) this.options.arrowDownIcon = WCF.Icon.get('wcf.icon.arrow.down');
+               if (this.options.previousIcon === null) this.options.previousIcon = WCF.Icon.get('wcf.icon.circleArrowLeft');
+               if (this.options.nextIcon === null) this.options.nextIcon = WCF.Icon.get('wcf.icon.circleArrowRight');
+               if (this.options.arrowDownIcon === null) this.options.arrowDownIcon = WCF.Icon.get('wcf.icon.arrowDown');
                
                this.element.addClass('pageNavigation');