slitaz-dev-tools rev 201
tazwikiss: fix a list side effect
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Nov 17 16:31:03 2013 +0000 (2013-11-17) |
parents | 73d6a8a85986 |
children | c07b80d1e89b |
files | tazwikiss/rootfs/var/www/wiki/index.sh tazwikiss/rootfs/var/www/wiki/plugins/wkp_Admin.sh tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.sh tazwikiss/rootfs/var/www/wiki/plugins/wkp_Upload.sh |
line diff
1.1 --- a/tazwikiss/rootfs/var/www/wiki/index.sh Sun Nov 17 13:32:25 2013 +0000 1.2 +++ b/tazwikiss/rootfs/var/www/wiki/index.sh Sun Nov 17 16:31:03 2013 +0000 1.3 @@ -353,6 +353,7 @@ 1.4 -e ':x;/<\/ul>$/{N;s/\n//;$P;$D;bx;}' | sed \ 1.5 -e ':x;s/<\/ul><ul>//g;tx' -e ':x;s/<\/ol><ol>//g;tx' \ 1.6 -e 's|----*$|<hr />|' -e 's|$|<br />|' \ 1.7 + -e 's|</ul>|&\n|g' -e 's|</ol>|&\n|g' \ 1.8 -e 's#</li>#&\n#g' -e 's#\(</h[123456]>\)<br />#\1#g' \ 1.9 -e "s#'--\([^']*\)--'#<del>\1</del>#g" \ 1.10 -e "s#'__\([^']*\)__'#<u>\1</u>#g" \
2.1 --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Admin.sh Sun Nov 17 13:32:25 2013 +0000 2.2 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Admin.sh Sun Nov 17 16:31:03 2013 +0000 2.3 @@ -1,4 +1,4 @@ 2.4 -plugin="<a href=\"?action=admin\">Administration</a>" 2.5 +plugin="<a href=\"?action=admin\" title=\"Wiki administration\">Administration</a>" 2.6 description_fr="Administration du Wiki" 2.7 description="Wiki administration" 2.8 2.9 @@ -97,7 +97,7 @@ 2.10 alt="$(grep ^help_$lang= $i)" 2.11 [ -n "$alt" ] && eval $(echo "$alt" | sed 's/_..=/=/') 2.12 name="$(basename $i .sh)" 2.13 - [ -n "$help" ] && description=" <a href='?page=$help'>$description</a>" 2.14 + [ -n "$help" ] && description=" <a href='?page=$help' title='$plugin help page'>$description</a>" 2.15 ;; 2.16 Locales) 2.17 j=${i#config-}
3.1 --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.sh Sun Nov 17 13:32:25 2013 +0000 3.2 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.sh Sun Nov 17 16:31:03 2013 +0000 3.3 @@ -8,6 +8,7 @@ 3.4 showhead) cat <<EOT 3.5 <!-- Based on http://jsfiddle.net/ondras/hYfN3/ by Ondřej Žára --> 3.6 <script type="text/javascript"> 3.7 +<!-- 3.8 function csv(id,rows,cols) { 3.9 var data = ""; 3.10 for (var i=1; i<=rows; i++) { 3.11 @@ -56,12 +57,14 @@ 3.12 (isNaN(parseFloat(v)) && v.charAt(0) != "=") ? "left" : "right"; 3.13 e.title = v; 3.14 } 3.15 +//--> 3.16 </script> 3.17 <span id="widthcalc" class="cellcalc" style="visibility:hidden;"></span> 3.18 EOT 3.19 exit 0 ;; 3.20 showtail) cat <<EOT 3.21 <script type="text/javascript"> 3.22 +<!-- 3.23 var INPUTS=[].slice.call(document.getElementsByClassName("inputcalc")); 3.24 INPUTS.forEach(function(elm) { 3.25 elm.onfocus = function(e) { 3.26 @@ -86,6 +89,7 @@ 3.27 var calcid = elm.id.substring(0,4), cellid = elm.id.substring(4); 3.28 try { elm.value = DATA[calcid][cellid]; } catch(e) {} }); 3.29 })(); 3.30 +//--> 3.31 </script> 3.32 EOT 3.33 exit 0 ;; 3.34 @@ -101,6 +105,7 @@ 3.35 print "<noscript><u>Enable javascript to see the spreadsheet " id "</u></noscript>" 3.36 print "<table id=\"" id "\" class=\"tablecalc\"></table>" 3.37 print "<script type=\"text/javascript\">" 3.38 + print "<!--" 3.39 print "buildCalc(\"" id "\"," lines "," rows ");" 3.40 for (i = 1; i <= lines; i++) { 3.41 gsub("<","<",line[i]) 3.42 @@ -112,6 +117,7 @@ 3.43 print s c i "\"), \"" tmp[j] "\")"; 3.44 } 3.45 } 3.46 + print "//-->" 3.47 print "</script>" 3.48 } 3.49 else for (i = 1; i <= lines; i++) print line[i]
4.1 --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Upload.sh Sun Nov 17 13:32:25 2013 +0000 4.2 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Upload.sh Sun Nov 17 16:31:03 2013 +0000 4.3 @@ -1,4 +1,4 @@ 4.4 -plugin="<a href=\"?action=upload\">Upload</a>" 4.5 +plugin="<a href=\"?action=upload\" title=\"Upload a file\">Upload</a>" 4.6 description_fr="Télécharge des fichiers complémentaires (ex: images)" 4.7 description="Upload page extra files (ex: images)" 4.8