# HG changeset patch # User Aleksej Bobylev # Date 1434476845 -10800 # Node ID 42d6df56a10fc6dfde34f6aa9499085d49adb39a # Parent 205828e57e543f8982ca24fd613505a1ff7e2dd9 libtaz.sh: do not fail processing --options-with-dashes or --weird%option$. Add custom tag "x-details" support to slitaz-doc.{css,js} diff -r 205828e57e54 -r 42d6df56a10f rootfs/lib/libtaz.sh --- a/rootfs/lib/libtaz.sh Thu Jun 04 00:23:36 2015 +0300 +++ b/rootfs/lib/libtaz.sh Tue Jun 16 20:47:25 2015 +0300 @@ -28,10 +28,12 @@ # Parse cmdline options and store values in a variable. for opt in "$@"; do - case "$opt" in - --*=*) export "${opt#--}";; - --*) export ${opt#--}='yes';; + opt_name="${opt%%=*}"; opt_name="$(echo "${opt_name#--}" | tr -c 'a-zA-Z0-9' '_')" + case "$opt_name" in + [0-9]*) opt_name="_$opt_name";; esac + opt_value="${opt#*=}"; opt_value="${opt_value:-yes}" + export "$opt_name=$opt_value" done [ "$HTTP_REFERER" ] && output='html' diff -r 205828e57e54 -r 42d6df56a10f rootfs/usr/share/doc/slitaz-doc.css --- a/rootfs/usr/share/doc/slitaz-doc.css Thu Jun 04 00:23:36 2015 +0300 +++ b/rootfs/usr/share/doc/slitaz-doc.css Tue Jun 16 20:47:25 2015 +0300 @@ -7,7 +7,7 @@ } h1 { font-size: 150%; font-weight: 400; margin: 0; padding: 0.3em; } -h2 { font-size: 200%; font-weight: 300; margin: 1em 0 0 0; } +h2 { font-size: 200%; font-weight: 300; margin: 1em 0 0 0; text-transform: uppercase; } h3 { font-size: 150%; font-weight: 400; margin: 1em 0 0 0; } p { margin: 0.5em 0; } @@ -80,7 +80,21 @@ header, #header { background-color: hsl( 0, 0%, 15%); } #footer, footer, #header, header - { border-color: hsl(0, 0%, 75%); } + { background-color: hsl( 0, 0%, 95%); border-color: hsl(0, 0%, 75%); } code, tt { color: hsl( 0, 0%, 30%); } pre tt { color: hsl( 30, 90%, 30%); } /* shell prompt */ pre em { color: hsl(180, 90%, 30%); } + + +x-details { + display: inline; outline: 1px solid hsl(180, 15%, 80%); + background-color: hsl(180, 15%, 96%); } +x-details > label { cursor: pointer; color: hsl(180, 45%, 50%); } +x-details > input { display: none; } +x-details > input + label:before { content: '+'; } +x-details > input:checked + label:before { content: '−'; } + +x-details > label, x-details > span { padding: 0.2rem; } + +x-details > input + label ~ span { display: none; } +x-details > input:checked + label ~ span { display: inline; } diff -r 205828e57e54 -r 42d6df56a10f rootfs/usr/share/doc/slitaz-doc.js --- a/rootfs/usr/share/doc/slitaz-doc.js Thu Jun 04 00:23:36 2015 +0300 +++ b/rootfs/usr/share/doc/slitaz-doc.js Tue Jun 16 20:47:25 2015 +0300 @@ -5,4 +5,15 @@ var element = preElements[i]; element.innerHTML = element.innerHTML.replace(/^#/gm,'#').replace(/^\$/gm,'$'); } + + //
html element not supported in the current SliTaz gtk-webkit + // use custom instead + var detailsElements = document.getElementsByTagName('x-details'); + for(var i = 0; i < detailsElements.length; ++ i) + { + var element = detailsElements[i]; + element.innerHTML = '' + + element.innerHTML + ''; + } }