"Opened & Closed" CSS, icons & functions renamed.

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index f6b9747cc347e2e61d6117290e94c7ea3c7fbc24..d522390c11c6187fb221e066636dfd23ff4e8375 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -327,7 +327,7 @@ nav.sidebarMenu > div a:hover {
 }
 
 nav.sidebarMenu > div h1 {
-       background-image: url("../../icon/boxOpener.svg");
+       background-image: url("../../icon/closed.svg");
        background-position: 15px center;
        background-size: 16px;
        background-repeat: no-repeat;
@@ -341,7 +341,7 @@ nav.sidebarMenu > div h1 {
 }
 
 nav.sidebarMenu > div h1.activeMenuItem {
-       background-image: url("../../icon/boxCloser.svg");
+       background-image: url("../../icon/opened.svg");
 }
 
 nav.sidebarMenu > div ul li {

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 219ac05ff7db8d3cfaef023a3764e000d7ae51ba..b786254c1196d2de3e1f5c56d4e212810fca2d05 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -4,10 +4,10 @@
        //<![CDATA[
        $(function() {
                {* TODO: Fix icon path *}
-               {* TODO: Please do not call these icons "plus" / "minus"! They may not look like that! Therefor i changed the names to "opener" / "closer". There should be a way to add a Suffix to the file name also, such as the deprecated size-suffix (s, m, l). We now use the number suffix "1, 2, …". Strict names are not very useful here. *}
+               {* TODO: Please do not call these icons "plus" / "minus"! They may not look like that! Therefor i changed the names to "opened" / "closed". There should be a way to add a Suffix to the file name also, similar to the deprecated size-suffix (s, m, l). We now use the number suffix "1, 2, …". Strict names are not very useful here. *}
                WCF.Icon.addObject({
-                       'wcf.global.closer': '{@RELATIVE_WCF_DIR}icon/closer.svg',
-                       'wcf.global.opener': '{@RELATIVE_WCF_DIR}icon/opener.svg'
+                       'wcf.global.opened': '{@RELATIVE_WCF_DIR}icon/opened2.svg',
+                       'wcf.global.closed': '{@RELATIVE_WCF_DIR}icon/closed2.svg'
                });
 
                WCF.Collapsible.Simple.init();
@@ -64,7 +64,7 @@
        {counter name=cacheIndex assign=cacheIndex print=false start=0}
        {if $files|count}
                <div class="border boxTitle">
-                       <a data-isOpen="1" data-collapsibleContainer="cache{@$cacheIndex}" class="collapsible"><img src="{@RELATIVE_WCF_DIR}icon/boxOpener2.svg" alt="" title="ToDo: Collapsible" class="balloonTooltip" /></a>
+                       <a data-isOpen="1" data-collapsibleContainer="cache{@$cacheIndex}" class="collapsible"><img src="{@RELATIVE_WCF_DIR}icon/opened2.svg" alt="" title="ToDo: Collapsible" class="balloonTooltip" /></a>
                        <hgroup>
                                <h1>{$cache} <span class="badge" title="{lang}wcf.acp.cache.data.files.count{/lang}">{#$files|count}</span></h1>
                        </hgroup>

diff --git a/wcfsetup/install/files/icon/boxCloser.svg b/wcfsetup/install/files/icon/boxCloser.svg
deleted file mode 100755 (executable)
index bb1694b..0000000
--- a/wcfsetup/install/files/icon/boxCloser.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
-       \r
-       <title>Box Closer</title> \r
-       <desc>Box Closer Icon</desc> \r
-       \r
-       <!--\r
-               @author         Harald Szekely \r
-               @copyright      2011 WoltLab GmbH \r
-               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
-       --> \r
-       \r
-       <defs>\r
-               \r
-       </defs>\r
-       \r
-       <g id="IconBoxCloser">\r
-               <polygon class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" points="1,3 7.5014648,14 14,3"/>\r
-               <polygon class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #369;" points="1,2.0004883 7.5009766,13 14,2.0004883"/>\r
-       </g>\r
-</svg>\r

diff --git a/wcfsetup/install/files/icon/boxCloser2.svg b/wcfsetup/install/files/icon/boxCloser2.svg
deleted file mode 100755 (executable)
index 203a2af..0000000
--- a/wcfsetup/install/files/icon/boxCloser2.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
-       \r
-       <title>Box Closer</title> \r
-       <desc>Box Closer Icon</desc> \r
-       \r
-       <!--\r
-               @author         Harald Szekely \r
-               @copyright      2011 WoltLab GmbH \r
-               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
-       --> \r
-       \r
-       <defs>\r
-               \r
-       </defs>\r
-       \r
-       <g id="IconBoxCloser">\r
-               <polygon class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #000;" points="1,2.0004883 7.5009766,13 14,2.0004883"/>\r
-               <polygon class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" points="1,3 7.5014648,14 14,3"/>\r
-       </g>\r
-</svg>\r

diff --git a/wcfsetup/install/files/icon/boxOpener.svg b/wcfsetup/install/files/icon/boxOpener.svg
deleted file mode 100755 (executable)
index 0d58ab9..0000000
--- a/wcfsetup/install/files/icon/boxOpener.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
-       \r
-       <title>Box Opener</title> \r
-       <desc>Box Opener Icon</desc> \r
-       \r
-       <!--\r
-               @author         Harald Szekely \r
-               @copyright      2011 WoltLab GmbH \r
-               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
-       --> \r
-       \r
-       <defs>\r
-               \r
-       </defs>\r
-       \r
-       <g id="IconBoxOpener">\r
-               <polygon class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" points="2,15 13,8.4985352 2,1"/>\r
-               <polygon class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #369;" points="2,14 13,7.4990234 2,1"/>\r
-       </g>\r
-</svg>\r

diff --git a/wcfsetup/install/files/icon/boxOpener2.svg b/wcfsetup/install/files/icon/boxOpener2.svg
deleted file mode 100755 (executable)
index 0553ca3..0000000
--- a/wcfsetup/install/files/icon/boxOpener2.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
-       \r
-       <title>Box Opener 2</title> \r
-       <desc>Box Opener 2 Icon</desc> \r
-       \r
-       <!--\r
-               @author         Harald Szekely \r
-               @copyright      2011 WoltLab GmbH \r
-               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
-       --> \r
-       \r
-       <defs>\r
-               \r
-       </defs>\r
-       \r
-       <g id="IconBoxOpener2">\r
-               <polygon class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #000;" points="2,14 13,7.4990234 2,1"/>\r
-               <polygon class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" points="2,15 13,8.4985352 2,1"/>\r
-       </g>\r
-</svg>\r

diff --git a/wcfsetup/install/files/icon/closed.svg b/wcfsetup/install/files/icon/closed.svg
new file mode 100755 (executable)
index 0000000..29c56c6
--- /dev/null
+++ b/wcfsetup/install/files/icon/closed.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
+       \r
+       <title>Collapsible Opened</title> \r
+       <desc>Collapsible Opened Icon</desc> \r
+       \r
+       <!--\r
+               @author         Harald Szekely \r
+               @copyright      2011 WoltLab GmbH \r
+               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
+       --> \r
+       \r
+       <defs>\r
+               \r
+       </defs>\r
+       \r
+       <g id="IconCollapsibleOpened">\r
+               <polygon class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" points="2,15 13,8.4985352 2,1"/>\r
+               <polygon class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #369;" points="2,14 13,7.4990234 2,1"/>\r
+       </g>\r
+</svg>\r

diff --git a/wcfsetup/install/files/icon/closed2.svg b/wcfsetup/install/files/icon/closed2.svg
new file mode 100755 (executable)
index 0000000..d36acc0
--- /dev/null
+++ b/wcfsetup/install/files/icon/closed2.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
+       \r
+       <title>Collapsible Opened</title> \r
+       <desc>Collapsible Opened Icon</desc> \r
+       \r
+       <!--\r
+               @author         Harald Szekely \r
+               @copyright      2011 WoltLab GmbH \r
+               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
+       --> \r
+       \r
+       <defs>\r
+               \r
+       </defs>\r
+       \r
+       <g id="IconCollapsibleOpened">\r
+               <polygon class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #000;" points="2,14 13,7.4990234 2,1"/>\r
+               <polygon class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" points="2,15 13,8.4985352 2,1"/>\r
+       </g>\r
+</svg>\r

diff --git a/wcfsetup/install/files/icon/opened.svg b/wcfsetup/install/files/icon/opened.svg
new file mode 100755 (executable)
index 0000000..dfac1b5
--- /dev/null
+++ b/wcfsetup/install/files/icon/opened.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
+       \r
+       <title>Collapsible Closed</title> \r
+       <desc>Collapsible Closed Icon</desc> \r
+       \r
+       <!--\r
+               @author         Harald Szekely \r
+               @copyright      2011 WoltLab GmbH \r
+               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
+       --> \r
+       \r
+       <defs>\r
+               \r
+       </defs>\r
+       \r
+       <g id="IconBoxCloser">\r
+               <polygon class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" points="1,3 7.5014648,14 14,3"/>\r
+               <polygon class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #369;" points="1,2.0004883 7.5009766,13 14,2.0004883"/>\r
+       </g>\r
+</svg>\r

diff --git a/wcfsetup/install/files/icon/opened2.svg b/wcfsetup/install/files/icon/opened2.svg
new file mode 100755 (executable)
index 0000000..e7d7434
--- /dev/null
+++ b/wcfsetup/install/files/icon/opened2.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
+       \r
+       <title>Collapsible Closed</title> \r
+       <desc>Collapsible Closed Icon</desc> \r
+       \r
+       <!--\r
+               @author         Harald Szekely \r
+               @copyright      2011 WoltLab GmbH \r
+               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
+       --> \r
+       \r
+       <defs>\r
+               \r
+       </defs>\r
+       \r
+       <g id="IconCollapsibleClosed">\r
+               <polygon class="Lower" style="fill-rule: evenodd; clip-rule: evenodd; fill: #000;" points="1,2.0004883 7.5009766,13 14,2.0004883"/>\r
+               <polygon class="Upper" style="fill-rule: evenodd; clip-rule: evenodd; fill: #fff;" points="1,3 7.5014648,14 14,3"/>\r
+       </g>\r
+</svg>\r