From 3811734321a997254477dfc8bee45acbb7b3de2a Mon Sep 17 00:00:00 2001
From: Steffen Vogel <info@steffenvogel.de>
Date: Sat, 25 Jun 2011 19:24:23 +0200
Subject: [PATCH] added larger zoom icons and tooltips (closes #78)

---
 htdocs/frontend/images/zoom_in.png  | Bin 725 -> 729 bytes
 htdocs/frontend/images/zoom_out.png | Bin 708 -> 742 bytes
 htdocs/frontend/index.html          |  41 ++++++++++++----------------
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/htdocs/frontend/images/zoom_in.png b/htdocs/frontend/images/zoom_in.png
index cdf0a52fe03715dcdf399e59c8071c4572dc51f7..1c37f5e1364e4c5f208d32554d2770d12661f73f 100644
GIT binary patch
delta 705
zcmV;y0zUoK1=$6VB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru+XfjC4H8X{ZMy&f0$E8!K~y-)jgm`9lu;OlpL1pm
z(Mp`s%)$|}n}*P$CTX&A7eQqSQ8<C2LbT}uF;W{N(oKtsD1U;849d_ZrFBLZ3Ktnc
zWsnU7hT26-XK>~}|2e14B-R-Eu0FmOp6`7RM_6kCczrh%K*%t7f<kzF))<UZqpotE
z8^>*}IMUh643Yq^+YdDenbC#CZ=B>sCq7Z;#A9V{GI7xw{6cuUo?WVLm<b^I?$ic^
z%;++%b5mAcyMGOoHN~qs09vwpb^-5V4?^|esZ)vMp6#a|{*^>pWY}muBrC7A0o#C;
z)BF;kVt)1Q>qfgn7Q$&21TtuqiU6fR4xp#`Dzz(d6K+Hxg8u@%LP(!>P3M_-RsX+c
zQ@rZ(pZTO(wASPGHm4;p#$vQ#HfgP~u1?!~UB?;4*ngUq?4BLK3cxnStFELTu|8EP
zI;{8BsH7TAOQ0R~+*+|0_yBxM^`1Hmi~&(O&wJW9ZZsW`RISFcbo_p8BhU*BO!EhT
zSFx_c(WRxUGBX{$vHRGT1AqMkYb{SM>~4@AdDc~W$T)69E8S^~1#N4xd<&cN)~uEb
z3W`yQ7=O{nPx<-fYr(#&FGi*S0FTb^3;<z-3<~gBV^NMf;q_$X6jyF$LH=@tl>8d}
z$eVkQj5f)_{Wp3?rU3s__wlWv+@iv^qCkMmg}EeS6O6p=qv!t1PyQv@<+B0+B1eOv
zoWlIJW$V{rk^C6wXZZc+QD;*5=L7)gXxtQ1lR9qO;*vbZ2gimSN0lGE_3Hba0RZiF
n8+@^Zdm?L|ICt<?UjpDaMUfwN50FT600000NkvXXu0mjfn({_*

delta 701
zcmV;u0z&=S1=R(RB!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o0007KNkl<ZILoDy?@JSL9LN0&dg{ZZ2XR)2D0M_B1TI$FnmV_o
zZdX%}nX8s0BVkKxdZjCEhK_Cir1pcROae3UHqz<N#df2@gntl=BCfcHJw85tzcHdZ
z3!w)uIF9e<^?83j-)|8B6#WlBKlreT<Res^k66Tfv`yl}EmC&IEN+Y&<LNOS`A-2K
zG1K{|Mc~5}pPgxPW+sfpM$kZP1oTcWVB|TUQCRiX(z^<9XIz|n+|1-Zek(;ZAnb_C
z2o2&u%3I5%yni|&IiQv$DawVZcrHZo=pcc(gy=>%5M78)L^GmfWk|~>2GsFg5?mCs
z(~VAas2*{nP<*{mj8k+VY7&gfnH<oFGC@AlB4x&nxV!C_u0KYwJ~M%3-Uy~>JuKf+
z63IcWBp)GUkvP8|3#^60s|8v6g*gL+Hzz<hse<P>6@Ns6QOgCHsb-P$HQ*7Hg~E>3
zr;R|x8o;r51twpOf^D`HYCKg??Z!L&Ly-0x&^_z%5=#&U1dSt4z4k#MKLX6U3m&|@
z3!bzaj&_&J1*wrba&1&EtPE@MHSR~8!jUy&3ZNqtc({IO3hJQJQ3hr9Qkb`&Y?M8u
z7x&K5tAE3_LUK^UvwdfrOFgHFMVErWk#DcMprY#te9HP^XYD?)ZY|8VA1{_YWw!q;
ziHNg|TExp@`&1H+T;6#Y4%rUEm(54;bt?q#mU|)ARwYGSjurnV_#5-rs?94y=i&YO
zFbHp^;RE*&GC>R6Q4-sG5@6;!PMF!gI@nrp!8Y549!Pl&5VMjydlq1x&}37{RQY+S
jSBXX-w?kCLKK%bXFYU6{?d+nH00000NkvXXu0mjfacM$X

diff --git a/htdocs/frontend/images/zoom_out.png b/htdocs/frontend/images/zoom_out.png
index 07bf98a79cfea526e250703356dbefdb6b80d166..91bb420ec4343776ca8b7dd4c8a34ee810797218 100644
GIT binary patch
delta 718
zcmV;<0x|u>1?B~iB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru+XfjC4kI^wK0*Kh0%l1>K~y-)jgm`9)KL`1fA`K9
zrlvTgsYMFCEF&nWNt*1j2%<%4f)q_)WDsqtMNPCaB5Tp2Hh)<Vp+*l<Q`)A{gTjSI
z5EWztkzw|*hch^H@BiN0W)f@){Z=1`bAEgu9O0Y;;Q7sP5FsPr3kl&1IBT(5k9t}?
zvC2DJd9b~Ye@Fs6zqPkP$c!!=rB)>`sQ6fgipMIvWa5IelnUYRdVI0E;a>nTaAQwU
z$c!%QscW*Txql6)I1%664P-WD_vQdIV|T;*!B?*n$sL=H-J6s|I%LEeGc2o`TY-(h
zB0vLUzz?7@r@HNmHQum;NLmGf3^}bkfn`7*V1QLXRtltmg<itz6o}B@0KX72U_9Gi
zcD(NOpW$^1Qm$@d@oTwV>ht>>(-K(gu*Nc#j4?RRq<_u*o>HS&SNq}I?XAE9z@3P1
zz7LEyW%q7LRf@XHHMKgaN7E7*rJpz_YJfMumsIZ&AU}2d9f-;q{*zXD(R4skpS6zS
zUmbf60DZt9@DuQ-e1EKKU$l7H;>=8C)^s0UziZMTIOlkHetU!T$y1&-!&Z5nMw@nP
z9T-=e6@SQWEGS<hXBCy96EUI>9`WPj=c1jLo{mfa0D8`B3jz^@3<(H0>(I&@^ZPRL
z%Bt2et8gAdN`4N#<;CqDYizQl?rPu21mJ(_KC&U4Kfk1PelSR8Za&G_7$YwS=<Rs+
zu5?cJiYWmAorgl<ypqD!xht3BkbE0_&8JuIM@QATE}a$t;Ld@yVLk4(&R$r+uc7b5
zO6e85Tl&9F8vt;tesv(0@Q!B95T|#y3?u-41L2q?SDA*h*Z=?k07*qoM6N<$g4sVt
A+5i9m

delta 684
zcmV;d0#p6w1;hoAB!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o00073Nkl<ZILoDy?`u*~7{~n=f?yCqqabc?deNv$KOvZ9P19}a
zZ8;@P*|HxNjo9Mu7n#GcCKffEiyX}#WaVD8Y<P8ZZc{<8FMpy9Dk=)P)vYKtT12;}
zbKn-mwHWl`1Bb)&{XXC4IY$Nnvj5@Nfekg1Y}gcI!)Cq|u?lR+A{2&=d~S$}&0ei1
z|7pO6jkZ$6%&{R8TNpk>=dV#j&aWqOgE~4pNU_-giktFkY-J5_XDlv`7+j?n3mXtx
zgadILp+c<9cz-pnjJKXkxs{S6vSP>-D+Wz0DkKm`5p9UGh!(_YgaJ{R?pL!(w=z~H
z!C}4-XrNJ19imkfpAp44g&k3ybk)!)w~Ch-l)@GvKSbf~$A0Vja|E2I38zSOD~MFD
zT9A$qGz(dujt~p6@T6$gEZ$iW)cp=Qk#s4g2Knm-K7Tu)#Um(0q5XSn3w(2&fUid^
zu%y+)qFe!=HgAIu>o<bLVAiKc@2ta1tVHM$HZ1;<n}DUsIDEc$2Nt6vun_RWyH)F?
z2ANB><n$FCm-eXfGp<4GF4q~0->z5<qmCU7l8-dmcfdB~(Qv6=70WpH(c_(ah<Ll4
zh@Y#b(|>(+!ra|9cv<kl)9H)AoL9rG=B*WyugqN7Pa<NBOUdJ9G0qwx-m&*%qFV`%
zCwk!Z!yE8sJ_wHzT@bbI6e5-_6@M7~jnPxPjOqS^@NC8d+=Bo-&t8VS-wZtp;>ofM
zFt_d7jf}Gv=EvG$ZmbhBUOhyc$oI=Oz}&Qv#wB256^wT&&<NzKplQ=eeE$QHa=)We
S*vaDn0000<MNUMnLSTXe$3G4L

diff --git a/htdocs/frontend/index.html b/htdocs/frontend/index.html
index 7765dc1..a1c37b2 100644
--- a/htdocs/frontend/index.html
+++ b/htdocs/frontend/index.html
@@ -27,9 +27,9 @@
 	<script type="text/javascript" src="javascripts/init.js"></script>
 	<script type="text/javascript" src="javascripts/options.js"></script>
 	<script type="text/javascript" src="javascripts/functions.js"></script>
-	<script type="text/javascript" src="javascripts/uuid.js"></script>
-	<script type="text/javascript" src="javascripts/wui.js"></script>
 	<script type="text/javascript" src="javascripts/entity.js"></script>
+	<script type="text/javascript" src="javascripts/entities.js"></script>
+	<script type="text/javascript" src="javascripts/wui.js"></script>
 	
 	<link rel="stylesheet" type="text/css" href="stylesheets/ui-lightness/jquery-ui-1.8.10.css" />
 	<link rel="stylesheet" type="text/css" href="stylesheets/jquery.treeTable.css">
@@ -54,16 +54,16 @@
 
 <div id="accordion">
 	<div id="controls">
-		<button value="move-back"><img src="images/control_rewind_blue.png" title="move back" /></button>
-		<button value="zoom-in"><img src="images/zoom_in.png" title="zoom in" /></button>
-		<button value="zoom-out"><img src="images/zoom_out.png" title="zoom out" /></button>
+		<button value="move-back" title="scroll backward" ><img src="images/control_rewind_blue.png" /></button>
+		<button value="zoom-in" title="zoom in" ><img src="images/zoom_in.png" /></button>
+		<button value="zoom-out" title="zoom out" ><img src="images/zoom_out.png" /></button>
 		<button value="zoom-hour">Stunde</button>
 		<button value="zoom-day">Tag</button>
 		<button value="zoom-week">Woche</button>
 		<button value="zoom-month">Monat</button>
 		<button value="zoom-year">Jahr</button>
-		<button value="move-last">Jetzt&nbsp;<img src="images/control_end_blue.png" title="move to present" /></button>
-		<button value="move-forward"><img src="images/control_fastforward_blue.png" title="move forward" /></button>
+		<button value="move-last" title="scroll to presence" >Jetzt&nbsp;<img src="images/control_end_blue.png" /></button>
+		<button value="move-forward" title="scroll forward" ><img src="images/control_fastforward_blue.png" /></button>
 	</div>
 	
 		<h3><img src="images/table.png" alt="" /> Kanäle</h3>
@@ -109,14 +109,6 @@
 							<label for="render-lines"><input type="radio" id="render-lines" name="render" value="lines" /> Linien</label>
 						</td>
 					</tr>
-					<tr>
-						<td><label for="middleware-url"><img src="images/server.png" alt="" /> Adresse der Middleware</label></td>
-						<td><input type="text" id="middleware-url" /></td>
-					</tr>
-					<!-- <tr>
-						<td><label for="tuples"><img src="images/shading.png" alt="" /> Tuples (Auflösung)</label></td>
-						<td><input type="text" id="tuples" size="5" /></td>
-					</tr> -->
 				</tbody>
 			</table>
 			<div><button name="options-save"><img src="images/save.png" alt="save" /> Einstellungen speichern</button></div>
@@ -144,16 +136,19 @@
 		</ul>
 		<div id="entity-subscribe">
 			<p>Hier k&ouml;nnen Sie einen existierenden Kanal über seine UUID hinzuf&uuml;gen</p>
-			<p><label for="uuid">UUID:</label> <input id="uuid" type="text" size="36" maxlength="36" /></p>
-			<!-- <p><label for="middleware">Middleware: </label> <input id="middleware" type="text" /></p> -->
-			<p><label for="cookie">Cookie:</label> <input class="cookie" type="checkbox" /></p>
-			<input type="button" value="abonnieren" />
+			<table>
+				<tr><td><label for="middleware">Middleware:</label></td><td><input id="middleware" type="text" size="36" /></td></tr>
+				<tr><td><label for="uuid">UUID:</label></td><td><input id="uuid" type="text" size="36" maxlength="36" /></td></tr>
+			</table>
+			<p><input type="button" value="Abonnieren" /> <label for="cookie">Cookie:</label> <input class="cookie" type="checkbox" /></p>
 		</div>
 		<div id="entity-subscribe-public">
 			<p>Hier k&ouml;nnen Sie &ouml;ffentliche Kan&auml;le abonnieren.</p>
-			<p><label for="uuid">Kanal:</label> <select id="public" size="1"></select></p>
-			<p><label for="cookie">Cookie:</label> </td><td><input class="cookie" type="checkbox" /></p>
-			<input type="button" value="abonnieren" />
+			<table>
+				<tr><td><label for="middleware">Middleware:</label></td><td><select id="middleware" /></td></tr>
+				<tr><td><label for="uuid">Kanal:</label></td><td><select id="public" size="1"></select></td></tr>
+			</table>
+			<p><input type="button" value="Abonnieren" /> <label for="cookie">Cookie:</label> <input class="cookie" type="checkbox" /></p>
 		</div>
 		<div id="entity-create">
 			<form method="post" target="_blank">
@@ -166,7 +161,7 @@
 					<tr><td>Kosten:<br /><p style="font-size: small">pro Wh</p></td><td><input type="text" name="cost" value="0.00025" /> €</td></tr>
 					<tr><td>Beschreibung:</td><td><input type="text" name="description" value="Swissnox 1-phasig" /></td></tr>
 				</table>
-				<p><input type="submit" value="erstellen" /></p>
+				<p><input type="submit" value="Erstellen" /></p>
 				<p>Es wird ein neuer Kanal erstellt. Die Antwort der Middlewarenthält dann die UUID.<br />
 				Diese muss dann im Controller angegeben werden (z.B. AVR Net-IO).</p>
 			</form>