# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1449448591 -7200
# Node ID 694b20d6963ce8fa42b11c84d65617e18985441b
# Parent  d0b7025e3e8cf46aa505570b40480f1b2153f341
Add 'floppy' and 'folder' icons

diff -r d0b7025e3e8c -r 694b20d6963c Makefile
--- a/Makefile	Wed Nov 25 10:29:26 2015 +0100
+++ b/Makefile	Mon Dec 07 02:36:31 2015 +0200
@@ -6,7 +6,7 @@
 LINGUAS?=el es fr pl pt_BR ru sv
 PANEL?=/var/www/tazpanel
 BASECGI?=boot.cgi hardware.cgi help.cgi index.cgi network.cgi hosts.cgi settings.cgi
-EXTRACGI?=floppy.cgi powersaving.cgi
+EXTRACGI?=floppy.cgi test.cgi
 
 VERSION:=$(shell grep ^VERSION tazpanel | cut -d= -f2)
 
@@ -93,8 +93,8 @@
 		cp -a build/$$c $(DESTDIR)$(PANEL); \
 	done;
 	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
+	ln -sf ../../floppy.cgi $(DESTDIR)$(PANEL)/menu.d/boot/floppy
+	ln -sf ../../powersaving.cgi $(DESTDIR)$(PANEL)/menu.d/hardware/powersaving
 
 # Clean source
 
diff -r d0b7025e3e8c -r 694b20d6963c floppy.cgi
--- a/floppy.cgi	Wed Nov 25 10:29:26 2015 +0100
+++ b/floppy.cgi	Mon Dec 07 02:36:31 2015 +0200
@@ -17,7 +17,7 @@
 
 		#which bootloader > /dev/null &&
 		cat <<EOT
-<li><a data-icon="slitaz" href="floppy.cgi">$(_ 'Boot floppy')</a></li>
+<li><a data-icon="floppy" href="floppy.cgi">$(_ 'Boot floppy')</a></li>
 EOT
 		export TEXTDOMAIN=$TEXTDOMAIN_original
 		exit
diff -r d0b7025e3e8c -r 694b20d6963c index.cgi
--- a/index.cgi	Wed Nov 25 10:29:26 2015 +0100
+++ b/index.cgi	Mon Dec 07 02:36:31 2015 +0200
@@ -73,11 +73,13 @@
 		case "$(GET do)" in
 
 		*-selection)		# display Yad file/dir picker (AJAX)
-			title="$(_ 'Choose file')"
-			extra=""
-			[ "$(GET do)" == "dir-selection" ] &&
-				title="$(_ 'Choose directory')" &&
+			if [ "$(GET do)" == "dir-selection" ]; then
+				title="$(_ 'Choose directory')"
 				extra="--directory"
+			else
+				title="$(_ 'Choose file')"
+				extra=""
+			fi
 			while read name arg ; do
 				case "$(GET do)" in
 					*$name*)
diff -r d0b7025e3e8c -r 694b20d6963c lib/libtazpanel
--- a/lib/libtazpanel	Wed Nov 25 10:29:26 2015 +0100
+++ b/lib/libtazpanel	Mon Dec 07 02:36:31 2015 +0200
@@ -413,13 +413,15 @@
 file_chooser() {
 	cat <<EOT
 <span id="$1"><input type="text" name="$1" ${2:+value="$2" }/></span>
-<button data-icon="${3:-conf}" onclick="ajax('index.cgi?do=file-selection&name=$1', '1', '$1'); return false"/>
+<button data-icon="${3:-conf}" onclick="ajax('index.cgi?do=file-selection&amp;name=$1', '1', '$1'); return false">
+$(_n 'Browse')</button>
 EOT
 }
 
 dir_chooser() {
 	cat <<EOT
 <span id="$1"><input type="text" name="$1" ${2:+value="$2" }/></span>
-<button data-icon="${3:-slitaz}" onclick="ajax('index.cgi?do=dir-selection&name=$1', '1', '$1'); return false"/>
+<button data-icon="${3:-folder}" onclick="ajax('index.cgi?do=dir-selection&amp;name=$1', '1', '$1'); return false">
+$(_n 'Browse')</button>
 EOT
 }
diff -r d0b7025e3e8c -r 694b20d6963c stripall.sh
--- a/stripall.sh	Wed Nov 25 10:29:26 2015 +0100
+++ b/stripall.sh	Mon Dec 07 02:36:31 2015 +0200
@@ -42,7 +42,7 @@
 	pkgi			\n	pkgib			\n	toggle			\n	chlock	
 	calendar		\n	modem			\n	cpu				\n	display	
 	msg				\n	msgerr			\n	msgwarn			\n	msgup	
-	msgtip			\n	vpn			" | \
+	msgtip			\n	vpn				\n	floppy			\n	folder	" | \
 	while read icon symbol; do
 		echo -n "s|data-icon=\"$icon\"|data-icon=\"$symbol\"|g; " >> "$sed_script"
 		echo -n "s|data-img=\"$icon\"|data-img=\"$symbol\"|g; " >> "$sed_script"
diff -r d0b7025e3e8c -r 694b20d6963c styles/default/tazpanel.ttf
Binary file styles/default/tazpanel.ttf has changed
diff -r d0b7025e3e8c -r 694b20d6963c test.cgi
--- a/test.cgi	Wed Nov 25 10:29:26 2015 +0100
+++ b/test.cgi	Mon Dec 07 02:36:31 2015 +0200
@@ -54,7 +54,8 @@
 --><button data-icon="toggle"     >Toggle     </button><button data-icon="chlock"  >ChLock  </button><!--
 --><button data-icon="calendar"   >Calendar   </button><button data-icon="modem"   >Modem   </button><!--
 --><button data-icon="vpn"        >VPN        </button><button data-icon="display" >Display </button><!--
---><button data-icon="cpu"        >CPU        </button>
+--><button data-icon="cpu"        >CPU        </button><button data-icon="floppy"  >Floppy  </button><!--
+--><button data-icon="folder"     >Folder     </button>
 </section>
 
 
@@ -83,7 +84,7 @@
 <a data-icon="temperature">Temperature</a> <a data-icon="terminal"  >Terminal  </a> <a data-icon="text"     >Text     </a>
 <a data-icon="unlink"     >Unlink     </a> <a data-icon="unlock"    >Unlock    </a> <a data-icon="upgrade"  >Upgrade  </a>
 <a data-icon="user"       >User       </a> <a data-icon="view"      >View      </a> <a data-icon="web"      >Web      </a>
-<a data-icon="wifi"       >Wi-Fi      </a>
+<a data-icon="wifi"       >Wi-Fi      </a> <a data-icon="floppy"    >Floppy    </a> <a data-icon="folder"   >Folder   </a>
 </p>
 	</div>
 </section>
@@ -96,7 +97,8 @@
 <a data-img="off"    href="#"></a>Off    <a data-img="on"   href="#"></a>On   <a data-img="opt"  href="#"></a>Opt
 <a data-img="remove" href="#"></a>Remove <a data-img="run"  href="#"></a>Run  <a data-img="stop" href="#"></a>Stop
 <a data-img="web"    href="#"></a>Web    <a data-img="slitaz" href="#"></a>SliTaz <a data-img="user" href="#"></a>User
-</p>
+<a data-img="floppy" href="#"></a>Floppy <a data-img="folder" href="#"></a>Folder
+	</p>
 </section>