From b3cc0beaf5c4212da419819f6c4b4cde1ee7e068 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 11 Nov 2013 23:14:12 -0800 Subject: [PATCH] Add nifty button icons. --- guacamole/src/main/webapp/admin.xhtml | 9 +-- .../webapp/images/action-icons/guac-back.png | Bin 0 -> 586 bytes .../webapp/images/action-icons/guac-close.png | Bin 704 -> 512 bytes .../images/action-icons/guac-config.png | Bin 1063 -> 1230 bytes .../images/action-icons/guac-group-add.png | Bin 0 -> 525 bytes .../images/action-icons/guac-logout.png | Bin 0 -> 1024 bytes .../images/action-icons/guac-monitor-add.png | Bin 703 -> 560 bytes .../images/action-icons/guac-user-add.png | Bin 971 -> 810 bytes guacamole/src/main/webapp/styles/admin.css | 62 ++++++++++++++++++ guacamole/src/main/webapp/styles/login.css | 11 ++++ guacamole/src/main/webapp/styles/ui.css | 16 ++++- 11 files changed, 90 insertions(+), 8 deletions(-) create mode 100644 guacamole/src/main/webapp/images/action-icons/guac-back.png create mode 100644 guacamole/src/main/webapp/images/action-icons/guac-group-add.png create mode 100644 guacamole/src/main/webapp/images/action-icons/guac-logout.png create mode 100644 guacamole/src/main/webapp/styles/admin.css diff --git a/guacamole/src/main/webapp/admin.xhtml b/guacamole/src/main/webapp/admin.xhtml index 9388f4c8d..417c1d0be 100644 --- a/guacamole/src/main/webapp/admin.xhtml +++ b/guacamole/src/main/webapp/admin.xhtml @@ -25,6 +25,7 @@ + Guacamole ${project.version} @@ -48,9 +49,7 @@ passwords can be changed.

-
-
-
+
@@ -70,9 +69,7 @@ can be changed.

-
- -
+
diff --git a/guacamole/src/main/webapp/images/action-icons/guac-back.png b/guacamole/src/main/webapp/images/action-icons/guac-back.png new file mode 100644 index 0000000000000000000000000000000000000000..6435f4a7329dd7b19538fc571fbee90b695dc4b7 GIT binary patch literal 586 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 G2~7Z>!p}JX literal 0 HcmV?d00001 diff --git a/guacamole/src/main/webapp/images/action-icons/guac-logout.png b/guacamole/src/main/webapp/images/action-icons/guac-logout.png new file mode 100644 index 0000000000000000000000000000000000000000..5793014419fcb2018b00fd1997289affab71f381 GIT binary patch literal 1024 zcmV+b1poVqP)U zK~#9!?VDMsO<@$rf9tx&2Qr0R59EPlDqdu&OBpg0%9G?tcrcW?lxqqvlov&!3=bY| zS6oAea49c_gp@+aEF#nO_prYswtcwHw9nq3f1Pgaz3=+Y`JZpC^3l{|Sh= z_QrPt1_777CBV$?10#SffV_+WX7<(0mI4!j7v2UzGdl(h1kQPz1+y&p19;a2I}?D% zNh4qtuP& zD&YJ21k7~7t^5d(G}1-pj0;T$4ixykeFGLyW59rjYhwr+riI3Of==|G(%>cF zSrcr1C=>zN%HE+x`l5CN&w)cg>xlbnbL~as8Us!OpR?5F#X_CiWv^n70cQ5pu^vW4 zkz-Z^!9dr;a!7+4fVsdu;EEG0*GrJOZn>i9W;$1W$4}!V78gP{1+YIgh~eQfTIzQz6bVF4#QVY5X{aZR31tio`(>+ zorlmV$tx2C_W)BPe6k8SD`};qinIp73~F6He<`BETMyJr>XP;}_y8CQZ07ed*|ES? zN!6*=0R)p@%Lon;o`>#r1x`q+k<=`$1Y}U}T;g2B|EvbiNUBOR0T3J`WgC+n;ap;3 znhD4h8*5w)2#?8j1nMMhmDD_~1Y~g9xx|UEm;#m%99#EH8UdC=6Ucz&&Mm_IgwOnX z0C@-Kla?LuL+}9`fzkZloNSS17YO5`bBVe?Jo7fq1VGTEpA0M}dQA3c8e>2<40Yx0 u&%+7>fE&IL0MLeDimMyYmf#oSWsUEeEakt zaqI0YLmd`Jk+%J!E*cXQlvGT_J7Z#&U(?d~vgk_33stV(KCktGnte_uMNer@$S_%M zdDhjjsJf^%G-ll$-t@9Ewcq=*CQrXP^KaR`-_Otb2)GJXZnG=OV^UyXnvnncd&ZjJ z0|hv{Kl{dDPovZM~PwBbJY1xo}37#P85f9eOtgXa7_$9_Z|@OHYrbw_DaHp3;U zGfW>=LDdxOk=f_cKX^Ft&Yr4$a3zgTquxqvn(FMio~%olPKq&wo_Tkrhw-!>1INoZhfRZC zl%G#q^xBkVm1eEYfvxl})@0-bgff-_|PN;9-0%+3wPuaZd8-+Fa2WcKm5P z3vwg!{_`kI|28{1Df+;=g;%3xEjG$N|38y)vjgwu>n~>=;Q8?Ku+@TwpSxR>56sc$ wUTAGq{=p}Twc?v9%dQDwyw4h{WvrxrGcuXQ#`L6a7i9nfPgg&ebxsLQ0EgMnzW@LL delta 679 zcmV;Y0$Ba91iuB4B!2{RLP=Bz2nYy#2xN!=000SaNLh0L01ejw01ejxLMWSf0000P zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$SJV``BRCt{2nmub3K@^6c zvqTG1sQ7^dh1di^L_2F+8w-1}v=RLQ7J@%O|ALK`V6?C`g@0v=M6j{ZCMgUl6mla0 zeJ$=qBxGmroy_c+u=BuFhdJ}k%g&jd-7!fFnZ{dyH`M@d0p3&tyajkO=Ph7b%6HOJ&9yvvk#WaUDJpb?z#HH2qs2{5yZz*o{ha7Gn%e7 zzeM`Gg!90q#5tqsGT;NSo_Nd^NuLwvjHa^)njl#N+#+2K_^5&^?_c^Z#M2W?;#2?t N002ovPDHLkV1g5nH<- zc&d)>4_t20_wQ5=rzNnpOJE427{E=;V)bDMe=vb#*~I%d=+QRH^qtOv~Er5x=zgiBTNfF8VgWhPQkpKVy07*qoM6N<$f&&$4W&i*H delta 949 zcmV;m14{g=2FnMKB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01ejw01ejxLMWSf0000P zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$TNJ&INRCt{2noEdJQ5?rV zUyp_Hsxbx&<^9Z~CLyxGhLTw*Ru+~lyt1=Ww#w2%ij9q;D1SB#iG+;tC^TguQd9C6 z2Gjg3E;UW=o%=tJIsfT@KXq28^ZR|zw{y=qzk9FDj7DZmY5}RK3`i{?HI)IW1*B$N zY5`@D)Cx4^bpJB5_fBy~%P}bFGO#nJ`>C0&c8S~Yk3eNWY5}RK3`i{?H4Se-T^)mx zIt#kz08?}Net!V33&w8GyC>9}0kOo)HM6(>>uC5#pfVt}fYek5q!y5xdMk&o6!fhH zX6E#L209AHe$VTut7EW;svM3)lt)0)9H0$o0iFO|X4V%YmoLE#khC2*NH+0lL%RDV zy#Q_iC(NujR9nhdh@HVs^Uf_kY?0By9km1N&+iHV^2KbV`zZ z@`u3L07=t;OTcWG;lN>Fzia+bI3I(OE&{tf^Y;R)%&glpjx$axK+-P!Cl4?YI43FD zaqP4LBy|BR0_xaeW;X-ID^1PLOKJj^1=g`PaJx~z)Lghj}UiQTnu;|Tm?Lg5VI662D}2k1=cZo3^20+;BG(- z1Hhet@oK{L26hMtRo|aBvzLKl)s9CQe1!5Pa9(=_OzeJLw2oQ z11u$5VLfEW+(Y1oncWMLFc49`3rK1KmIKW|7x2!^eg;nz051b1Eh76^(FRNhW&o{Z zZ-oc%FMYtLLG3l!272AhJ~|5sK+Oh7S^~5K+ko}Jc#r&jzyshGaLvpfdBk#~hK+6| zaDNr}jsN-ozt#_20OpV6CRldzM}aSqCO)+Fkp0tB9|iy?$u2D;G5LS(E6|?Y0ATM3 zPkeBD15A!>K<-UY(nR2RUjGQN05}jkNzqk!Gq5nWfMHk{J3)~FOJXN4!Q$8niVSFu zoxB9mH53^z5IcDZqH8EJAbgQfJJB^%D=r{q@)A@A#7@xg1{8gd>i~|$7BCFaf35oi XFIA1z1)B{I00000NkvXXu0mjf-)Wb? diff --git a/guacamole/src/main/webapp/styles/admin.css b/guacamole/src/main/webapp/styles/admin.css new file mode 100644 index 000000000..105c72f32 --- /dev/null +++ b/guacamole/src/main/webapp/styles/admin.css @@ -0,0 +1,62 @@ + +/* + * Guacamole - Clientless Remote Desktop + * Copyright (C) 2010 Michael Jumper + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +button#back { + + background-image: url('../images/action-icons/guac-back.png'); + background-repeat: no-repeat; + background-size: 1em; + background-position: 0.5em 0.45em; + + padding-left: 1.8em; + +} + +button#add-user { + + background-image: url('../images/action-icons/guac-user-add.png'); + background-repeat: no-repeat; + background-size: 1em; + background-position: 0.5em 0.45em; + + padding-left: 1.8em; + +} + +button#add-connection { + + background-image: url('../images/action-icons/guac-monitor-add.png'); + background-repeat: no-repeat; + background-size: 1em; + background-position: 0.5em 0.45em; + + padding-left: 1.8em; + +} + +button#add-connection-group { + + background-image: url('../images/action-icons/guac-group-add.png'); + background-repeat: no-repeat; + background-size: 1em; + background-position: 0.5em 0.45em; + + padding-left: 1.8em; + +} diff --git a/guacamole/src/main/webapp/styles/login.css b/guacamole/src/main/webapp/styles/login.css index 9fdd8d05c..00d703c30 100644 --- a/guacamole/src/main/webapp/styles/login.css +++ b/guacamole/src/main/webapp/styles/login.css @@ -44,6 +44,17 @@ body { display: inline-block; } +button#manage { + + background-image: url('../images/action-icons/guac-config.png'); + background-repeat: no-repeat; + background-size: 1em; + background-position: 0.5em 0.45em; + + padding-left: 1.8em; + +} + div#login-ui { height: 100%; width: 100%; diff --git a/guacamole/src/main/webapp/styles/ui.css b/guacamole/src/main/webapp/styles/ui.css index eb6e5d342..1574ddab7 100644 --- a/guacamole/src/main/webapp/styles/ui.css +++ b/guacamole/src/main/webapp/styles/ui.css @@ -515,7 +515,7 @@ div.section { #connection-add-form, #user-add-form { - margin: 0.5em; + margin-bottom: 0.5em; } body:not(.manage-connections) .require-manage-connections, @@ -604,4 +604,16 @@ div#logout-panel { .list-pager-buttons { text-align: center; margin: 1em; -} \ No newline at end of file +} + +button#logout { + + background-image: url('../images/action-icons/guac-logout.png'); + background-repeat: no-repeat; + background-size: 1em; + background-position: 0.5em 0.45em; + + padding-left: 1.8em; + +} +