From 91797339e0da4209ee33cb7e3e198bdec70209c9 Mon Sep 17 00:00:00 2001 From: James Home Date: Fri, 22 Oct 2010 01:43:56 +0000 Subject: [PATCH] UI improvements to facetting, star and flags git-svn-id: http://google-refine.googlecode.com/svn/trunk@1617 7d457c2a-affb-35e4-300a-418c747d4874 --- main/webapp/modules/core/about.html | 6 +- main/webapp/modules/core/images/close-map.png | Bin 770 -> 1022 bytes main/webapp/modules/core/images/close.png | Bin 238 -> 991 bytes .../core/images/facet-resize-handle.png | Bin 127 -> 961 bytes .../modules/core/images/slider-handle.png | Bin 166 -> 1002 bytes .../modules/core/images/star-flag-map.png | Bin 1619 -> 1997 bytes main/webapp/modules/core/images/star.png | Bin 465 -> 1259 bytes .../modules/core/scripts/facets/list-facet.js | 59 ++--- .../core/scripts/facets/range-facet.js | 2 +- main/webapp/modules/core/scripts/index.js | 50 ++-- .../scripts/project/history-apply-dialog.html | 21 +- .../project/history-extract-dialog.html | 38 +-- .../scripts/views/data-table/cell-editor.html | 7 +- .../views/data-table/column-header-ui.js | 2 +- .../views/data-table/data-table-view.js | 4 +- main/webapp/modules/core/styles/common.less | 33 +-- main/webapp/modules/core/styles/index.less | 6 +- main/webapp/modules/core/styles/project.less | 2 +- .../modules/core/styles/project/facets.less | 229 +++++++++--------- .../modules/core/styles/project/sidebar.less | 1 - main/webapp/modules/core/styles/theme.less | 19 ++ .../modules/core/styles/util/dialog.less | 4 + .../core/styles/views/data-table-view.less | 8 +- .../core/styles/widgets/histogram-widget.less | 12 +- .../core/styles/widgets/slider-widget.less | 33 +-- 25 files changed, 272 insertions(+), 264 deletions(-) diff --git a/main/webapp/modules/core/about.html b/main/webapp/modules/core/about.html index 876906ba1..3bc6f3194 100644 --- a/main/webapp/modules/core/about.html +++ b/main/webapp/modules/core/about.html @@ -181,11 +181,9 @@ licenses/json.LICENSE.txt licenses/mockito.LICENSE.txt mockito -Others ------- -Flag icon - http://pixel-mixer.com/category/free-icons/ +Flag icon based on an icon from Silk Icons: + http://www.famfamfam.com/lab/icons/silk/

Credits

diff --git a/main/webapp/modules/core/images/close-map.png b/main/webapp/modules/core/images/close-map.png index c31588b3140dec0c4eae3fe716332414d0920d2e..8c506a9454a0ffafe23b7a2d11eedb66b5a0e1a8 100644 GIT binary patch literal 1022 zcmaJ=O=#3W6pmJEDXple*kWNw!GpN@+a}u$yY^?Z+paY0y1UdpcrZ<--Owfzlc`Co z7i|?q1VyhN>Zy9riy+#AcohG@i=cRv-YSUqIN9!QJ-7xkGw<FOZsnXNk$Wb4D(DlVg0>}xKh#tbwALEh5lUAJ2=&XJp?K^=nU)AV*yRka8*$b~>;xR}mK z9FTa1j}IjhiIYI!c#h=+mKS1tLXHbE$AQL2lW49nE0>g9BNnmJbPZ!iW?A3&89&Y- zcaG(g$z-G<2r+_)c}q6df|%_MHWd`;>8|Nu6WJhA)Mn5kPSYgQ?Gh}fC2M<)Ya$oM z2Aae23>THu1gh%)p_bJ`d$&4 zv4$}6YRCbZvIta7H|@x-<5gA8+aA_z9p;rZO%xc@H01HP#0jD#DdO-j&nvm4!tqHy zk;sZlGMmecH@OPZ7cFSxCfC^ECfahNQLr2mS%I#32^u*US)g9BY_`v3sI6XuYqZZr zY|CXyGHle?zZ%_ik?Dz!t+6FWYw)2>rrjlDy~%b;CJfZ8*uW-2jWCL@ge^sm1 zP2>&(d>oT4w+?u3m!1)H0N^2}e}|B#SF4pTOC%Bz!!V{;e#1rAw;0Z1dIA1ffbU}Y z3H)WK1ArgTX0wygXk<>O)0peJj6y^Ru}P=Xn_MopPNh;`amgUW_)GBT;01UKd|dJ# z_$7E3{0H#w|8fBE>0~lF>GgUETw?Ar0C-&}6jqr`hE9A57=H!+9DEYIe+c1S@N@8V z;vHpC2_Mbp^W$!}8)}?`XVjrC8O?YOvNN288kfAF4t2@gIKZ3_1_KiZzVSw*@uXI( zr4`6EWn5E-x@5Gw%a9423CX_(Q`Gn(Ws(=vCBwbRuN`Ty9mk0&pwsDGmrA8Wfc~Cq z%G5b^$;e8HV*L~{OXDxWe`Ga2OPR)7WLPQuC&Kf*i2C3->h=1RFbyk*C{yRuXIRg-w(-q zdd^kYwR99U-jn=ylN}DZaBSOtv{)=mJ?ARyS~~nabT?=$j_i))fBTS?!CQLHRoJz3 zTu6QizR&LHhhLWA^LD#!sY(bN$z*a}sZ^GjKjVTctqk9QzppA`5ATBiiTN$~kzalclD&Vun4R&$AVegI!SX zhTzY@3znMRiWzqBKWxP<)dj;Iqa*nk*@4Hzk&n^UEsqg9T$yzq;QLs9RR28Gf&cv+ b{}EsShO diff --git a/main/webapp/modules/core/images/close.png b/main/webapp/modules/core/images/close.png index 5f72fab990152db334bdd9f31f03e8114ee17a0e..b08ab50b7026ca73ed3243af508f48daecd8288e 100644 GIT binary patch literal 991 zcmaJ=J#W)M7(O+qqE(A3)CE{h&Px214`VB)q;^7s>L^Mq5s4)i`;u6#ea5~Jw`0Xn zBz^=lAcig=bznw9h=qj_i4}zS0pXk`DFeZhefPe4p6C7avu5M|=K9Tb0KjH_&up=C zBYm%C*cZKe{e>MjXthJzq)*2v!l2@k9)@)v4R8x1_vrBlTm~S+d3J|(tbNTPK95oi zpZFnT15n;cLgXA^3VV3q1v>Zh{5=OfSLYrUEzt@MJoNUCBiuf2*v|2Rqq^MAU06;u zCg5X=VB#MJv6krER99p7)Gcsu3ZVx&cac=bYC?lV7#4Xk=ZGZ{mLy)v7ZgRg4P{Xh z1yL3xIVUMvUe-hr&K{0Mi`>4}GHbI~%+k3brJ*JWCOhYQ&tp0$ZJOh`~DNW7SqGzVJN|DnFW zK*zL&FZ2DUaBLriSZLvxj3S2(uAfaqg_;pzL`h^5ayai|b4VzOha`kXy9h1hctL7U z@s_34gP5Yg!F5yTm;uBH|ZSu*Yv&4RHjNoGwoMM;$urCK!AYR%Z4b4}umd>qg@ z*S+MHmU7co@Iw~a#F6&|yS0e;a9XnFEzc#tRBy(0m*-Mg$`x2LLOR&L20eGN?MbhT zwPnU)@o~VmJz{J9jhugCzr<>D->#m%{4tqK9&Ns}nP-Kz8tn=A{#JaztbE<9*vZ#k z*LAyBGOJs?F8F77MhYuE2nc*%E{%l9-q+?EnqiPMr=?I2lix z_y_z89=vMeVZD0s2YC0YKLMvKupY!F?ace;d7k&PZ`-X$*}dC)f*@p@N2tTkYy924 zy2HQKCpo~6Tddw=T{2)(hhm}Pkv;~^z!~BWcD&h(Z@4T7JECv*SkF2(ToOo5ijk5a z;%q@EA10CGjxhs$JoH0T{Qc!j1iojAPc;i#Q4Np$qdCRhdCPX^V^{aY!v~<87+fI0 z%mGPo8pcLqic4LC-&40Nf+d8FP4PUbp4A35LNU-Jm~&wPf`TF``TNCU@c^h$fihHO zMa?NiBd;0|g4HAPXw(}R9n@IG;+83n7>f*9o=&IIG%pc4loegqQw>$kaYQbjh0IBE zVZ6UqKsa`(A2FYVAXRkwWWr35XL?>j5N%|`c-1D}FgbA|S&?8`(i&)4|Az*_1|72w zzR35V!m&Mzu-w5hnNXJxZm^$*ii{e?4kOeixZem#9Nlp z3}fbmE^Z=I1fT~ugAgxqV6x7fWRCJ|StZPWGH)_>27ZG<7;E=7k-UYY1 zm7A_Y5b?+eQ~xFQ8k7WJS+e18&!x0gZ^iYt=b~@r$~+l49qeC&Uc31Aq}R>ba$~dj zION+-`C8vZne_j<(muB9Z$A85EEdnQpKb2RuuiMH5Pp7wkGXZdi7IyTqkr;n_uZXW em(C9E-T+^P%io22&)?Gw2MEo23w^Afy#52WT_gqo delta 73 zcmX@eUOz#SgN=cKp|t<5&_qRba|T6E7srr_TSthY!F;yID2EGN^J0da|1qE dX+|a*C+9Dm=a}x}fe6oR|6}p?aiCus9-eZwe1GfNrIuw2}MsR3$QG5Vrjlo zsa%JWAPT%7@uE}|D{4tn1p$s8#HuBJM{OFlQ7x8fs7qdPxw|fJ87?bT`Nj)ev)f*g_ajWTSL+Ozgn;%#C@G6Y`eE zK->O5Gz=%`ls55^-(!VSXE(-t6Q^V+@z}+6=JHapswdc`BykAY9-m^PODIXZB!+rR zhPLYkQJxR+wyj!GO5MoAmZ2f0zy*P?E|`_Dy>x7hUL;bd%CG8udvv1w1(Sbtjolm8O4jaA1S3h9GZ)BlW#s-#IH(oE_dH5Hwt2^fa delta 113 zcmV-%0FM9a2c`j#83+ad004=A^hl8*Ctd(ZNklE0HKM0SOQq4uMXK8j}q~Og1DN0(9Djp*pN9n(PGrRBo-uu4qcf8;1rtt$e z%$~7y27y4B&GqF3lnP!f^w=k%Y__PG`j=(}tF{TzM5CThtZbcxjR1k#(BLY!E zY#HK7Aea*+p%GXFFMuILr6hp~LyDKmaW;YAxh`HV5XK-Fv=xbx$e6^}H;agnM8qV9 zyYeVJIU9+V_$Dflki@`HVPcGsE+Vd53wg#fZ~-ZT37~lCcA1h9&m@lPGVrx&n@ohp zAy^EP_&%rz9v@<(3IuW`QJjSoHwxqilVF;QySw{ph)RJeWD1oGQ=MUV293&~P@oTk zhdq&GEAbFQknqrc>fKRN;L$Km-`72u0ED6IJ9#qZq1;M&%GY#1-NR zgc6y_9>?=|46aOx31mWq%V8361(HM}V$j@ZE>u?!8pqWghGC8mokM}?u)DjrD~Imw z!(KnZ<)A{96p>*QT+t`4%cNXWD@f(IXAYu}#33Rd1uBKcQ)Wmej|HAo?*msfc`VdP zxnw*Tvgu;~anTc7c=wo=AKMl;J~log!@FI9xAl%p4wFEblEe=P^}bitS=$ZjpM#1H zkZ|}eGb;CXJ+KNmvcz9YiToKD0$vUPr?7)(Z`PGGg1#ZpWdP)FvYf(>0b`26IAkC4 zQ)v?zd<(AE0;#6ZHt48hST+FQQZ;xx0zfbA(E0KL9RLG)1vLQlNr3TiUKKDr(`t?* zmrXmdpg+Yi>?r8lq{-2aj)6z*U}$&*7?{AQ9T@|lKh|-hwynYIYAqNT20`kJt*^lK zIn3FUhYB?XSni zzzZTMLRJ-f#U$~yqM|Dq=M_Pdc$d0On#9#GTRY3QO?bpg)yW3dN{fFUvj+usM}b$UFz(^$rxjfwe}OB>r?gQl0@?Yq&! zdT{XEU%+^1WE50(f|81ko_+ufn{GX91%|cB+4s{=>!yPqfqA*< zqdnJGZYgCu%pDe2G*)KMQ_u7+uy=IG5K&eH1w6C!Be(bWw>t!ho}A=HEHB$O|KVct z+&wCLZuEBq4@=GGskUx*>AUaSajoaha%q{)03e4JC;yTmQ4>g!u>?Q8oSJ8H|{(g3hs%N?=M)&)f(SD!(l|{uJZkoWznVzCz z9qLjW=Dnu&YybJn&b3(#xH+HhZsrH?s%z8_dnM@y)w5ZSC#FU_u&mlVALcBx$uT@p zvNQXRAd463{coHg?m2H>`J>>DQ;S$z!?oJ* zyj70!>NeG!s>*WNP2coIw9VF5E2h1PO7XNTYWw~dnN!~d`jRMk2XZc~-?H;>ADPA# delta 1578 zcmV+_2G#k^57P{g83+ad0039y!f%lwCw~R?NklA-14Mv;>HfJ_yD@LnM}4rMufL@y(N*oSB_7zxn3OIp53@-J*)^&B2D_UoiVY_LZH!=~12?h(G zWIRDMEo`1rwtU63N*2&KgD8PvfMH?*4WPeS63H1hRIdkGYL*XZ;+P zlWiYA($^0llsOg(CQ`e%pY{3&qt9YaL^zJq!I%fb2!q!cA`HE1Bw(a9h72PP<0Pk< zgr98N+dSJ-Gr^v3e6REbLL1vU&mHUXuEp+UHZc)IW)jYZ;ea6&Fw!uBFn`WrH_B;_ zEydlm@A!D}!;7EsRE~D?p@Ua?+h07?jp%n^_lL~tP=jE_1)~av6^1E?5rZ)d<1%&! z*>7A{pNCLa9_U*6O4Gv0?(6_smw&wto8O^c)Gkp?5SjT^4#NY(kR1RFcJTr2e9B%O z46mOx_usjoEwks9vES;o0e|Eu47bA&M={v^uw_l?dxB_O-Bwp^wuoXhl1gn{*LiB| zmZRs{Hd`rd#i&^{@3MqphQZ@J8Abp`h;6f#!d8r$MRS(+j&EA7b)H$}$FpV6d=0BC zYo56DLh!?mrEDnM3S`VG7|k%2z-YvN1*ig=kmI6Vz(Qgsj8K|Y2-&yLfQ;)gx1tF>z5yyILlpuKZB7BYvea|s&3~#~zy!;=; zNDv*X-F~z`x9;n2*|6>8OL~!i&tw!uvq6+X(G(wzCUknEVeR$}k9_v>yT7nCp8jal zqcQEA*w^~N5^N5^IDZLaDvVkf91Ma%FgO_JV0dA$l&-*#v_YIj0uMqEXI9&qzugBfY zyn8&ki>gr$L&;(AFw8JG^q&gDIub-{$Mpjw7`jsu&qe%wd?FsF{sD<3Ss`bMK;dA7 zjAj#6&!{F}Zy!0!+*V$v>i{zH!hq2aBMgIJ&=?E>MgxpHX}jjyt_Hh25RRq|rU9>a zIFVE+9F}Q9seecoi%8*6lx%h@*&TLDCDWX!*H6QcuF(z#j3Y48Fmy1|1q^~=fl)aU z1SV86Whh<8b4om!NXU^}1In$SO!1gPcAG$v;rQ)mUp?J}?FdaQbK3xH$DNFPH^Pu% zoQEO7AQ)7@5Mb285JxiC&Mk{S7j^R4L{hR3dV4u3Eq~Ea07EKCq(}+6=?{>}WW*$! zK*?l^>?NgU4CzkoXu$Bn2*D6w&=?FIjQYF2fOuYMGjOrf3JH$Tg@elV(uU!9ESlyy zz7JmwGj%+tvsld(41|f}c|n$>=h+}+8Rua<4nu@NFw!s-7;zX@7@Wr7V3gmL!#~)( z=r3N-e}5ZGi{uxpxOC9BSC(Yg&i1+WvXtKHz4G_jtCxBP12+aP1^hSm;FJZ~i3dgm z#-M5tjB7A{gmD!?N;)kQxJ&5(xGe`+N_F<;qO^K zDdurx%G>NtP(Qto$I_!-YfiCqg1w{~5&5ZjS{cNHU11cs+9EG*RYx!gBLSlvhAq3( cKNkWF0C?UGL}H2TL1t6 diff --git a/main/webapp/modules/core/images/star.png b/main/webapp/modules/core/images/star.png index c6bf7bd7bc73a7682bd748aecc915cac04c1a717..ac2b1f0b70de1d8bfca0227932933bcfcbfe28ff 100644 GIT binary patch literal 1259 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW~I!Kh>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGf*%y)H5_T zF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=|ef{$C za=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~>Cgqow z*eU^C3h_d20o>TUVrVb{15Cdnu|VHY&j92lm_lD){7Q3k;i`*Ef>IIg#cFVINM%8) zeo$(0erZuMFyhjbK~@!5ITxiSmgE&%Zia>~Zk8?vhL(or=B}nLmacBj zPB6VL`N^fZsd*(Zy(tL2hB)c~HG6 zINf68hEuOT&@uX;h((HMm=G}afSB-P3*^8Perg^twHE=C^~(EgtiUYM9^ez=`u~IR z|4*5c-qZhoUH|drboH>=>Y>wr{QUF(%k=*rZ6DossGE7<=%uGu?mqqa|`m zW%D({CToPvQ3;-r;o30Ty`~Uy{x6iB)20BT%B*-rq$R!#u zEPc=Y7pQTvr;B4q#jTk0?m~wQ1Y9mUUOZv>T!!)f{~C`7me1zFU&Yo6y{SJ~_`~9p z@Ri#5`3ny1_|+f+jBE3S^M!bt?Wld zmluC#+LT(i|4`r}1;?1??MzQB54_6!z{(OR((r+QgOTBq-}CsCHpe|MxVCay-<+bAS`pfK43q8UM&M8vq(rWYE@@bR;=!c-VrNC@j1ihl`% z*vAh&eE~G!6HM;Y$DhAv_Md<9=GC`gMx+3n-#5p_Kv6}24`0aMzw_Z!QOceR#|}P8 z1aj}eqVfIXho4?-Sb0lEO;drN$Gt6FyE`;&Bhi zPr+w^e|5X{6(HRP#5PFc9zZ-1D(8>S09L31RubjN2LJ&E0I;2N+QjX#Obh@3002ov JPDHLkV1nZVwi5sV diff --git a/main/webapp/modules/core/scripts/facets/list-facet.js b/main/webapp/modules/core/scripts/facets/list-facet.js index 382dd9f90..b8a42f3a4 100644 --- a/main/webapp/modules/core/scripts/facets/list-facet.js +++ b/main/webapp/modules/core/scripts/facets/list-facet.js @@ -158,14 +158,12 @@ ListFacet.prototype._initializeUI = function() { '' + '' + '
' + - '