rewrote and improved HTML for TOC

Attention: Template authors need to adjust their CSS!

Original structure:
div.toc >
  div#toc__header.tocheader.toctoggle > span#toc__toggle.toc_close|toc_open > span
  div#toc__inside > ul.toc > li.level1 > div.li > span.li > a.toc

New structure:
div#dw__toc.open|close >
  h3 > strong > span
  ul.toc > li.toc > div.li > a

3 files changed, 27 insertions, 31 deletions

diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css
index f89bce6c1..e62bb0a7a 100644
--- a/lib/tpl/dokuwiki/css/_toc.css
+++ b/lib/tpl/dokuwiki/css/_toc.css
@@ -7,68 +7,66 @@
 ********************************************************************/
 
 /* toc container */
-.dokuwiki div.toc {
+#dw__toc {
     float: right;
     margin: 0 0 1.4em 1.4em;
     width: 12em;
     background-color: __background_alt__;
     color: inherit;
 }
-[dir=rtl] .dokuwiki div.toc {
+[dir=rtl] #dw__toc {
     float: left;
     margin: 0 1.4em 1.4em 0;
 }
 
 /*____________ toc header ____________*/
 
-.dokuwiki div.tocheader {
+#dw__toc h3 {
     padding: .2em .5em;
     font-weight: bold;
 }
 
-.dokuwiki .toc span.toc_open,
-.dokuwiki .toc span.toc_close {
+#dw__toc h3 strong {
     float: right;
     margin: 0 .2em;
 }
-[dir=rtl] .dokuwiki .toc span.toc_open,
-[dir=rtl] .dokuwiki .toc span.toc_close {
+[dir=rtl] #dw__toc h3 strong {
     float: left;
 }
 
 /*____________ toc list ____________*/
 
-.dokuwiki #toc__inside {
+#dw__toc > div {
     padding: .2em .5em;
 }
-.dokuwiki #toc__inside ul {
+#dw__toc ul {
     padding: 0;
     margin: 0;
 }
-.dokuwiki #toc__inside ul li {
+#dw__toc ul li {
     list-style: none;
     padding: 0;
     margin: 0;
     line-height: 1.1;
 }
-.dokuwiki #toc__inside ul li div.li {
+#dw__toc ul li div.li {
     padding: .15em 0;
 }
-.dokuwiki #toc__inside ul ul {
+#dw__toc ul ul {
     padding-left: 1em;
 }
-[dir=rtl] .dokuwiki #toc__inside ul ul {
+[dir=rtl] #dw__toc ul ul {
     padding-left: 0;
     padding-right: 1em;
 }
-.dokuwiki #toc__inside ul ul li {
+#dw__toc ul ul li {
 }
-.dokuwiki #toc__inside ul li a {
+#dw__toc ul li a {
 }
 
 /* in case of toc list jumping one level
   (e.g. if heading level 3 follows directly after heading level 1) */
-.dokuwiki #toc__inside ul li.clear {
+#dw__toc ul li.clear {
 }
 
 
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index f73985ed7..8ebeca6da 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -392,60 +392,58 @@
 
 /*____________ changes to _toc ____________*/
 
-.dokuwiki div.toc {
+#dw__toc {
     margin:  -2em -2em .5em 1.4em;
     width: __sidebar_width__;
     border-left: 1px solid __border__;
     background: __background__;
     color: inherit;
 }
-[dir=rtl] .dokuwiki div.toc {
+[dir=rtl] #dw__toc {
     margin: -2em 1.4em .5em -2em;
     border-left-width: 0;
     border-right: 1px solid __border__;
 }
 
-.dokuwiki div.tocheader {
+#dw__toc h3 {
     padding: .5em 1em;
     margin-bottom: 0;
     font-size: .875em;
     letter-spacing: .1em;
 }
 
-.dokuwiki .toc span.toc_open,
-.dokuwiki .toc span.toc_close {
+#dw__toc h3 strong {
     background: transparent url(images/toc-arrows.png) 0 0;
     width: 8px;
     height: 5px;
     margin: .4em 0 0;
 }
-.dokuwiki .toc span.toc_open {
+#dw__toc.close strong {
     background-position: 0 -5px;
 }
 
-.dokuwiki .toc span.toc_open span,
-.dokuwiki .toc span.toc_close span {
+#dw__toc strong span {
     display: none;
 }
 
 
-.dokuwiki #toc__inside {
+#dw__toc > div {
     font-size: 0.875em;
     padding: .5em 1em 1em;
 }
-.dokuwiki #toc__inside ul {
+#dw__toc ul {
     padding: 0 0 0 1.2em;
 }
-[dir=rtl] .dokuwiki #toc__inside ul {
+[dir=rtl] #dw__toc ul {
     padding: 0 1.5em 0 0;
 }
-.dokuwiki #toc__inside ul li {
+#dw__toc ul li {
     list-style-image: url(images/toc-bullet.png);
 }
-.dokuwiki #toc__inside ul li.clear {
+#dw__toc ul li.clear {
     list-style: none;
 }
-.dokuwiki #toc__inside ul li div.li {
+#dw__toc ul li div.li {
     padding: .2em 0;
 }
 
diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css
index f4f81d741..f6bf64dd9 100644
--- a/lib/tpl/dokuwiki/css/print.css
+++ b/lib/tpl/dokuwiki/css/print.css
@@ -21,7 +21,7 @@ div.error,
 #dokuwiki__header .tools,
 #dokuwiki__aside,
 .dokuwiki .breadcrumbs,
-.dokuwiki .toc,
+#dw__toc,
 .dokuwiki .secedit,
 #dokuwiki__pagetools,
 #dokuwiki__footer {