From aba57d84004c878a2d3e8aab0c87127887571464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20G=C3=B3mez?= <dkmaster@dkmon.com>
Date: Tue, 5 Nov 2013 22:00:12 +0000
Subject: [PATCH] * Added support for Android OS * Updated HTML5 part a bit *
 Added printing support for guacamole

---
 server/src/uds/core/util/OsDetector.py        |   6 +-
 server/src/uds/static/css/uds-html5.css       |  10 +--
 server/src/uds/static/img/login-img.png       | Bin 2232 -> 5718 bytes
 server/src/uds/templates/uds/html5/index.html |  83 ++++++++++--------
 server/src/uds/templates/uds/html5/login.html |   4 +-
 .../src/uds/transports/HTML5RDP/HTML5RDP.py   |   4 +-
 server/src/uds/web/forms/LoginForm.py         |   4 +-
 server/src/uds/web/views.py                   |   6 +-
 8 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/server/src/uds/core/util/OsDetector.py b/server/src/uds/core/util/OsDetector.py
index 3105a8862..c1983b6c6 100644
--- a/server/src/uds/core/util/OsDetector.py
+++ b/server/src/uds/core/util/OsDetector.py
@@ -38,9 +38,10 @@ logger = logging.getLogger(__name__)
 Linux = 'Linux'
 Windows = 'Windows'
 Macintosh = 'Macintosh'
+Android = 'Android'
 
 
-knownOss = { 'Linux' : Linux, 'Windows' : Windows, 'Macintosh' : Macintosh }
+knownOss = { 'Linux' : Linux, 'Windows' : Windows, 'Macintosh' : Macintosh, 'Android': Android }
     
 def getOsFromUA(ua):
     '''
@@ -54,6 +55,7 @@ def getOsFromUA(ua):
             break
         except Exception:
             pass
-    logger.debug(res)
+    logger.debug('User-Agent: {0}'.format(ua))
+    logger.debug('Detected OS: {0}'.format(res))
     return res
     
\ No newline at end of file
diff --git a/server/src/uds/static/css/uds-html5.css b/server/src/uds/static/css/uds-html5.css
index 98990ecc9..64e6440d0 100644
--- a/server/src/uds/static/css/uds-html5.css
+++ b/server/src/uds/static/css/uds-html5.css
@@ -1,9 +1,12 @@
 @CHARSET "UTF-8";
 
+html, body {
+	height: 100%;
+}
+
 body {
   padding-top: 60px;
   padding-bottom: 40px;
-  background-color: #ffffff;
 }
 
 @media (max-width: 979px) {
@@ -14,6 +17,7 @@ body {
 
 
 footer {
+	display: none;
     padding:1.6% 2%;
 	margin-top:4em;
 	text-align:right;
@@ -85,13 +89,9 @@ footer {
 }
 .profile-img
 {
-	font-size: 96px;
     width: 96px;
     height: 96px;
     margin: 0 auto 10px;
     display: block;
-    -moz-border-radius: 50%;
-    -webkit-border-radius: 50%;
-    border-radius: 50%;
 }
 
diff --git a/server/src/uds/static/img/login-img.png b/server/src/uds/static/img/login-img.png
index 7de052010e911702252ab23d9dd30e9bcc902e34..f57a7827775db69b109248e75895dc5ba4f7d326 100644
GIT binary patch
literal 5718
zcmV-c7OClpP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3tW}6$0nyKso>b03B&m
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*02R7PL_t(|+U=cra2(a0
z$3L%+nbB!Uwq;{{0LHKh24S;^%ND^gpb(M}vI&F@A*mdjgHQz_fy80K8!Kd~ut|y>
zEF`;N!A69zu&~+4K*V8eune|QY=g0lZ%ZEQ)*L<4-S6!m(~@Q+jjYkxsmiaaEo-LL
z{rdNPzw`axuLV;?^^N5kpaa@~Lk#iL5Q1VM$P<EqloTcs2-{Y9j-yP+K{<}Xl^~@e
z8ilSdNmrK?$HH#nXp3v5-C6;iKnsur<bcENJsRpPHPL(!6U^igPy$Q?ih&~UC;?^x
zGl1zpnfF=mxkW&s5QH=hgb+ldl1Nk$iz%W}MOU|^yIax|k;G!D&l5>SBB5}c)RXl-
zoXGx^F3{l}tw1{v_P{v;9QD3y1C9g7#v2qdj?69rJ^-8noDMAT7+mTdB_0TQBe|Yw
z3gU6a-uG<|9CT@Gm-O^VA`wa4QV5X(rkByZOcvumrJ^45TRcGC0X6}zHPl%hQwBhN
zV|fv974Tu;5}+I~fglj@)JN_E5};{<4X;~lecL7;S2&JBsmxhDg(QJE5COIVziOzn
zo|{krJbfJiP6e(5KI6^y@zsX{+S(;gJQ=04OQGvSou&HBgG$Z)w8s!x&QJd-y|ZN6
zXJb|d?Z6t~w?I!WYD$biho1$k1pW~?d%}#7fJ28}o_Z#R<*Arn#tB@&AR$h|)@EXh
z*(Ag)98rQ4g*b$eB7mY`5K{$lG?M7bLRWE&K$4)DM0YyS+~a5}h9)EEZa13jLU%g>
zCk3!b_X|cu$2=gOY^bx2jR}DI#_}tGFMBGcY@+2l9#=f`T$}?39W<?Xa7h#)I*rTd
z(k~*eEyU91V~Zk$QXaDvV$dwld_;vpXa+{{O!R_M&`m&~DF;n<VmO`XZYze{is6I_
z*!u}4b`eaxLooRcD2WmRB?2P_<8|Q24RzMDIRjANSgr$)10MtOCrh!m9CLZ>cTuG5
z9hgHzKc7Q^Td=e_Nb>s_o)amF7Aznz{bY~v*;pXbq{c?bIGT#1yFC=d-=L^x9R<<n
z(PRXvnVttdEOh}tX{fW-j2M9W#`5{VtDXllsdTj2W$oipZ}tm1jg{;R-sQ1-^q!wl
zG#z8wtTA1qR~_jxK~dy+rg!{?ptTX9<VddjUErq;b(S;KmwFoW=K%i;oH-S)MIs5i
zcH20%OH5zPdwD<e-1N~gPG}lt$t;ZGnPX&ruN{&op<{(UNL$$#i4<OghK=DILw7qs
zWOe#32b%Y7cizkjKz(Dm0esu@Zl;9H02~WT+FRqipLah=QHDT{j#)y-ESrN~P(sRo
z9nZkYMN>%}ql})ytBB_>L*SBcZT5`zkT&A#Qx_ZC_HB1|4VEoH(<lVKHkHnGz!X%T
zXA%mTM72c-oKbpHI)RxB(DI7Mo%tE}Q7%Fyh=mr@JnP3Cp0gG(Jok1;dSJ!%p;<!$
z&>VL1U02PVN&u9C`SVRyUIwO$j?OO^g20Tqh(Kr@)XvC(kRnKD@h3St=OL6R$ad;n
z;Lagc(EJK@@$^#ja|QX@RAPXXFmJ9&aVW~0`!7g^Tsh!iPAf;tpEhOVkB81iS8?*=
zZ)9_LN>5#E)bHEwv}Z^_caJPTcr=OTgE-$x8mv6)k6gR-DO_cY+)oJ=q8FA;>DYyG
z2+#N~iO@OORMDBhMT1n3<0|cNbCS*;*AKZC9I5k(C3ReU+D2Tdk3jPX0;MMn=ZQ>O
znn;QuE#>#2$z-;Zu2^w>D3k$!5FG35k-YbQ0$1V-3I!s3aoK~+DQP}opk)-#1jC#(
zy+6DZB#Go-NFsC|LJjFiT<Rq(`vCxU=o)O_ZE>W<AF4<xjq+)SxcRc5lV@5eC9?SY
z26|E1gnB%qkYPHfU6&1jc|hSn06Ky9bWO0~tr#t>4u(GUDA-Prv*&H%pQ?U^CKwEY
zlIVq{_##Q2AqA3X{_^2Q^>+gShyzaw0gkKKxFt$wx7(K#n^L1}=W)@Z25!3Ow>Z)q
z5ORSQD!_lFNE+oR5zM9*PssqFw#IgV=YX&f5RFMTy&WT&^oLk0C0KdZAGz{_>yS!I
zGrk%^)A1z<4OcJ82EfdL5<qQ@y$N`tFFAJ1X2)*JH>x#YSln>oe{jaE-F>Pk{a+s<
zFkBF03<AKT)xa(<J;C-}7W)q;(S2YKq|zuY2y^pg|3-OH8?Mw*O466V_MsXQ(#ihi
zPyp1{*loa#>1S<vJ4W*{+ZQ0%Zh*Pd_i}sn8VUjlT&W?Qgiq(cM0eY=NoY?t381#d
z-VEI4#Rs^q;?>O&dZO+`R2<~);JGFXrtjvqEAGY6Kw2?hvfp%C>8m6dOvkbU;L!uX
z3%$Q2l8TLQMX_!F_}Ufo8oA+u$52+c&td>jXap1Qpt4Wc_lE_*^NMZ<`ohqb;|@*l
z#{J}MbM?7@V8t2FlZ?jkg?RS6XM_?vhl|S(o=5_yt+AVcACX#?LI`+gZ-PAs{9%-p
z66l)E7nVQBg)^VUvh#c-0~&$ko@|q%8L&<WfCs`afalXc+q5l8xYhPWkS3LesVDfx
zrK_nZTaPURzOey;<X*BY+;0c$5dq-QHKgh#`{>WFM~K9vFQi@}Fm#)5R^Gy?#k;cR
zj3ys|_fcX<0N&0CfZ7^634DT7C2`6fv=tlPjFLzy--JP>p(A|d+}kP7Z)R#orD3|q
z5wa(n2ehN1&dNywsI9Tz0Dh4ES-8#NFT3JMpEw|{GFVvpCSPB2D|tpdBV{qE5-D^-
z){bl*P(0lLj~D=tehsWk|6u2CivvfKzHvYtX>xkmChofEI*g&Rr<0-*b%KeV*=GOI
z^cWx~0BURO2=JYBd!T88^^H;5yIkLZAeF}4;_a-u=z8*v_~ff2p%Y5(%w~X_(_Q;q
zC4kx*`!B#916*DjHb#g<r7t|AUc<a-`s;js$*q(G+b2~WDWMUv{^HdL4Wh#hbyoYR
z0q{V01h_9904pJRV_Os}p?o9>I!jObKfbl}TbxvI1k255;xnfLT_!Q?14FUa1>PNO
zvPVa2fR{34E9|gix8<wkq$5ohmA%eg%dVk%!SAGiPKA&YCwUrX@&G~&nIKG%+R!lo
zvQg6KzHclMLe!Jm8Iyw8RjjzUkh!x1_>FYoVCsoSFI^J-vJg14@9r)oRV;NTa1Kxj
zEG4yGYj}sqP5qb@M_*>{;m;zJHSp^W;M|5f>)^NmaJ2K&r$6@W=AZ7^ee`PS`Jzgt
z))A^NEn;S=i7OR8q=$9k+<N)>?a`sWoPBrqX{5GXEhDudWiF|O^br6MWJbrsl!w2E
zQ1-yD4>Z(Sr;J$wb{zQVM}SWW!3w1~^_f36v19j9bk71S1w{oKD=#Ucs8I9kdPyB{
zLv>|%*cmeW?(PuqLGQQ#SmFJDXuG53b8^dfDeZWWAqunV8tSai4*bx_f$?7gzCmgS
zWU*4If~c!Mw3wsEy6EhQp$UNy5b@TOFRd)_MdEG<x}H>R&b7mx)UvwR0=58KX5ZcY
zds4eR7Xn`gZW=V3mBh67d-itFbH6yW+0M>z&C`cp16FxAAAA7;Z5=Tl`u%I9FFz;+
z6(7iB@fjgsWr_#TFMwOCE5kXLV$Z(2dp@w1RH2pU0Y#X9_<Hi<Zw$rS(;DimeJAvS
zZn!fL*m2<M3w2HVi5Io~YgXo?(1cA<(R7wnT#4)USEmU9P4C8O4%@yc^vXgvliC-N
zGqtQPKG?Fl_(Q<Gy~#DhZSywy4Wh_U%pVc}O;bx>*!a$dw$A9SrlE(j&0bSa;K~5o
z4qd??w%pE^_D2x~*JK(c1sk_S>F`O7Q5O1fePj8zNBhSutBb!6+ykJy$I)fSP_w^2
zd+KhmN(sER{h;>vbDR0|>$^}2^t36gYYwKKWb^)y@z87c^UT}dVn_1@#GEqh;-7$a
z5}84o;+0KNlD6`*D!RA6vHX@Xfbb)Qw$5<cvq`|8MhpOO0H7yov0=+ze!li)cJ4Wr
zGO$3?;SY0f{S*9Q>n$AZIt|+mpm{skrEwC8lE)!!cZ(3v6Ls16R@84xw;2Krtf_A-
z|M;k5U}4;$yRB%ld#JD1WsjYQpc_}2DqW2@uEX4URm6**;84db3@!T-tP&9H{t-sc
zDiCG{5a%t<=giZB_?Qj=*Hl-Ax8?eWi*8?6THIZ?xumOhp%NL+<!)eUL!A{FsRRJ*
zO=p~G=p1UB!IAD+nELSR-$FsM=zF+%*Fjn^A|<^2Zk*%oj-OT00^qmxjpZ|P_KL!H
zyG79#4h^vi_6li>StA9Yad0SaGx91-fnBr)WiIx7;uL6!q+<Q%RC$Y!L0AerowE*0
zZq+rnb><LC<&}myD`x;U4xZUDP$REGljiBzg+BmM)PFMpvAE>L4Uwte%rZPJt8Xl?
z&Cv=3y&x@}j^UMh<_f@TgOz(XLgmmNM}d=n9d77`J}Kyxgw{@nH{Xu=SqcEIt8Xm-
z>c|su!4MD{@bOOIz0m;hKB-1U{fv{H2-%j~BPd9e{1O@XP=-Aa!0!D?4jf7P82}Tw
zr@pcL+!4)x6>ssf20sP<9e4!zO+%g4HN3JO+6&49o&-MHe`Ya>(%<6-SLE)ZxrYh0
zE<?zJed#Bqpder4%H>7m=lNP6Z2*>^C~=ogE3OX-QfrbY>^qn3$t?yHWFgxS?vYVF
zfzs!aoc188o=^R$ibzzl{>`YLqhv^>rvEvYKWM14R70KRjHGc>w%Skyyai-L6`IpT
zT1`<-<c6-mDfmW)&}ka9gl*nziuoOcd+Hm@&zXn|5BJ!+NR`p`Sx+sw5uxIvzLi~g
z7t;KD(sSj8A=t4e!QKN&bbo{J8?UL!<N#1xW4C(x&*PSkmfQ&P_^5BD^iq-~kATSR
z<)8`Jx-(AL-$7ahL#zQzqyzx`H>vJ`eX7HZJvsWjDUik)Bukzew1+kpmu%Y^Cz14R
z!YJUmrX`aGfLD^ZyI&1y7_ncC`KC_jO6<b#WV)sT4mI1nx6kr*fW|mCE*y#0U7ePY
z0QV3^{OK{5*w}@4B7>J^*aOoLY}sLPxW)FxM)4si52*I~>P-#+wKev0q`Jj=Q&q=|
z+%x933`#2_S#%$W(#!z~cw=jn)=tN-p3$etVJ&?;Bmgp&?KFhD7b8|TW+{-tN|HrC
z%y4aclXi_;W4_vxmPU(6tA&~@0A2z%_fOvhM*Ja!9HYKgU>AK2H<+2a1~}f4s<iVd
zT{@`%)YjM*sd`Y=>k(<mMs(|c#ykKaAyM`y(mX!{1f^i-9*bkGzI08`o@@!gOHI7e
z|7#R8azCiZI1D35a@sFJpVMcQg#g=5*#jS{qB)ZeKy8iPO{$K@3x!RDy%{s|%W)|>
zmVxuJ3vc(_?fz6ncU1C9V+7Oil^BSrkN|3H?5BYB{lhQ`^xTPNzc(&}u?ucR23HJ<
zl2dz>EkC6y!czi(M_(YV*MSl`!H#P|jn5|TM9Er|ehLie8@gk6oa61j*@?4d$^fXX
zv73RfX1Jx!E&|<mjLU$OUPhv{j#S_9{vgdtD7L*5_lrGvc`7BKH%GKKT_qavM=-3X
z#{mJ5=6TrD9zdwfrOYEOHhT_C`KG`(NWIcz>HzTe4&O^!(+O0RK-aAZ_u#k;%*neB
zCogk7S<|4gDMoi>N>$Or3{z&3D~&p*(X?K+R#fRdq~0T=g9fr4-QJ3u_YWY(xJyQu
zDDxcj#5#m(C%r#b^KqL+3qn(os%Qe%R9A+(rW^ndgl!d7`Ycl0dqC(2_kA>X4{qM4
z#_X+0eL5Hm(PNMGHDwh75($OvDCW%$OlG;G3#_iL3^$DDMaP`gtEkfJfy?N9>4VVG
zoOjV=7&mm)n4N8DE&@@6k@ypMRcAs#Pef8utTU}hpDYmSt1H8|jrT>zEX1`nwj}ks
zlS3KE#vaCu{2UnL9wh~K;cd9Vt20s+iKJrZ9*ej&Dco-%)wE>XX<YK!P3vW%qDtQg
ze3HKR&Pep+izwqvq`7$Pk#g{2^u)6W)d{4wLUs1I6c_5uC^aUM`A30e)s^8k-vZ!)
zaHOJ2KLmU{bzK3t=++-m`bo&ZlCcSbRsy0BJ^3R2^`?SwtHUXC0|WyT;uh@(K3!cI
z-ab+2j%(M`ruA}rMU~#-sU($3B)I6wmp~LDgOy{G0&^*P;#GvZug?}ZE_8OgoVhSG
z-a9heNR_HLPNaB^d)wKj^>T~no?h8+N^SJSOQ6k0noGv0ik4$UAIJ#MqH#%np2mz4
zW4sJ<2T(bYGk?MW@IZLIqDnV`<^8^>omxN8=ON8=Ms5G4UV<hqwB##&UJ*c7kK~kj
z0gSQl2;2@_SX~)DG#S=?!Wu7EROzphDsWxiCkX=d#4`wG;|7*zFfb?AG;jfC?AN5)
zFQgcrv=yO%VCM8O8RS0!pQ)}4H&0e@F<}5St(UT*N`IMDo#}`B*{7k|8`13T$lw(q
zM$zq11Q4<lExEoAM5Q2ME9TBNF>+fw=-uA@2=Jwe@^*%sP!mo!t}?#@JTx${RK|HE
z%AP^$xi2tj_FLq&o{vf^P;eZ@%1eqkdA6DB<?gDk46m7r#L}ene)kOXUf>G)mb^5C
zdk8(g78SS<rO(aLE=csmiwGGe{XLLLM{(-B5$B=0fv;9qh98)!%-*Cm-)~wkn<}dG
z?Ve32?#mq!!-&@+NFvR1LCYVZ=(;HY+}(Y^2?5;^m$Mdy&`xZO_W(ClSB9Tv3TaaF
ziC&S{O43VQyg6V*?jzWK6?$SLBkQ%Nff#IX9S6F*PnfQL0l2)nGW-HlOp~6_t*x<l
z0ad`GnWjjf*;@&=RT1jE8BX*nL)C+D_YZmmAs}iEy9@JYz}3~2;r;l4rgUxT##QF`
zNOfY&tWQ)nXtPO9yB{}rIZB%`V5kx!ww7S$7f~Y9;M$Jj!<Q7XV2(L3GVUam%fBBV
z(UiV`rD?r<t)fcbO6pzp^ZTcT4n#2GPoXCo5ULfSECf-6vkxOyOQ7ct50lI}<hpRy
zqP&6o&YFO4R#%1}#b@M;8iN~GnX`Z|k?J~P4s=&h613?ktrV1nkcY|E(oHG&?8i#d
z8%6ym@GpK*IlcrS4TuWhzZj-1*l^@Z#VIETsj4i%Ga`2Yzo@PZ`*uI9FN^SRTxH%)
z>Q&&=b8!?j4K80+#Eeqo5b*ix%J9qhoP7BbuBP>JV?~wzsFx;~PTG67vgHzV4bEB=
ziY_=g@Q4uN+Um;iF8&Hg_<evkt}+*T!Q1CatvwH-U_fx%{J@3}EDZhdlU1$j_$wmu
z*D_FV_kKC>5f6|#Kuk(DU$i9urJ_Q8(@j^kTl|gwM!C@c1Nk|GFp2^4T>t<807*qo
IM6N<$g8k&v&;S4c

literal 2232
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

diff --git a/server/src/uds/templates/uds/html5/index.html b/server/src/uds/templates/uds/html5/index.html
index fce20567d..b32345653 100644
--- a/server/src/uds/templates/uds/html5/index.html
+++ b/server/src/uds/templates/uds/html5/index.html
@@ -1,33 +1,35 @@
 {% extends "uds/html5/internal_page.html" %}
 {% load i18n static html5 %}
+
+{% block css %}
+		<style>
+			.testing {
+				width: 95px;
+				height: 95px;
+				margin-bottom: 16px;
+				margin-left: 16px;
+				
+				background: rgb(255,255,255); /* Old browsers */
+				background: -moz-linear-gradient(top,  rgba(255,255,255,1) 0%, rgba(229,229,229,1) 100%); /* FF3.6+ */
+				background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,1)), color-stop(100%,rgba(229,229,229,1))); /* Chrome,Safari4+ */
+				background: -webkit-linear-gradient(top,  rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* Chrome10+,Safari5.1+ */
+				background: -o-linear-gradient(top,  rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* Opera 11.10+ */
+				background: -ms-linear-gradient(top,  rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* IE10+ */
+				background: linear-gradient(to bottom,  rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* W3C */
+				filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
+				overflow: hidden;
+			}		
+		</style>
+{% endblock %}
+
 {% block js %}
 		<script>
-		function squarifyMe(element) {
-			  squareItUp();
-			  window.onresize = function(element) {
-			    squareItUp();
-			  }
-			  
-			  function squareItUp() {
-			    $(element).height($(element).width());
-			  }
-			}
-		
 		$(function() {
-			squarifyMe('.square');
-			
 			{% if not java %}
-			$('#jmessage').dialog({
-				autoOpen: false,
-				width: 500,
-				buttons: {
-					"Ok": function() { 
-						$(this).dialog("close"); 
-					}
-				}
-			});
 			$("a.nojava").click( function() {
-				$('#jmessage').dialog('open');
+				$('#no-java-dialog').modal({
+					  keyboard: false
+					})
 				return false;
 			});
 			
@@ -38,16 +40,14 @@
 
 {% block body %}
 			<h2>{% trans "Services" %}</h2>
-			<ul>
-			 	<div class="row">
-				{% for ser in services %}
-			{% if forloop.counter0|divisibleby:2 == 1 %}
-			</div><div class="row">
-			{% endif %}
+			 	<div class="clearfix">
+			{% for ser in services %}
 				  {% if ser.transports %}
 					  {% with trans=ser.transports|first %}
-					  <div class="col-sm-6 col-md-4">
-					    <div class="thumbnail">
+					  {% if forloop.counter0 > 0 %} 
+					  {% endif %}
+					  <div class="pull-left">
+					    <div class="thumbnail testing">
 						  <a class="{% if not java and trans.needsJava %} nojava{% endif %}" href="{% url "uds.web.views.service" idService=ser.id idTransport=trans.id %}">
 						  	<img src="{% url "uds.web.views.transportIcon" idTrans=trans.id %}" class="" alt="{{ ser.name }}" />
 						  	<div class="caption">{{ ser.name }}</div>
@@ -64,10 +64,23 @@
 			</div>
 			
 {% if not java %}
-<div id="jmessage" title="{% trans "Java not found" %}">
-	<p>{% trans "Java is not available on your browser, and the selected transport needs it." %}</p>
-	<p>{% trans "Please, install latest version from" %} <a href="http://www.java.com">{% trans "Java website" %}</a> {% trans "and restart browser" %}</p>
-</div>
+		<div class="modal fade" id="no-java-dialog">
+		  <div class="modal-dialog">
+		    <div class="modal-content">
+		      <div class="modal-header">
+		        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+		        <h4 class="modal-title">{% trans "Java not found" %}</h4>
+		      </div>
+		      <div class="modal-body">
+				<p>{% trans "Java is not available on your browser, and the selected transport needs it." %}</p>
+				<p>{% trans "Please, install latest version from" %} <a href="http://www.java.com" target="_blank">{% trans "Java website" %}</a> {% trans "and restart browser" %}</p>
+		      </div>
+		      <div class="modal-footer">
+		        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+		      </div>
+		    </div><!-- /.modal-content -->
+		  </div><!-- /.modal-dialog -->
+		</div><!-- /.modal -->
 {% endif %}
 
 {% if user.isStaff %}
diff --git a/server/src/uds/templates/uds/html5/login.html b/server/src/uds/templates/uds/html5/login.html
index 864a6b301..e40500689 100644
--- a/server/src/uds/templates/uds/html5/login.html
+++ b/server/src/uds/templates/uds/html5/login.html
@@ -69,10 +69,10 @@
 {% block body %}
 		<div class="container">
 		    <div class="row" id="login">
-		        <div class="col-sm-6 col-md-4 col-md-offset-4">
+		        <div class="col-md-4 col-md-offset-4">
 		            <h1 class="text-center login-title">{% trans 'Welcome to UDS' %}</h1>
 		            <div class="account-wall">
-		            	<span class="fa fa-user profile-img text-info"></span>
+		            	<img class="profile-img" src="{% get_static_prefix %}img/login-img.png" alt="">
 		                <form id="loginform" class="form-signin" name="loginform" method="post">
 							{% if form.errors %}
 							<div class="alert alert-dismissable alert-danger">
diff --git a/server/src/uds/transports/HTML5RDP/HTML5RDP.py b/server/src/uds/transports/HTML5RDP/HTML5RDP.py
index 773c8f10e..033364034 100644
--- a/server/src/uds/transports/HTML5RDP/HTML5RDP.py
+++ b/server/src/uds/transports/HTML5RDP/HTML5RDP.py
@@ -39,6 +39,7 @@ from uds.core.util.Cache import Cache
 from uds.core.util import net
 from uds.core.transports.BaseTransport import Transport
 from uds.core.util import connection
+from uds.core.util import OsDetector
 
 import logging
 
@@ -56,6 +57,7 @@ class HTML5RDPTransport(Transport):
     typeDescription = _('RDP Transport using HTML5 client')
     iconFile = 'rdp.png' 
     needsJava = False  # If this transport needs java for rendering
+    supportedOss = [OsDetector.Linux, OsDetector.Windows, OsDetector.Macintosh, OsDetector.Android]
 
     guacamoleServer = gui.TextField(label=_('Tunnel Server'), order = 1, tooltip = _('Host of the tunnel server (use http/https & port if needed) as accesible from users'), defvalue = 'https://', length = 64)
     useEmptyCreds = gui.CheckBoxField(label = _('Empty creds'), order = 2, tooltip = _('If checked, the credentials used to connect will be emtpy'))
@@ -122,7 +124,7 @@ class HTML5RDPTransport(Transport):
         # Build params dict
         params = { 'protocol':'rdp', 
                    'hostname':ip, 'username': username, 'password': password, 
-                   'ignore-cert': 'true',
+                   'ignore-cert': 'true', 'enable-printing': 'true'
         }
         
         if self.enableAudio.isTrue() is False:
diff --git a/server/src/uds/web/forms/LoginForm.py b/server/src/uds/web/forms/LoginForm.py
index 78d001244..bad0f0709 100644
--- a/server/src/uds/web/forms/LoginForm.py
+++ b/server/src/uds/web/forms/LoginForm.py
@@ -47,11 +47,11 @@ class CustomSelect(forms.Select):
             visible = 'style="display: none;"'
         else:
             visible = '';
-        res = '<select id="id_{0}" name="{0}" class="form-control"{1}>'.format(name, visible)
+        res = '<select id="id_{0}" name="{0}" class="form-control">'.format(name)
         for choice in self.choices:
             res += '<option value="{0}">{1}</option>'.format(choice[0], choice[1])
         res += '</select>'
-        return mark_safe('<div class="form-group"><label>' + unicode(_('authenticator')) + '</label>' +  res + '</div>')
+        return mark_safe('<div class="form-group"{0}><label>'.format(visible) + unicode(_('authenticator')) + '</label>' +  res + '</div>')
 
 class BaseForm(forms.Form):
     
diff --git a/server/src/uds/web/views.py b/server/src/uds/web/views.py
index 74e5ba242..a56403448 100644
--- a/server/src/uds/web/views.py
+++ b/server/src/uds/web/views.py
@@ -161,6 +161,8 @@ def index(request):
     # Information for administrators
     nets = ''
     validTrans = ''
+
+    logger.debug('OS: {0}'.format(os['OS']))
     
     if request.user.isStaff():
         nets = ','.join( [ n.name for n in Network.networksFor(request.ip) ])
@@ -205,10 +207,12 @@ def index(request):
                    )
             
     
-    return render_to_response(theme.template('index.html'), 
+    response = render_to_response(theme.template('index.html'), 
                               {'services' : services, 'java' : java, 'ip' : request.ip, 'nets' : nets,
                                 'transports' : validTrans }, 
                               context_instance=RequestContext(request))
+    return response
+
 
 @webLoginRequired
 def prefs(request):