# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1440079219 -10800
# Node ID 5323427d34b909e2cc8e761bd113a6e526cb0643
# Parent  f8e0ae0ac1d93ce02089087b6b378427271046ca
Add "noheader" flag to get page without header/footer/panel "wrappers" (for pop-ups); strip, minify and gzip scripts and styles.

diff -r f8e0ae0ac1d9 -r 5323427d34b9 Makefile
--- a/Makefile	Tue Aug 18 19:09:02 2015 +0300
+++ b/Makefile	Thu Aug 20 17:00:19 2015 +0300
@@ -8,9 +8,15 @@
 BASECGI?=boot.cgi hardware.cgi help.cgi index.cgi network.cgi settings.cgi
 EXTRACGI?=floppy.cgi powersaving.cgi
 
-VERSION:=$(shell grep ^VERSION tazpanel | cut -d '=' -f 2)
+VERSION:=$(shell grep ^VERSION tazpanel | cut -d= -f2)
 
 all: msgfmt
+	mkdir build
+	cp -a *.cgi bootloader tazpanel \
+		lib/libtazpanel lib/*.js \
+		styles/default/*.html styles/default/*.css \
+		build
+	./stripall.sh
 
 # i18n
 
@@ -45,24 +51,30 @@
 		$(DESTDIR)$(PREFIX)/share/applications \
 		$(DESTDIR)$(SYSCONFDIR) \
 		$(DESTDIR)$(PANEL)/menu.d \
-		$(DESTDIR)/var/log
-	cp -a tazpanel $(DESTDIR)$(PREFIX)/bin
+		$(DESTDIR)/var/log \
+		$(DESTDIR)$(PANEL)/lib \
+		$(DESTDIR)$(PANEL)/styles/default
+
+	cp -a build/tazpanel $(DESTDIR)$(PREFIX)/bin
 	-[ "$(VERSION)" ] && sed -i 's/^VERSION=[0-9].*/VERSION=$(VERSION)/' $(DESTDIR)$(PREFIX)/bin/tazpanel
-	cp -a lib/ styles/ doc/ README* $(DESTDIR)$(PANEL)
+
+	cp -a doc/ README README.html $(DESTDIR)$(PANEL)
+	cp -a build/libtazpanel build/gz/*.js.gz $(DESTDIR)$(PANEL)/lib
+	cp -a build/gz/*.css.gz build/*.html styles/default/*.ico styles/default/*.ttf $(DESTDIR)$(PANEL)/styles/default
+
 	@for c in $(BASECGI); do \
-		cp -a $$c $(DESTDIR)$(PANEL); \
+		cp -a build/$$c $(DESTDIR)$(PANEL); \
 	done;
+
 	if [ -e $(DESTDIR)$(PANEL)/user ] ; then rm -rf $(DESTDIR)$(PANEL)/user; fi
 	ln -s . $(DESTDIR)$(PANEL)/user
+
 	cp -a po/mo/*        $(DESTDIR)$(PREFIX)/share/locale
 	cp -a data/*.conf    $(DESTDIR)$(SYSCONFDIR)
 	cp -a data/*.desktop $(DESTDIR)$(PREFIX)/share/applications
 	cp -a data/icons     $(DESTDIR)$(PREFIX)/share
 	touch $(DESTDIR)/var/log/tazpanel.log
 
-	@# Clean comments in production release
-	sed -i '/^\t*\/\//d' $(DESTDIR)$(PANEL)/lib/tazpanel.js
-
 	@# Remove this when TazWeb will support OpenType ligatures for web-fonts (maybe, after Webkit upgrade?)
 	mkdir -p $(DESTDIR)/usr/share/fonts/TTF
 	ln -fs $(PANEL)/styles/default/tazpanel.ttf $(DESTDIR)/usr/share/fonts/TTF/tazpanel.ttf
@@ -73,15 +85,16 @@
 		$(DESTDIR)$(PANEL)/menu.d/hardware \
 		$(DESTDIR)/usr/bin
 	@for c in $(EXTRACGI); do \
-		cp -a $$c $(DESTDIR)$(PANEL); \
+		cp -a build/$$c $(DESTDIR)$(PANEL); \
 	done;
-	cp -a bootloader $(DESTDIR)/usr/bin
+	cp -a build/bootloader $(DESTDIR)/usr/bin
 	ln -s ../../floppy.cgi $(DESTDIR)$(PANEL)/menu.d/boot/floppy
 	ln -s ../../powersaving.cgi $(DESTDIR)$(PANEL)/menu.d/hardware/powersaving
 
 # Clean source
 
 clean:
+	rm -rf build
 	rm -rf po/mo
 	rm -f po/*.mo
 	rm -f po/*.*~
diff -r f8e0ae0ac1d9 -r 5323427d34b9 lib/libtazpanel
--- a/lib/libtazpanel	Tue Aug 18 19:09:02 2015 +0300
+++ b/lib/libtazpanel	Thu Aug 20 17:00:19 2015 +0300
@@ -12,18 +12,15 @@
 
 _()  { local T="$1"; shift; printf "$(gettext "$T")" "$@"; echo; }
 _n() { local T="$1"; shift; printf "$(gettext "$T")" "$@"; }
-_p() {
-	local S="$1" P="$2" N="$3"; shift 3;
-	printf "$(ngettext "$S" "$P" "$N")" "$@"; }
 
 
 GUI_USER=nobody
 [ "$HTTP_HOST" == "127.0.0.1:82" ] &&
 for i in "$HTTP_COOKIE" "$QUERY_STRING" ; do
-    v="$(echo "$i" | sed '/guiuser=/!d;s/.*guiuser=\([A-Za-z0-9_]*\).*/\1/')"
-    [ "$v" ] || continue
-    busybox ps | sed '/d;/d;/127\.0\.0\.1:82/!d' | grep -q " $v " || continue
-    GUI_USER="$v"
+	v="$(echo "$i" | sed '/guiuser=/!d;s/.*guiuser=\([A-Za-z0-9_]*\).*/\1/')"
+	[ "$v" ] || continue
+	busybox ps | sed '/d;/d;/127\.0\.0\.1:82/!d' | grep -q " $v " || continue
+	GUI_USER="$v"
 done
 [ "$(id -un)" == "${REMOTE_USER:=$GUI_USER}" ] || exec su -s /bin/sh -c "$(realpath $0) $@" $REMOTE_USER
 
@@ -36,9 +33,7 @@
 # I18n
 
 . /etc/locale.conf
-. /usr/bin/gettext.sh
-TEXTDOMAIN='tazpanel'
-export TEXTDOMAIN LANG LC_ALL
+export TEXTDOMAIN='tazpanel' LANG LC_ALL
 
 
 # We need a config file first
@@ -155,7 +150,7 @@
 	if ifconfig | grep -A1 $1 | grep -q inet; then
 		ip=$(ifconfig | grep -A1 $1 | grep inet | awk '{ print $2 }' | cut -d: -f2)
 		[ "$(cat /sys/class/net/$1/carrier)" == "1" ] &&
-		scan="<a data-icon=\"scan\" href='network.cgi?scan=$ip&amp;back=network.cgi'>$(_ 'Scan')</a>"
+		scan='<a data-icon="scan" href="network.cgi?scan='$ip'&amp;back=network.cgi">'$(_ 'Scan')'</a>'
 	fi
 	[ "$(cat /sys/class/net/$1/carrier)" == "1" ] &&
 	status="$(_ 'connected')" &&
@@ -184,20 +179,20 @@
 	for i in $(ls /sys/class/net); do
 		case $i in
 			eth*)
-				echo "		<tr><td><a data-icon='eth' href='network.cgi?eth'>$i</a></td>
-					<td>Ethernet</td> $(interface_status $i)</tr>" ;;
+				echo '<tr><td><a data-icon="eth" href="network.cgi?eth">'$i'</a></td>
+					<td>Ethernet</td> '$(interface_status $i)'</tr>';;
 			wlan*|ath*|ra*)
-				echo "		<tr><td><a data-icon='wifi' href='network.cgi?wifi'>$i</a></td>
-					<td>Wireless</td> $(interface_status $i)</tr>" ;;
+				echo '<tr><td><a data-icon="wifi" href="network.cgi?wifi">'$i'</a></td>
+					<td>Wireless</td> '$(interface_status $i)'</tr>';;
 			ppp*)
-				echo "		<tr><td><a data-icon='removable' href='ppp.cgi'>$i</a></td>
-					<td>Point to point</td> $(interface_status $i)</tr>" ;;
+				echo '<tr><td><a data-icon="removable" href="ppp.cgi">'$i'</a></td>
+					<td>Point to point</td> '$(interface_status $i)'</tr>';;
 			tap[0-9]*|tun[0-9]*)
-				echo "		<tr><td><span data-icon='removable'>$i</span></td>
-					<td>User space</td> $(interface_status $i)</tr>" ;;
+				echo '<tr><td><span data-icon="removable">'$i'</span></td>
+					<td>User space</td> '$(interface_status $i)'</tr>';;
 			lo)
-				echo "		<tr><td><span data-icon='loopback'>$i</span></td>
-					<td>Loopback</td> $(interface_status $i)</tr>" ;;
+				echo '<tr><td><span data-icon="loopback">'$i'</span></td>
+					<td>Loopback</td> '$(interface_status $i)'</tr>';;
 			*)
 				continue ;;
 		esac
@@ -224,7 +219,7 @@
 list_locales() {
 	for locale in $(find /usr/share/i18n/locales -type f -name "[a-z][a-z]_[A-Z][A-Z]")
 	do
-		echo "<option value='$locale'>$locale</option>"
+		echo "<option value=\"$locale\">$locale</option>"
 	done
 }
 
@@ -232,10 +227,12 @@
 # Get the list of console keymaps
 
 list_keymaps() {
-	if [ -d /usr/share/kbd ]; then			# kbd-base
+	if [ -d /usr/share/kbd ]; then
+		# kbd-base
 		find /usr/share/kbd/keymaps/i386 -type f -name '*.map*' ! -path '*include*' | \
 		awk -F/ '{gsub(/.map.gz/, ""); printf "<option value=\"%s\">%s (%s)\n", $8, $8, $7}' 
-	else						# kbd-busybox
+	else
+		# kbd-busybox
 		ls /usr/share/kmap/*.kmap | \
 		sed 's|.*kmap/\(.*\).kmap|<option value="\1">\1|'
 	fi | sort
@@ -247,6 +244,7 @@
 #
 
 loading_msg() {
+	[ -n "$(GET noheader)" ] && return
 	local MSG=${1:-$LOADING_MSG}
 	[ -z "$MSG" ] && MSG="$(_ 'Please wait')"
 	cat <<EOT
@@ -256,6 +254,7 @@
 
 
 xhtml_header() {
+	[ -n "$(GET noheader)" ] && return
 	SUBTITLE="$1"
 	. ${PANEL}$HEADER
 	cat <<EOT
@@ -293,6 +292,7 @@
 
 
 xhtml_footer() {
+	[ -n "$(GET noheader)" ] && return
 	export TEXTDOMAIN='tazpkg'
 	. ${PANEL}$FOOTER
 }
@@ -323,15 +323,13 @@
 msg() {
 	msgtype="$1"; shift
 	case "$msgtype" in
-		tip)			MSG_ICON='msgtip';;
-		warn|warning)	MSG_ICON='msgwarn';;
-		err|error)		MSG_ICON='msgerr';;
-		up)				MSG_ICON='msgup';;
-		*)				MSG_ICON='msg';;
+		tip)			I='data-icon="msgtip"';;
+		warn|warning)	I='data-icon="msgwarn"';;
+		err|error)		I='data-icon="msgerr"';;
+		up)				I='data-icon="msgup"';;
+		*)				I='data-icon="msg"';;
 	esac
-	cat <<EOT
-	<section class="box"><span data-icon="$MSG_ICON"></span>$@</section>
-EOT
+	echo "<section class=\"box\"><span $I></span>$@</section>"
 }
 
 
@@ -361,6 +359,7 @@
 
 back_button() {
 	local URL="$1" default_caption="$(_ 'Back')"
+	#FIXME: can't encode data-icon
 	local caption="${2:-$default_caption}" icon="${3:-back}"
 
 	if [ -n "$1" ]; then
diff -r f8e0ae0ac1d9 -r 5323427d34b9 lib/qr.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/qr.js	Thu Aug 20 17:00:19 2015 +0300
@@ -0,0 +1,4 @@
+/*! qr-js v1.1.3 | (c) 2014 Alasdair Mercer | GPL v3 License
+jsqrencode | (c) 2010 tz@execpc.com | GPL v3 License
+*/
+!function(a){"use strict";function b(){return T?new r:a.document.createElement("canvas")}function c(){return T?new x:a.document.createElement("img")}function d(b,c,d){var e=c.mime||B;a.location.href=b.toDataURL(e).replace(e,C),"function"==typeof d&&d()}function e(a){return"string"==typeof a&&(a={value:a}),a||{}}function f(a){function b(b){a[b]=function(){throw new Error(b+" requires HTML5 canvas element support")}}var c,d=["canvas","image","save","saveSync","toDataURL"];for(c=0;c<d.length;c++)b(d[c])}function g(a,b,c){function d(){w.write(e,f,0,f.length,0,function(a){w.close(e),c(a)})}if("string"!=typeof b.path)return c(new TypeError("Invalid path type: "+typeof b.path));var e,f;a.toBuffer(function(a,b){return a?c(a):(f=b,void(e&&d()))}),w.open(b.path,"w",N,function(a,b){return a?c(a):(e=b,void(f&&d()))})}function h(a,b){if("string"!=typeof b.path)throw new TypeError("Invalid path type: "+typeof b.path);var c=a.toBuffer(),d=w.openSync(b.path,"w",N);try{w.writeSync(d,c,0,c.length,0)}finally{w.closeSync(d)}}function i(a,b){var c;a>b&&(c=a,a=b,b=c),c=b,c*=b,c+=b,c>>=1,c+=a,S[c]=1}function j(a,b){var c;for(R[a+z*b]=1,c=-2;2>c;c++)R[a+c+z*(b-2)]=1,R[a-2+z*(b+c+1)]=1,R[a+2+z*(b+c)]=1,R[a+c+1+z*(b+2)]=1;for(c=0;2>c;c++)i(a-1,b+c),i(a+1,b-c),i(a-c,b-1),i(a+c,b+1)}function k(a){for(;a>=255;)a-=255,a=(a>>8)+(255&a);return a}function l(a,b,c,d){var e,f,g;for(f=0;d>f;f++)W[c+f]=0;for(f=0;b>f;f++){if(e=H[W[a+f]^W[c]],255!==e)for(g=1;d>g;g++)W[c+g-1]=W[c+g]^G[k(e+U[d-g])];else for(g=c;c+d>g;g++)W[g]=W[g+1];W[c+d-1]=255===e?0:G[k(e+U[0])]}}function m(a,b){var c;return a>b&&(c=a,a=b,b=c),c=b,c+=b*b,c>>=1,c+=a,1===S[c]}function n(a){var b,c,d,e;switch(a){case 0:for(c=0;z>c;c++)for(b=0;z>b;b++)b+c&1||m(b,c)||(R[b+c*z]^=1);break;case 1:for(c=0;z>c;c++)for(b=0;z>b;b++)1&c||m(b,c)||(R[b+c*z]^=1);break;case 2:for(c=0;z>c;c++)for(d=0,b=0;z>b;b++,d++)3===d&&(d=0),d||m(b,c)||(R[b+c*z]^=1);break;case 3:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=e,b=0;z>b;b++,d++)3===d&&(d=0),d||m(b,c)||(R[b+c*z]^=1);break;case 4:for(c=0;z>c;c++)for(d=0,e=c>>1&1,b=0;z>b;b++,d++)3===d&&(d=0,e=!e),e||m(b,c)||(R[b+c*z]^=1);break;case 5:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=0,b=0;z>b;b++,d++)3===d&&(d=0),(b&c&1)+!(!d|!e)||m(b,c)||(R[b+c*z]^=1);break;case 6:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=0,b=0;z>b;b++,d++)3===d&&(d=0),(b&c&1)+(d&&d===e)&1||m(b,c)||(R[b+c*z]^=1);break;case 7:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=0,b=0;z>b;b++,d++)3===d&&(d=0),(d&&d===e)+(b+c&1)&1||m(b,c)||(R[b+c*z]^=1)}}function o(a){var b,c=0;for(b=0;a>=b;b++)O[b]>=5&&(c+=I+O[b]-5);for(b=3;a-1>b;b+=2)O[b-2]===O[b+2]&&O[b+2]===O[b-1]&&O[b-1]===O[b+1]&&3*O[b-1]===O[b]&&(0===O[b-3]||b+3>a||3*O[b-3]>=4*O[b]||3*O[b+3]>=4*O[b])&&(c+=K);return c}function p(){var a,b,c,d,e,f,g,h,i;for(c=e=f=0,i=0;z-1>i;i++)for(h=0;z-1>h;h++)(R[h+z*i]&&R[h+1+z*i]&&R[h+z*(i+1)]&&R[h+1+z*(i+1)]||!(R[h+z*i]||R[h+1+z*i]||R[h+z*(i+1)]||R[h+1+z*(i+1)]))&&(c+=J);for(i=0;z>i;i++){for(O[0]=0,g=a=h=0;z>h;h++)(b=R[h+z*i])===a?O[g]++:O[++g]=1,a=b,e+=a?1:-1;c+=o(g)}for(0>e&&(e=-e),d=e,d+=d<<2,d<<=1;d>z*z;)d-=z*z,f++;for(c+=f*L,h=0;z>h;h++){for(O[0]=0,g=a=i=0;z>i;i++)(b=R[h+z*i])===a?O[g]++:O[++g]=1,a=b;c+=o(g)}return c}function q(a){var b,c,d,e,f,g,h,o;f=a.length,y=0;do if(y++,d=4*(Q-1)+16*(y-1),u=D[d++],v=D[d++],s=D[d++],t=D[d],d=s*(u+v)+v-3+(9>=y),d>=f)break;while(40>y);for(z=17+4*y,g=s+(s+t)*(u+v)+v,f=0;g>f;f++)P[f]=0;for(W=a.slice(0),f=0;z*z>f;f++)R[f]=0;for(f=0;(z*(z+1)+1)/2>f;f++)S[f]=0;for(f=0;3>f;f++){for(d=o=0,1===f&&(d=z-7),2===f&&(o=z-7),R[o+3+z*(d+3)]=1,h=0;6>h;h++)R[o+h+z*d]=1,R[o+z*(d+h+1)]=1,R[o+6+z*(d+h)]=1,R[o+h+1+z*(d+6)]=1;for(h=1;5>h;h++)i(o+h,d+1),i(o+1,d+h+1),i(o+5,d+h),i(o+h+1,d+5);for(h=2;4>h;h++)R[o+h+z*(d+2)]=1,R[o+2+z*(d+h+1)]=1,R[o+4+z*(d+h)]=1,R[o+h+1+z*(d+4)]=1}if(y>1)for(f=A[y],o=z-7;;){for(h=z-7;h>f-3&&(j(h,o),!(f>h));)h-=f;if(f+9>=o)break;o-=f,j(6,o),j(o,6)}for(R[8+z*(z-8)]=1,o=0;7>o;o++)i(7,o),i(z-8,o),i(7,o+z-7);for(h=0;8>h;h++)i(h,7),i(h+z-8,7),i(h,z-8);for(h=0;9>h;h++)i(h,8);for(h=0;8>h;h++)i(h+z-8,8),i(8,h);for(o=0;7>o;o++)i(8,o+z-7);for(h=0;z-14>h;h++)1&h?(i(8+h,6),i(6,8+h)):(R[8+h+6*z]=1,R[6+z*(8+h)]=1);if(y>6)for(f=M[y-7],d=17,h=0;6>h;h++)for(o=0;3>o;o++,d--)1&(d>11?y>>d-12:f>>d)?(R[5-h+z*(2-o+z-11)]=1,R[2-o+z-11+z*(5-h)]=1):(i(5-h,2-o+z-11),i(2-o+z-11,5-h));for(o=0;z>o;o++)for(h=0;o>=h;h++)R[h+z*o]&&i(h,o);for(g=W.length,b=0;g>b;b++)P[b]=W.charCodeAt(b);if(W=P.slice(0),h=s*(u+v)+v,g>=h-2&&(g=h-2,y>9&&g--),b=g,y>9){for(W[b+2]=0,W[b+3]=0;b--;)f=W[b],W[b+3]|=255&f<<4,W[b+2]=f>>4;W[2]|=255&g<<4,W[1]=g>>4,W[0]=64|g>>12}else{for(W[b+1]=0,W[b+2]=0;b--;)f=W[b],W[b+2]|=255&f<<4,W[b+1]=f>>4;W[1]|=255&g<<4,W[0]=64|g>>4}for(b=g+3-(10>y);h>b;)W[b++]=236,W[b++]=17;for(U[0]=1,b=0;t>b;b++){for(U[b+1]=1,c=b;c>0;c--)U[c]=U[c]?U[c-1]^G[k(H[U[c]]+b)]:U[c-1];U[0]=G[k(H[U[0]]+b)]}for(b=0;t>=b;b++)U[b]=H[U[b]];for(d=h,o=0,b=0;u>b;b++)l(o,s,d,t),o+=s,d+=t;for(b=0;v>b;b++)l(o,s+1,d,t),o+=s+1,d+=t;for(o=0,b=0;s>b;b++){for(c=0;u>c;c++)P[o++]=W[b+c*s];for(c=0;v>c;c++)P[o++]=W[u*s+b+c*(s+1)]}for(c=0;v>c;c++)P[o++]=W[u*s+b+c*(s+1)];for(b=0;t>b;b++)for(c=0;u+v>c;c++)P[o++]=W[h+b+c*t];for(W=P,h=o=z-1,d=g=1,e=(s+t)*(u+v)+v,b=0;e>b;b++)for(f=W[b],c=0;8>c;c++,f<<=1){128&f&&(R[h+z*o]=1);do g?h--:(h++,d?0!==o?o--:(h-=2,d=!d,6===h&&(h--,o=9)):o!==z-1?o++:(h-=2,d=!d,6===h&&(h--,o-=8))),g=!g;while(m(h,o))}for(W=R.slice(0),f=0,o=3e4,d=0;8>d&&(n(d),h=p(),o>h&&(o=h,f=d),7!==f);d++)R=W.slice(0);for(f!==d&&n(f),o=F[f+(Q-1<<3)],d=0;8>d;d++,o>>=1)1&o&&(R[z-1-d+8*z]=1,6>d?R[8+z*d]=1:R[8+z*(d+1)]=1);for(d=0;7>d;d++,o>>=1)1&o&&(R[8+z*(z-7+d)]=1,d?R[6-d+8*z]=1:R[7+8*z]=1);return R}var r,s,t,u,v,w,x,y,z,A=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],B="image/png",C="image/octet-stream",D=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],E={L:1,M:2,Q:3,H:4},F=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],G=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],H=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],I=3,J=3,K=40,L=10,M=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],N=parseInt("0666",8),O=[],P=[],Q=1,R=[],S=[],T=!1,U=[],V=a.qr,W=[],X={VERSION:"1.1.3",canvas:function(a){a=e(a);var c=a.size>=1&&a.size<=10?a.size:4;c*=25;var d=a.canvas||b(),f=d.getContext("2d");f.canvas.width=c,f.canvas.height=c,f.fillStyle=a.background||"#fff",f.fillRect(0,0,c,c),Q=E[a.level&&a.level.toUpperCase()||"L"];var g=q(a.value||"");f.lineWidth=1;var h=c;h/=z,h=Math.floor(h),f.clearRect(0,0,c,c),f.fillStyle=a.background||"#fff",f.fillRect(0,0,h*(z+8),h*(z+8)),f.fillStyle=a.foreground||"#000";var i,j;for(i=0;z>i;i++)for(j=0;z>j;j++)g[j*z+i]&&f.fillRect(h*i,h*j,h,h);return d},image:function(a){a=e(a);var b=this.canvas(a),d=a.image||c();return d.src=b.toDataURL(a.mime||B),d.height=b.height,d.width=b.width,d},save:function(a,b,c){function f(a){h||(h=!0,c(a))}switch(a=e(a),typeof b){case"function":c=b,b=null;break;case"string":a.path=b}if("function"!=typeof c)throw new TypeError("Invalid callback type: "+typeof c);var h=!1,i=this.canvas(a);T?g(i,a,f):d(i,a,f)},saveSync:function(a,b){a=e(a),"string"==typeof b&&(a.path=b);var c=this.canvas(a);T?h(c,a):d(c,a)},toDataURL:function(a){return a=e(a),this.canvas(a).toDataURL(a.mime||B)},noConflict:function(){return a.qr=V,this}};"undefined"!=typeof exports?(T=!0,"undefined"!=typeof module&&module.exports&&(exports=module.exports=X),exports.qr=X,r=require("canvas"),x=r.Image,w=require("fs")):"function"==typeof define&&define.amd?define(function(){return X}):(a.HTMLCanvasElement||f(X),a.qr=X)}(this);
diff -r f8e0ae0ac1d9 -r 5323427d34b9 lib/qr.js.include
--- a/lib/qr.js.include	Tue Aug 18 19:09:02 2015 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-/*! qr-js v1.1.3 | (c) 2014 Alasdair Mercer | GPL v3 License
-jsqrencode | (c) 2010 tz@execpc.com | GPL v3 License
-*/
-!function(a){"use strict";function b(){return T?new r:a.document.createElement("canvas")}function c(){return T?new x:a.document.createElement("img")}function d(b,c,d){var e=c.mime||B;a.location.href=b.toDataURL(e).replace(e,C),"function"==typeof d&&d()}function e(a){return"string"==typeof a&&(a={value:a}),a||{}}function f(a){function b(b){a[b]=function(){throw new Error(b+" requires HTML5 canvas element support")}}var c,d=["canvas","image","save","saveSync","toDataURL"];for(c=0;c<d.length;c++)b(d[c])}function g(a,b,c){function d(){w.write(e,f,0,f.length,0,function(a){w.close(e),c(a)})}if("string"!=typeof b.path)return c(new TypeError("Invalid path type: "+typeof b.path));var e,f;a.toBuffer(function(a,b){return a?c(a):(f=b,void(e&&d()))}),w.open(b.path,"w",N,function(a,b){return a?c(a):(e=b,void(f&&d()))})}function h(a,b){if("string"!=typeof b.path)throw new TypeError("Invalid path type: "+typeof b.path);var c=a.toBuffer(),d=w.openSync(b.path,"w",N);try{w.writeSync(d,c,0,c.length,0)}finally{w.closeSync(d)}}function i(a,b){var c;a>b&&(c=a,a=b,b=c),c=b,c*=b,c+=b,c>>=1,c+=a,S[c]=1}function j(a,b){var c;for(R[a+z*b]=1,c=-2;2>c;c++)R[a+c+z*(b-2)]=1,R[a-2+z*(b+c+1)]=1,R[a+2+z*(b+c)]=1,R[a+c+1+z*(b+2)]=1;for(c=0;2>c;c++)i(a-1,b+c),i(a+1,b-c),i(a-c,b-1),i(a+c,b+1)}function k(a){for(;a>=255;)a-=255,a=(a>>8)+(255&a);return a}function l(a,b,c,d){var e,f,g;for(f=0;d>f;f++)W[c+f]=0;for(f=0;b>f;f++){if(e=H[W[a+f]^W[c]],255!==e)for(g=1;d>g;g++)W[c+g-1]=W[c+g]^G[k(e+U[d-g])];else for(g=c;c+d>g;g++)W[g]=W[g+1];W[c+d-1]=255===e?0:G[k(e+U[0])]}}function m(a,b){var c;return a>b&&(c=a,a=b,b=c),c=b,c+=b*b,c>>=1,c+=a,1===S[c]}function n(a){var b,c,d,e;switch(a){case 0:for(c=0;z>c;c++)for(b=0;z>b;b++)b+c&1||m(b,c)||(R[b+c*z]^=1);break;case 1:for(c=0;z>c;c++)for(b=0;z>b;b++)1&c||m(b,c)||(R[b+c*z]^=1);break;case 2:for(c=0;z>c;c++)for(d=0,b=0;z>b;b++,d++)3===d&&(d=0),d||m(b,c)||(R[b+c*z]^=1);break;case 3:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=e,b=0;z>b;b++,d++)3===d&&(d=0),d||m(b,c)||(R[b+c*z]^=1);break;case 4:for(c=0;z>c;c++)for(d=0,e=c>>1&1,b=0;z>b;b++,d++)3===d&&(d=0,e=!e),e||m(b,c)||(R[b+c*z]^=1);break;case 5:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=0,b=0;z>b;b++,d++)3===d&&(d=0),(b&c&1)+!(!d|!e)||m(b,c)||(R[b+c*z]^=1);break;case 6:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=0,b=0;z>b;b++,d++)3===d&&(d=0),(b&c&1)+(d&&d===e)&1||m(b,c)||(R[b+c*z]^=1);break;case 7:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=0,b=0;z>b;b++,d++)3===d&&(d=0),(d&&d===e)+(b+c&1)&1||m(b,c)||(R[b+c*z]^=1)}}function o(a){var b,c=0;for(b=0;a>=b;b++)O[b]>=5&&(c+=I+O[b]-5);for(b=3;a-1>b;b+=2)O[b-2]===O[b+2]&&O[b+2]===O[b-1]&&O[b-1]===O[b+1]&&3*O[b-1]===O[b]&&(0===O[b-3]||b+3>a||3*O[b-3]>=4*O[b]||3*O[b+3]>=4*O[b])&&(c+=K);return c}function p(){var a,b,c,d,e,f,g,h,i;for(c=e=f=0,i=0;z-1>i;i++)for(h=0;z-1>h;h++)(R[h+z*i]&&R[h+1+z*i]&&R[h+z*(i+1)]&&R[h+1+z*(i+1)]||!(R[h+z*i]||R[h+1+z*i]||R[h+z*(i+1)]||R[h+1+z*(i+1)]))&&(c+=J);for(i=0;z>i;i++){for(O[0]=0,g=a=h=0;z>h;h++)(b=R[h+z*i])===a?O[g]++:O[++g]=1,a=b,e+=a?1:-1;c+=o(g)}for(0>e&&(e=-e),d=e,d+=d<<2,d<<=1;d>z*z;)d-=z*z,f++;for(c+=f*L,h=0;z>h;h++){for(O[0]=0,g=a=i=0;z>i;i++)(b=R[h+z*i])===a?O[g]++:O[++g]=1,a=b;c+=o(g)}return c}function q(a){var b,c,d,e,f,g,h,o;f=a.length,y=0;do if(y++,d=4*(Q-1)+16*(y-1),u=D[d++],v=D[d++],s=D[d++],t=D[d],d=s*(u+v)+v-3+(9>=y),d>=f)break;while(40>y);for(z=17+4*y,g=s+(s+t)*(u+v)+v,f=0;g>f;f++)P[f]=0;for(W=a.slice(0),f=0;z*z>f;f++)R[f]=0;for(f=0;(z*(z+1)+1)/2>f;f++)S[f]=0;for(f=0;3>f;f++){for(d=o=0,1===f&&(d=z-7),2===f&&(o=z-7),R[o+3+z*(d+3)]=1,h=0;6>h;h++)R[o+h+z*d]=1,R[o+z*(d+h+1)]=1,R[o+6+z*(d+h)]=1,R[o+h+1+z*(d+6)]=1;for(h=1;5>h;h++)i(o+h,d+1),i(o+1,d+h+1),i(o+5,d+h),i(o+h+1,d+5);for(h=2;4>h;h++)R[o+h+z*(d+2)]=1,R[o+2+z*(d+h+1)]=1,R[o+4+z*(d+h)]=1,R[o+h+1+z*(d+4)]=1}if(y>1)for(f=A[y],o=z-7;;){for(h=z-7;h>f-3&&(j(h,o),!(f>h));)h-=f;if(f+9>=o)break;o-=f,j(6,o),j(o,6)}for(R[8+z*(z-8)]=1,o=0;7>o;o++)i(7,o),i(z-8,o),i(7,o+z-7);for(h=0;8>h;h++)i(h,7),i(h+z-8,7),i(h,z-8);for(h=0;9>h;h++)i(h,8);for(h=0;8>h;h++)i(h+z-8,8),i(8,h);for(o=0;7>o;o++)i(8,o+z-7);for(h=0;z-14>h;h++)1&h?(i(8+h,6),i(6,8+h)):(R[8+h+6*z]=1,R[6+z*(8+h)]=1);if(y>6)for(f=M[y-7],d=17,h=0;6>h;h++)for(o=0;3>o;o++,d--)1&(d>11?y>>d-12:f>>d)?(R[5-h+z*(2-o+z-11)]=1,R[2-o+z-11+z*(5-h)]=1):(i(5-h,2-o+z-11),i(2-o+z-11,5-h));for(o=0;z>o;o++)for(h=0;o>=h;h++)R[h+z*o]&&i(h,o);for(g=W.length,b=0;g>b;b++)P[b]=W.charCodeAt(b);if(W=P.slice(0),h=s*(u+v)+v,g>=h-2&&(g=h-2,y>9&&g--),b=g,y>9){for(W[b+2]=0,W[b+3]=0;b--;)f=W[b],W[b+3]|=255&f<<4,W[b+2]=f>>4;W[2]|=255&g<<4,W[1]=g>>4,W[0]=64|g>>12}else{for(W[b+1]=0,W[b+2]=0;b--;)f=W[b],W[b+2]|=255&f<<4,W[b+1]=f>>4;W[1]|=255&g<<4,W[0]=64|g>>4}for(b=g+3-(10>y);h>b;)W[b++]=236,W[b++]=17;for(U[0]=1,b=0;t>b;b++){for(U[b+1]=1,c=b;c>0;c--)U[c]=U[c]?U[c-1]^G[k(H[U[c]]+b)]:U[c-1];U[0]=G[k(H[U[0]]+b)]}for(b=0;t>=b;b++)U[b]=H[U[b]];for(d=h,o=0,b=0;u>b;b++)l(o,s,d,t),o+=s,d+=t;for(b=0;v>b;b++)l(o,s+1,d,t),o+=s+1,d+=t;for(o=0,b=0;s>b;b++){for(c=0;u>c;c++)P[o++]=W[b+c*s];for(c=0;v>c;c++)P[o++]=W[u*s+b+c*(s+1)]}for(c=0;v>c;c++)P[o++]=W[u*s+b+c*(s+1)];for(b=0;t>b;b++)for(c=0;u+v>c;c++)P[o++]=W[h+b+c*t];for(W=P,h=o=z-1,d=g=1,e=(s+t)*(u+v)+v,b=0;e>b;b++)for(f=W[b],c=0;8>c;c++,f<<=1){128&f&&(R[h+z*o]=1);do g?h--:(h++,d?0!==o?o--:(h-=2,d=!d,6===h&&(h--,o=9)):o!==z-1?o++:(h-=2,d=!d,6===h&&(h--,o-=8))),g=!g;while(m(h,o))}for(W=R.slice(0),f=0,o=3e4,d=0;8>d&&(n(d),h=p(),o>h&&(o=h,f=d),7!==f);d++)R=W.slice(0);for(f!==d&&n(f),o=F[f+(Q-1<<3)],d=0;8>d;d++,o>>=1)1&o&&(R[z-1-d+8*z]=1,6>d?R[8+z*d]=1:R[8+z*(d+1)]=1);for(d=0;7>d;d++,o>>=1)1&o&&(R[8+z*(z-7+d)]=1,d?R[6-d+8*z]=1:R[7+8*z]=1);return R}var r,s,t,u,v,w,x,y,z,A=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],B="image/png",C="image/octet-stream",D=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],E={L:1,M:2,Q:3,H:4},F=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],G=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],H=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],I=3,J=3,K=40,L=10,M=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],N=parseInt("0666",8),O=[],P=[],Q=1,R=[],S=[],T=!1,U=[],V=a.qr,W=[],X={VERSION:"1.1.3",canvas:function(a){a=e(a);var c=a.size>=1&&a.size<=10?a.size:4;c*=25;var d=a.canvas||b(),f=d.getContext("2d");f.canvas.width=c,f.canvas.height=c,f.fillStyle=a.background||"#fff",f.fillRect(0,0,c,c),Q=E[a.level&&a.level.toUpperCase()||"L"];var g=q(a.value||"");f.lineWidth=1;var h=c;h/=z,h=Math.floor(h),f.clearRect(0,0,c,c),f.fillStyle=a.background||"#fff",f.fillRect(0,0,h*(z+8),h*(z+8)),f.fillStyle=a.foreground||"#000";var i,j;for(i=0;z>i;i++)for(j=0;z>j;j++)g[j*z+i]&&f.fillRect(h*i,h*j,h,h);return d},image:function(a){a=e(a);var b=this.canvas(a),d=a.image||c();return d.src=b.toDataURL(a.mime||B),d.height=b.height,d.width=b.width,d},save:function(a,b,c){function f(a){h||(h=!0,c(a))}switch(a=e(a),typeof b){case"function":c=b,b=null;break;case"string":a.path=b}if("function"!=typeof c)throw new TypeError("Invalid callback type: "+typeof c);var h=!1,i=this.canvas(a);T?g(i,a,f):d(i,a,f)},saveSync:function(a,b){a=e(a),"string"==typeof b&&(a.path=b);var c=this.canvas(a);T?h(c,a):d(c,a)},toDataURL:function(a){return a=e(a),this.canvas(a).toDataURL(a.mime||B)},noConflict:function(){return a.qr=V,this}};"undefined"!=typeof exports?(T=!0,"undefined"!=typeof module&&module.exports&&(exports=module.exports=X),exports.qr=X,r=require("canvas"),x=r.Image,w=require("fs")):"function"==typeof define&&define.amd?define(function(){return X}):(a.HTMLCanvasElement||f(X),a.qr=X)}(this);
diff -r f8e0ae0ac1d9 -r 5323427d34b9 lib/tazpanel.js
--- a/lib/tazpanel.js	Tue Aug 18 19:09:02 2015 +0300
+++ b/lib/tazpanel.js	Thu Aug 20 17:00:19 2015 +0300
@@ -122,10 +122,10 @@
 
 //
 function dupTableHead() {
-	if (! document.getElementById('head2')) return
+	if (! document.getElementById('head2')) return;
 	var tableHead = document.createElement("TABLE");
 	with (tableHead) {
-		innerHTML = '<thead>' + document.getElementById('head2').innerHTML + '</thead>'
+		innerHTML = '<thead>' + document.getElementById('head2').innerHTML + '</thead>';
 		setAttribute("id", "head1h");
 		setAttribute("class", "zebra pkglist");
 	}
@@ -280,7 +280,7 @@
 	if (thisMenu.className == 'opened') {
 		thisMenu.className = 'closed';
 		el.blur();
-		itemOpened = ''
+		itemOpened = '';
 		//console.log('Closed %s', el.tabIndex);
 	}
 }
@@ -326,7 +326,8 @@
 	}
 }
 function menuItemBlur(el) {
-	elem = el; //.parentElement;
+	elem = el;
+	//.parentElement;
 	//console.log('Blurred %s', elem.tabIndex);
 	//closeItem(elem);
 	//menuIsClosed = true;
@@ -346,7 +347,7 @@
 
 function ajax(cgiUrl, command, ajaxOut) {
 	// (0) show AJAX loader
-	ajaxLoader++
+	ajaxLoader++;
 
 	// (1) create object for server request
 	var req = new XMLHttpRequest();
@@ -359,19 +360,20 @@
 
 		if (req.readyState == XMLHttpRequest.DONE) {
 			// if request done
-			ajaxLoader--
+			ajaxLoader--;
 			if (ajaxLoader == 0) {
 
-				statusbar('')
+				statusbar('');
 
 				if (req.statusText == 'OK') {
-					statusElem.innerHTML = '<span data-img="ok"></span>'
+					statusElem.innerHTML = '<span data-img="ok"></span>';
 				} else {
+					// show status (Not Found, ...)
 					statusElem.innerHTML = '<span data-img="delete">' +
-						req.statusText + '</span>' // show status (Not Found, ...)
+						req.statusText + '</span>';
 				}
 			} else {
-				statusElem.innerHTML = '<span data-img="clock"></span>'
+				statusElem.innerHTML = '<span data-img="clock"></span>';
 			}
 
 			// if status 200 (ОК) - show answer to user
@@ -385,10 +387,11 @@
 	req.open('POST', cgiUrl, true);
 
 	// (4) request object is ready
-	req.send(command); // send request
+	// send request
+	req.send(command);
 
 	// (5)
-	statusElem.innerHTML = '<span data-img="clock"></span>'
+	statusElem.innerHTML = '<span data-img="clock"></span>';
 }
 
 
@@ -573,9 +576,9 @@
 
 
 
-/**
- * Class manipulation from http://www.openjs.com/scripts/dom/class_manipulation.php
- */
+//
+// Class manipulation from http://www.openjs.com/scripts/dom/class_manipulation.php
+//
 
 function hasClass(ele,cls) {
 	return document.getElementById(ele).className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'));
@@ -638,9 +641,9 @@
 
 
 
-/**
- * Show/hide popups
- */
+//
+// Show/hide popups
+//
 
 function popup(name, action) {
 	if (action == 'show') {
diff -r f8e0ae0ac1d9 -r 5323427d34b9 network.cgi
--- a/network.cgi	Tue Aug 18 19:09:02 2015 +0300
+++ b/network.cgi	Thu Aug 20 17:00:19 2015 +0300
@@ -431,59 +431,6 @@
 		# Wireless connections settings
 		xhtml_header "$(_ 'Wireless connection')"
 
-		cat <<EOT
-<style type="text/css">
-#connection input[type="text"], #connection input[type="password"] { width: 14rem; }
-#connection select { width: 14.4rem; }
-
-#connection td { padding: 0; margin: 0; }
-#connection [class] div {
-	max-height: 0; overflow: hidden; padding: 0; margin: 0;
-	-webkit-transition: all 0.5s ease-in-out;
-	   -moz-transition: all 0.5s ease-in-out;
-	        transition: all 0.5s ease-in-out;
-}
-.wep .wep div, .wpa .wpa div, .eap .eap div,
-.eap.peap .eap1 div, .eap.tls .eap1 div, .eap.ttls .eap1 div {
-	max-height: 2em !important;
-}
-
-#shader {
-	z-index: 100;
-	position: fixed; top: 0; left: 0; width: 100%; height: 100%;
-	background-color: #000;
-	opacity: 0.6;
-}
-#shader.hidden {
-	display: none;
-	opacity: 0;
-}
-
-#popup_qr {
-	z-index: 101;
-	position: fixed;
-	width: 100%;
-	bottom: 2em;
-	transition: all 0.5s;
-	-webkit-transition: all 0.5s;
-	-webkit-transition-delay: 0.3s;
-}
-#popup_qr_inner {
-	display: inline-block;
-	text-align: center;
-	margin: 0.5em;
-	background: #fff; color: #222;
-	border: 0.16em solid ; border-radius: 0.5em;
-
-	padding: 0.5em;
-}
-#popup_qr.hidden {bottom: -100em; }
-
-#qrimg { margin: 3em 1.5em 2em 3em; }
-</style>
-EOT
-
-
 		. /etc/network.conf
 
 		start_disabled=''; stop_disabled=''
@@ -615,8 +562,6 @@
 
 document.getElementById('keyType').value = "$WIFI_KEY_TYPE"; wifiSettingsChange();
 
-$(cat $PANEL/lib/qr.js.include)
-
 function shareWiFi() {
 	// S=<SSID>; T={WPA|WEP|nopass}; P=<password>; H=<hidden?>
 	// Escape ":" and ";" -> "\:" and "\;"
@@ -642,7 +587,7 @@
 	<tr>
 		<td style="text-align: center;">
 			<div id="popup_qr_inner">
-				<img id="qrimg" src="#" /><br/>
+				<img id="qrimg"/><br/>
 				$(_ 'Share Wi-Fi network with your friends')
 			</div>
 		</td>
@@ -722,15 +667,8 @@
 
 
 <section>
-	<header id="hosts">
-		$(_ 'Hosts')
-EOT
-		edit_button /etc/hosts
-		cat <<EOT
-	</header>
-	<footer>
-		<pre>$(getdb hosts)</pre>
-	</footer>
+	<header id="hosts">$(_ 'Hosts'; edit_button /etc/hosts)</header>
+	<pre class="scroll">$(getdb hosts)</pre>
 </section>
 
 
@@ -756,30 +694,24 @@
 
 <section>
 	<header id="ifconfig">$(_ 'Output of ifconfig')</header>
-	<footer><pre>$(ifconfig)</pre></footer>
+	<pre>$(ifconfig)</pre>
 </section>
 
 
 <section>
 	<header id="routing">$(_ 'Routing table')</header>
-	<footer><pre>$(route -n)</pre></footer>
+	<pre>$(route -n)</pre>
 </section>
 
 
 <section>
-	<header id="dns">
-		$(_ 'Domain name resolution')
-EOT
-		edit_button /etc/resolv.conf
-		cat <<EOT
-	</header>
-	<footer><pre>$(cat /etc/resolv.conf)</pre></footer>
+	<header id="dns">$(_ 'Domain name resolution'; edit_button /etc/resolv.conf)</header>
+	<pre>$(cat /etc/resolv.conf)</pre>
 </section>
 
 
 <section>
 	<header id="arp">$(_ 'ARP table')</header>
-	<footer>
 EOT
 		if [ "$REMOTE_USER" == "root" ]; then
 			echo "<table>"
@@ -795,7 +727,8 @@
 EOT
 			done
 			cat <<EOT
-			</table>
+	</table>
+	<footer>
 		<form>
 			IP <input type="text" name="ip" value="10.20.30.40" size="12" /> on $(select_if)<!--
 			--><button type="submit" data-icon="upgrade" name="proxyarp">$(_ 'Proxy')</button>
@@ -813,10 +746,8 @@
 
 <section>
 	<header id="connections">$(_ 'IP Connections')</header>
-	<footer>
 	<pre>$(netstat -anp 2>/dev/null | sed -e '/UNIX domain sockets/,$d' \
 -e 's#\([0-9]*\)/#<a href="boot.cgi?daemons=pid=\1">\1</a>/#')</pre>
-	</footer>
 </section>
 
 EOT
@@ -825,9 +756,7 @@
 	<header id="iptables">$(_ 'Firewall')
 		$(edit_button /etc/knockd.conf "$(_ 'Port knocker')")
 	</header>
-	<footer>
 	<pre>$(iptables-save)</pre>
-	</footer>
 </section>
 EOT
 		
diff -r f8e0ae0ac1d9 -r 5323427d34b9 stripall.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stripall.sh	Thu Aug 20 17:00:19 2015 +0300
@@ -0,0 +1,100 @@
+#!/bin/sh
+# TazPanel - SliTaz Control Panel, hg.slitaz.org/tazpanel
+# stripall.sh - strip and compact resources in build process
+# Copyright (C) 2015 SliTaz GNU/Linux - BSD License
+
+
+substitute_icons() {
+	grep -q 'data-icon="\|data-img"' $1 || return
+
+	echo -e "\
+	add				\n	admin			\n	back			\n	battery	
+	brightness		\n	cancel			\n	cd				\n	check	
+	clock			\n	conf			\n	daemons			\n	delete	
+	detect			\n	diff			\n	download		\n	edit	
+	eth				\n	group			\n	grub			\n	hdd		
+	help			\n	history			\n	info			\n	install	
+	link			\n	list			\n	locale			\n	lock	
+	logs			\n	loopback		\n	modules			\n	ok		
+	proc			\n	refresh			\n	removable		\n	remove	
+	repack			\n	report			\n	restart			\n	run		
+	save			\n	scan			\n	settings		\n	start	
+	stop			\n	sync			\n	tag				\n	tags	
+	tazx			\n	temperature		\n	terminal		\n	text	
+	unlink			\n	unlock			\n	upgrade			\n	user	
+	view			\n	wifi			\n	man				\n	off		
+	on				\n	opt				\n	web				\n	slitaz	
+	lvl0			\n	lvl1			\n	lvl2			\n	lvl3	
+	lvl4			\n	lvl5			\n	online			\n	offline	
+	sechi			\n	secmi			\n	seclo			\n	pkg		
+	pkgi			\n	pkgib			\n	toggle			\n	chlock	
+	calendar		\n	modem			\n	cpu				\n	display	
+	msg				\n	msgerr			\n	msgwarn			\n	msgup	
+	msgtip			\n	vpn			" | \
+	while read icon symbol; do
+		echo -n "."
+		sed -i "s|data-icon=\"$icon\"|data-icon=\"$symbol\"|g" $1
+		sed -i "s|data-img=\"$icon\"|data-img=\"$symbol\"|g" $1
+	done
+}
+
+
+cd build
+
+echo -e "\nStrip shell scripts"
+for CGI in *.cgi tazpanel libtazpanel bootloader *.html; do
+	echo -en "\nProcessing $CGI"
+
+	mv $CGI $CGI.old
+	# Copy initial comment (down to empty line)
+	sed '1,/^$/!d' $CGI.old > $CGI
+	# Remove initial tabs, other comments and empty lines
+	sed 's|^[\t ]*||;/^#/d;/^$/d' $CGI.old >> $CGI
+	rm $CGI.old
+
+	substitute_icons $CGI
+
+	sed -i 's|" *>|">|g' $CGI
+	sed -i "s|' *)|')|g" $CGI
+	sed -i 's| *;;|;;|g' $CGI
+
+	chmod a+x $CGI
+
+done
+
+
+echo -e "\n\nStrip CSS stylesheets"
+for CSS in *.css; do
+	echo -en "\nProcessing $CSS"
+
+	mv $CSS $CSS.old
+	tr '\n' ' ' < $CSS.old > $CSS
+	rm $CSS.old
+
+	substitute_icons $CSS
+
+	sed -i 's|\t| |g; s|  *| |g; s|/\*|‹|g; s|\*/|›|g; s|‹[^›][^›]*›||g; s|  *| |g; s|^ ||; s| {|{|g; s|{ |{|g; s| *: *|:|g; s| *; *|;|g; s|;}|}|g; s|} |}|g; s| *> *|>|g; s| *, *|,|g; s|000000|000|g; s|CC0000|C00|g; s|00FFFF|0FF|g' $CSS
+done
+
+mkdir gz
+cat *.css > gz/tazpanel.css
+gzip -9 gz/tazpanel.css
+
+
+echo -e "\n\nStrip JS scripts"
+for JS in *.js; do
+	echo -en "\nProcessing $JS"
+
+	sed -i 's|^[\t ]*||; /^$/d; /^\/\//d; /console\./d' $JS
+
+	# Try "jsmin"
+	if [ -n "$(which jsmin)" ]; then
+		jsmin < $JS > $JS.new
+		mv -f $JS.new $JS
+	fi
+done
+
+cat *.js > gz/tazpanel.js
+gzip -9 gz/tazpanel.js
+
+echo
diff -r f8e0ae0ac1d9 -r 5323427d34b9 styles/default/base.css
--- a/styles/default/base.css	Tue Aug 18 19:09:02 2015 +0300
+++ b/styles/default/base.css	Thu Aug 20 17:00:19 2015 +0300
@@ -780,3 +780,57 @@
 #fileContent.bigScrollable { margin: 0.2rem; top: 2.5rem; }
 
 section section { margin: 0.2rem; }
+
+
+/* Styles for network.cgi: Wi-Fi sub-page */
+
+#connection input[type="text"], #connection input[type="password"] { width: 14rem; }
+#connection select { width: 14.4rem; }
+
+#connection td { padding: 0; margin: 0; }
+#connection [class] div {
+	max-height: 0; overflow: hidden; padding: 0; margin: 0;
+	-webkit-transition: all 0.5s ease-in-out;
+	   -moz-transition: all 0.5s ease-in-out;
+	        transition: all 0.5s ease-in-out;
+}
+.wep .wep div, .wpa .wpa div, .eap .eap div,
+.eap.peap .eap1 div, .eap.tls .eap1 div, .eap.ttls .eap1 div {
+	max-height: 2em !important;
+}
+
+#shader {
+	z-index: 100;
+	position: fixed; top: 0; left: 0; width: 100%; height: 100%;
+	background-color: #000;
+	opacity: 0.6;
+}
+#shader.hidden {
+	display: none;
+	opacity: 0;
+}
+
+#popup_qr {
+	z-index: 101;
+	position: fixed;
+	width: 100%;
+	bottom: 2em;
+	transition: all 0.5s;
+	-webkit-transition: all 0.5s;
+	-webkit-transition-delay: 0.3s;
+}
+#popup_qr_inner {
+	display: inline-block;
+	text-align: center;
+	margin: 0.5em;
+	background: #fff; color: #222;
+	border: 0.16em solid ; border-radius: 0.5em;
+
+	padding: 0.5em;
+}
+#popup_qr.hidden {bottom: -30em; }
+
+#qrimg { margin: 3em 1.5em 2em 3em; }
+
+/* END: Styles for network.cgi: Wi-Fi sub-page */
+
diff -r f8e0ae0ac1d9 -r 5323427d34b9 styles/default/footer.html
--- a/styles/default/footer.html	Tue Aug 18 19:09:02 2015 +0300
+++ b/styles/default/footer.html	Thu Aug 20 17:00:19 2015 +0300
@@ -1,3 +1,5 @@
+# Footer of TazPanel html page
+
 export TEXTDOMAIN='tazpanel'
 cat <<EOT
 <!-- End of content-->
diff -r f8e0ae0ac1d9 -r 5323427d34b9 styles/default/header.html
--- a/styles/default/header.html	Tue Aug 18 19:09:02 2015 +0300
+++ b/styles/default/header.html	Thu Aug 20 17:00:19 2015 +0300
@@ -1,3 +1,5 @@
+# Header of TazPanel html page
+
 rootclass='user'; [ $(id -u) == '0' ] && rootclass='root'
 TEXTDOMAIN_original="${TEXTDOMAIN:-tazpanel}"
 export TEXTDOMAIN='tazpanel'
@@ -25,8 +27,8 @@
 	<title>TazPanel</title>
 	<link rel="shortcut icon" href="/styles/$STYLE/favicon.ico"/>
 	<meta name="viewport" content="width=device-width,initial-scale=1"/>
-$(printf '\t<link rel="stylesheet" type="text/css" href="/%s"/>\n' $(cd /var/www/tazpanel; ls styles/$STYLE/*.css))
-$(printf '\t<script type="text/javascript" src="/%s"></script>\n' $(cd /var/www/tazpanel; ls lib/*.js))
+$(printf '\t<link rel="stylesheet" type="text/css" href="/%s"/>\n' $(cd /var/www/tazpanel; ls styles/$STYLE/*.css* | sed 's|.gz||'))
+$(printf '\t<script type="text/javascript" src="/%s"></script>\n' $(cd /var/www/tazpanel; ls lib/*.js* | sed 's|.gz||'))
 </head>
 <body class="$rootclass">
 <script type="text/javascript">setColorTheme(); setBaseFont();</script>
@@ -115,14 +117,14 @@
 
 username="${REMOTE_USER:-root}"
 case "$username" in
-	root) icon='slitaz'; warn=''
+	root) icon='data-img="slitaz"'; warn=''
 	      toggle_url="http://$HTTP_HOST/";;
-	*)    icon='user';   warn="$(_ 'Some features are disabled.')"$'\n'
-	      toggle_url="http://$RANDOM:*@$HTTP_HOST/user/";;
+	*)    icon='data-img="user"';   warn="$(_ 'Some features are disabled.')"$'\n'
+	      toggle_url="http://$HTTP_HOST/user/";;
 esac
 
 cat <<EOT
-  <a data-img="$icon" title="$(_ 'You are logged in to the TazPanel as user %s.' $username)
+  <a $icon title="$(_ 'You are logged in to the TazPanel as user %s.' $username)
 $warn$(_ 'Click to re-login.')" href="$toggle_url$(basename $REQUEST_URI)"></a>
   <a data-img="help" href="help.cgi"></a>
  </span>
diff -r f8e0ae0ac1d9 -r 5323427d34b9 tazpanel
--- a/tazpanel	Tue Aug 18 19:09:02 2015 +0300
+++ b/tazpanel	Thu Aug 20 17:00:19 2015 +0300
@@ -4,7 +4,8 @@
 #
 # Copyright (C) 2012-2015 SliTaz GNU/Linux - BSD License
 #
-VERSION=1.8.2
+
+VERSION=522
 
 
 # Get the configuration file and functions