Fixed icon & JS

diff --git a/wcfsetup/install/files/icon/working2.svg b/wcfsetup/install/files/icon/working2.svg
index 4e012085d7dd772f491cb795d5b18b9cd1867244..7f96eb274310de618e7261c4e8ca335f6166d660 100755 (executable)
--- a/wcfsetup/install/files/icon/working2.svg
+++ b/wcfsetup/install/files/icon/working2.svg
@@ -15,44 +15,17 @@
        <defs>\r
                <style type="text/css">\r
                        <![CDATA[\r
-                               .Upper1 {fill: #666;}\r
-                               .Lower1 {fill: #fff;}\r
+                               .Upper2 {fill: #fff;}\r
+                               .Lower2 {fill: #000;}\r
                        ]]>\r
                </style>\r
        </defs>\r
        \r
        <g id="IconWorkingA">\r
-               <g>\r
-                       <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0 7.5 8.5" to="360 7.5 8.5" begin="0s" dur="10s"  repeatCount="indefinite" />\r
-                       \r
-                       <path class="Lower1" d="M13.5058594,7.4238281l-1.7324219-0.2666016\r
-                               C11.6933594,6.902832,11.59375,6.659668,11.4716797,6.4267578l1.0361328-1.4125977\r
-                               c0.1630859-0.2216797,0.1367188-0.5625-0.0576172-0.7568359L11.7431641,3.550293\r
-                               c-0.1943359-0.1943359-0.5351562-0.2207031-0.7568359-0.0576172L9.5732422,4.5283203\r
-                               C9.3398438,4.40625,9.0976562,4.3066406,8.8427734,4.2265625L8.5761719,2.4941406C8.5341797,2.222168,8.2749023,2,8,2H7.0004883\r
-                               C6.7255859,2,6.4663086,2.222168,6.4243164,2.4941406L6.1582031,4.2265625\r
-                               C5.9033203,4.3066406,5.6601562,4.40625,5.4267578,4.5283203L4.0141602,3.4926758\r
-                               c-0.2216797-0.1630859-0.5625-0.1367188-0.7568359,0.0576172L2.550293,4.2573242\r
-                               C2.355957,4.4516602,2.3300781,4.7924805,2.4926758,5.0141602l1.0356445,1.4125977\r
-                               C3.4067383,6.659668,3.3071289,6.902832,3.2270508,7.1572266L1.4941406,7.4238281C1.222168,7.4658203,1,7.7250977,1,8v1\r
-                               c0,0.2753906,0.222168,0.5341797,0.4941406,0.5761719l1.7324219,0.2666016\r
-                               c0.0800781,0.2548828,0.1791992,0.4970703,0.3012695,0.7304688l-1.0356445,1.4121094\r
-                               c-0.1625977,0.2216797-0.1367188,0.5625,0.0576172,0.7568359l0.7084961,0.7080078\r
-                               c0.1943359,0.1943359,0.5351562,0.2207031,0.7568359,0.0576172l1.4121094-1.0351562\r
-                               C5.659668,12.59375,5.902832,12.6933594,6.1572266,12.7734375l0.2661133,1.7324219C6.465332,14.7773438,6.7246094,15,6.9995117,15\r
-                               h1.0014648c0.2749023,0,0.5341797-0.2226562,0.5761719-0.4941406l0.2661133-1.7324219\r
-                               c0.2543945-0.0800781,0.4975586-0.1796875,0.7299805-0.3017578l1.4121094,1.0361328\r
-                               c0.2216797,0.1630859,0.5625,0.1367188,0.7568359-0.0576172l0.7080078-0.7080078\r
-                               c0.1943359-0.1943359,0.2207031-0.5351562,0.0576172-0.7568359l-1.0351562-1.4121094\r
-                               c0.1210938-0.2333984,0.2207031-0.4755859,0.3007812-0.7304688l1.7324219-0.2666016C13.7773438,9.5341797,14,9.2753906,14,9V8\r
-                               C14,7.7250977,13.7773438,7.4658203,13.5058594,7.4238281z M7.5,11C6.1191406,11,5,9.8808594,5,8.5004883\r
-                               C5,7.1196289,6.1191406,6,7.5,6S10,7.1196289,10,8.5004883C10,9.8808594,8.8808594,11,7.5,11z M9,8.5004883\r
-                               C9,9.3291016,8.3286133,10,7.5,10C6.671875,10,6,9.3291016,6,8.5004883S6.671875,7,7.5,7C8.3286133,7,9,7.671875,9,8.5004883z"/>\r
-               </g>\r
                <g>\r
                        <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0 7.5 7.5" to="360 7.5 7.5" begin="0s" dur="10s"  repeatCount="indefinite" />\r
                        \r
-                       <path class="Upper1" d="M13.5058594,6.4238281l-1.7324219-0.2666016\r
+                       <path class="Lower2" d="M13.5058594,6.4238281l-1.7324219-0.2666016\r
                                C11.6933594,5.902832,11.59375,5.659668,11.4716797,5.4267578l1.0361328-1.4125977\r
                                c0.1630859-0.2216797,0.1367188-0.5625-0.0576172-0.7568359L11.7431641,2.550293\r
                                c-0.1943359-0.1943359-0.5351562-0.2207031-0.7568359-0.0576172L9.5732422,3.5283203\r
@@ -76,5 +49,32 @@
                                S10,6.1196289,10,7.5004883S8.8808594,10,7.5,10z M9,7.5004883C9,8.3286133,8.3286133,9,7.5,9C6.671875,9,6,8.3286133,6,7.5004883\r
                                C6,6.671875,6.671875,6,7.5,6C8.3286133,6,9,6.671875,9,7.5004883z"/>\r
                </g>\r
+               <g>\r
+                       <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0 7.5 8.5" to="360 7.5 8.5" begin="0s" dur="10s"  repeatCount="indefinite" />\r
+                       \r
+                       <path class="Upper2" d="M13.5058594,7.4238281l-1.7324219-0.2666016\r
+                               C11.6933594,6.902832,11.59375,6.659668,11.4716797,6.4267578l1.0361328-1.4125977\r
+                               c0.1630859-0.2216797,0.1367188-0.5625-0.0576172-0.7568359L11.7431641,3.550293\r
+                               c-0.1943359-0.1943359-0.5351562-0.2207031-0.7568359-0.0576172L9.5732422,4.5283203\r
+                               C9.3398438,4.40625,9.0976562,4.3066406,8.8427734,4.2265625L8.5761719,2.4941406C8.5341797,2.222168,8.2749023,2,8,2H7.0004883\r
+                               C6.7255859,2,6.4663086,2.222168,6.4243164,2.4941406L6.1582031,4.2265625\r
+                               C5.9033203,4.3066406,5.6601562,4.40625,5.4267578,4.5283203L4.0141602,3.4926758\r
+                               c-0.2216797-0.1630859-0.5625-0.1367188-0.7568359,0.0576172L2.550293,4.2573242\r
+                               C2.355957,4.4516602,2.3300781,4.7924805,2.4926758,5.0141602l1.0356445,1.4125977\r
+                               C3.4067383,6.659668,3.3071289,6.902832,3.2270508,7.1572266L1.4941406,7.4238281C1.222168,7.4658203,1,7.7250977,1,8v1\r
+                               c0,0.2753906,0.222168,0.5341797,0.4941406,0.5761719l1.7324219,0.2666016\r
+                               c0.0800781,0.2548828,0.1791992,0.4970703,0.3012695,0.7304688l-1.0356445,1.4121094\r
+                               c-0.1625977,0.2216797-0.1367188,0.5625,0.0576172,0.7568359l0.7084961,0.7080078\r
+                               c0.1943359,0.1943359,0.5351562,0.2207031,0.7568359,0.0576172l1.4121094-1.0351562\r
+                               C5.659668,12.59375,5.902832,12.6933594,6.1572266,12.7734375l0.2661133,1.7324219C6.465332,14.7773438,6.7246094,15,6.9995117,15\r
+                               h1.0014648c0.2749023,0,0.5341797-0.2226562,0.5761719-0.4941406l0.2661133-1.7324219\r
+                               c0.2543945-0.0800781,0.4975586-0.1796875,0.7299805-0.3017578l1.4121094,1.0361328\r
+                               c0.2216797,0.1630859,0.5625,0.1367188,0.7568359-0.0576172l0.7080078-0.7080078\r
+                               c0.1943359-0.1943359,0.2207031-0.5351562,0.0576172-0.7568359l-1.0351562-1.4121094\r
+                               c0.1210938-0.2333984,0.2207031-0.4755859,0.3007812-0.7304688l1.7324219-0.2666016C13.7773438,9.5341797,14,9.2753906,14,9V8\r
+                               C14,7.7250977,13.7773438,7.4658203,13.5058594,7.4238281z M7.5,11C6.1191406,11,5,9.8808594,5,8.5004883\r
+                               C5,7.1196289,6.1191406,6,7.5,6S10,7.1196289,10,8.5004883C10,9.8808594,8.8808594,11,7.5,11z M9,8.5004883\r
+                               C9,9.3291016,8.3286133,10,7.5,10C6.671875,10,6,9.3291016,6,8.5004883S6.671875,7,7.5,7C8.3286133,7,9,7.671875,9,8.5004883z"/>\r
+               </g>\r
        </g>\r
 </svg>\r

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 576d4648c42a5a7c11242cd556776d52d6624c50..38972d29ff43f706e29073c451dabca6329c3870 100644 (file)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -3027,7 +3027,7 @@ $.widget('ui.wcfSidebar', {
         */
        _create: function() {
                this.element.wrap('<div class="collapsibleSidebar"></div>');
-               this._container = this.element.parent('div');
+               this._container = this.element.parents('aside:eq(0)');
                
                // create toggle button
                this._button = $('<span class="collapsibleSidebarButton" title="' + WCF.Language.get('wcf.global.button.collapsible') + '"></span>').appendTo(this._container);