12:08 p.m.
Issue#296 debug report: kimchi UI should not waiting while generating reports
V2 -> V3
Change the layout of the grid: Removed the frist column that has line number
Changed the progress bar layout that make the whole table more consistant.
V1 -> V2
Accroding to Yu Xin, this patch move the progress bar to the top of the
grid and use ellipsis for hiding the name that is too long for the
generating progress bar.
1) Removed the dialogue window when generating a debug report.
2) Designed an animation bar indicate user there is a report generating
during the generating progress.
3) Disable the buttons' functions in debug report area when generating a new
report in case there might be any conflict. Meanwhile user can operate
on other parts of Kimchi.
4) Enable all buttonss' functions in debug report area after generating
progress.
Wang Wen (2):
Remove the first column of debug report grid
Added the generating progress indicator
ui/css/theme-default/host.css | 11 +++++++----
ui/css/theme-default/report-add.css | 9 +--------
ui/images/theme-default/progress.gif | Bin 0 -> 9889 bytes
ui/js/src/kimchi.host.js | 6 +-----
ui/js/src/kimchi.report_add_main.js | 26 +++++++++++++++++++++-----
ui/pages/i18n.html.tmpl | 1 +
6 files changed, 31 insertions(+), 22 deletions(-)
create mode 100644 ui/images/theme-default/progress.gif
12:08 p.m.
New subject: [Issue 296 V2 1/2] Remove the first column of debug report grid
Have the first column of debug report grid which indicate numbers removed
---
ui/css/theme-default/host.css | 4 ----
ui/js/src/kimchi.host.js | 6 +-----
2 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css
index ed28d25..a040204 100644
--- a/ui/css/theme-default/host.css
+++ b/ui/css/theme-default/host.css
@@ -210,10 +210,6 @@
margin: .2em 1em;
}
-.debug-report-id {
- width: 30px;
-}
-
.debug-report-name,
.debug-report-time {
width: 200px;
diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js
index ee59a7e..3d8da1f 100644
--- a/ui/js/src/kimchi.host.js
+++ b/ui/js/src/kimchi.host.js
@@ -357,11 +357,7 @@ kimchi.host_main = function() {
$('#' + reportGridID + '-download-button')
.prop('disabled', false);
},
- frozenFields: [{
- name: 'id',
- label: ' ',
- 'class': 'debug-report-id'
- }],
+ frozenFields: [],
fields: [{
name: 'name',
label: i18n['KCHDR6003M'],
--
1.7.1
12:08 p.m.
New subject: [Issue 296 V2 2/2] Added the generating progress indicator
Have the generating progress indicator added, which will be removed after
generating progress finished.
---
ui/css/theme-default/host.css | 7 +++++++
ui/css/theme-default/report-add.css | 9 +--------
ui/images/theme-default/progress.gif | Bin 0 -> 9889 bytes
ui/js/src/kimchi.report_add_main.js | 26 +++++++++++++++++++++-----
ui/pages/i18n.html.tmpl | 1 +
5 files changed, 30 insertions(+), 13 deletions(-)
create mode 100644 ui/images/theme-default/progress.gif
diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css
index a040204..583f360 100644
--- a/ui/css/theme-default/host.css
+++ b/ui/css/theme-default/host.css
@@ -215,6 +215,13 @@
width: 200px;
}
+#id-debug-img {
+ background: url(../../images/theme-default/progress.gif) 7px
+ center no-repeat;
+ background-size: 15px 15px;
+ padding-left: 26px;
+}
+
/* End of Debug Report */
/* Software Updates */
diff --git a/ui/css/theme-default/report-add.css b/ui/css/theme-default/report-add.css
index 236029a..3e52f63 100644
--- a/ui/css/theme-default/report-add.css
+++ b/ui/css/theme-default/report-add.css
@@ -12,11 +12,4 @@
box-sizing: border-box;
margin: .5em 0;
width: 100%;
-}
-
-#button-report-add[disabled] {
- background: #c0c0c0 url(../../images/theme-default/loading.gif) 7px
- center no-repeat;
- color: #DDD;
- padding-left: 26px;
-}
+}
\ No newline at end of file
diff --git a/ui/images/theme-default/progress.gif b/ui/images/theme-default/progress.gif
new file mode 100644
index 0000000000000000000000000000000000000000..35aeccba8b624c67acce4242ee139dc48ef97302
GIT binary patch
literal 9889
zcmeI2=UY>0`>xY_!XktaAixSBgrWuo1w>~pYCzObq=_035ET#{R8YrBAsC7p5D^*0
zP{fEL$bcfY1cIWX6BHb=4Iol%6Kn(O=#KCF_J{pt-u-ER+Up<4I&z%rdd~a0pP=AC
zPp<?Xf`|A^hFF|ZQ*&|1oL|HWDr&tpa_P?Gox$<p$#)Ni-*oqlRJG_biZ8tTF!ONa
z^@+<*itBr|_a<7pp1gTC^J;4P!}RAngA?Pg-c7#wI5PQmdgjZ-o4<~=4dg4eZ9OCB
zx*u=ee^vi}rnt6S_vFu_+U~&-y`r%{IP=6S{l|)y-&f`~j!fupKm2p%^WRhNr*jTz
zFZ51CY*StDpA6rs>VG_`>bN)cZhGqdr?($JfBO9Qld<=&-_Csg^0oiTWcS_Y_ny8{
z_q`Yxn%Z1^{;!!Y-2<;O_nuFb{(AD#;K%9D`O0p`h*I67*Q%={!I`RK?GJa9U(xoz
zI@qYYe0$7eP360fpCwg24VUgaM3i2*IeMn+kH^p7Em&LG`P;}D?dat@&!4?`UwZQ9
ztp_hx=APMIai#R+tsUi8Zw<b=cx!m<^<SNR<G($8;kU86@=R}{wDsY$si$La`=00%
z#7#GTf8G1w<;aT<LUGeo-HY?r9{F#qZtWQx9DP^W)I0FUpZABSMkYVJ&`<wVab^7V
z$MfBf3QqJbPN`0oU;Os%8{+>z{}2BG&NuS%fXE0xSP(F84iAkq{4{3<LnI+&2-okg
z@%=MF5WXSEL^i)!sqwYK5MN|AS9k59&E-bsAZxn!c)PQGcwsv6UemeWt|lPDjEVJH
z{)Nx;Gm%jOERw=nMipgNv9worjq`dX5gW_<VZm|VqcSL)!FW5aHuGJ}xE-v6gYe7A
zF8~YS9jMm&>YRYeHXTqMuRX(-*R1PpLC3lpJNtq$<wEarz0*7SUa4)~960y9AfIl<
zVf(<tN;(RY7|QDjn7G~P<5<%p0J_k=dBu!Y<b~E!JIuJhY3fSgzHg)HCy<|jo_NF}
zEa$HNL?W_RY`SlrQ|(k<(1Z<~&iuSUB1z3Tv~MI}h@qNW@7^mMfP38MRQ~a8TLN(1
zdh+<XFI!*4etAvZYh+y@Ub5x>Z*Ocy^F2AFPp98pP+VJ)5nuB3r}IAnaO_w&h|gSp
z6w!^=YmyV97V?$D`Rp}Z00riA6Eh%&aHN3CZ0?jzU-)ZHA+ItA9nWf?SX0cq6BD&}
z!GdVpeGXT$IE=-Tb1=tzi>hvqOg>?c`t0VE>^B=gqS?+#-69imrW%Un*mKksyrecY
zm|7|5Ua>9JZR{6Rl5FgVv`#1r@KGbie@XV<>Too5ju3g!|J9B4<;y+vj!NmSsbo0A
zqCsYbx(#+A=Jo3oSTX`sLDqHZ2{3?BCaMn3gLKEy6zDocbsyjX=7|0dHALYGQMKD?
z+O8`9RtTUro^zH$KR=D*pJ+ohV_{|{LUkHb06Q3A2f%={=r3V%WcJen|6dV#2@2%T
zTQUV?Iny0=J}Q;;=E(MWYRm-^yI-xGcT$Kwzlq>JxAL+xG{<EB8W!e!IK^ELUS`s9
z7x+09i1TRsq0Dx4Iy?u_-`U-87PFW=)iUb5>OO^a{`2hX&AWRyM>%J{OuxZ1a?kjc
zxV}w~*qB;4|1#E%=Z099<0-v1J{Bs#a#nb`SB5Q3FKLykHYGs+PP#1$lauuy(ob+B
zE3gLAgVNajJU5YCYBnc+mnsh-X5s#abXekD?33D67rYR=(mBZsK!sM=uBRUn9#EUI
zF<W=o6Kb?8V0<23YkYj7s?I8x+4+_s>zAx4r0ci>r{B;ks&~(3)pBpP#Nw}fnG~jL
zDg%(3)lRygIKX!^-!tZJ3ZpKCoSgaT*CGuCFJWTBmFfeUh$hCYFn-W=FWIiIt|iq<
zBL**-ektt22NDMp+-~aW&#@NMsy=}^oWCN}=-BfaN7r3fH#i)m^jEJF?m4y$my%Nz
zrAQKI<)8nW6{y_X;HI$t)~m1#5D<#*-JjiVcirgq!Do-BcObWZpbOcgT=XArqd#xh
z8fM{7Pdf1=dcZ65Xu$eQ(SxM5GY$k&`ssnEB#7lWkWGVl%GDq#z>i>G9#dn*A>|=a
zuIC<%5M^pmUF?3JtG41~Kt20>KJw+p3vgcRP}>rQo|P;jncEv}<A_E}INV@6V@~*#
z{eB}xjV~&G+u*DNPW8r`ilov(zrxhG$S%S>OjuVmBTWxs7^h9;4D_f|SG19ST61{*
zZP2eOkES0ei3F7?fQ;_k9X$smVvDJb2?4daA#PpKteD(Ue71!<w?3*E6ri0bEeJH#
ztyv8^xxWMjMmAt@06bslE&2s*>ekc5rbLQQqq6iar_o^mvXlkX`PR-$^H$)mH#h^9
z2!tpPYO+3sfF0ituKN|^<}G5lGqfV&!0w9y=LT;!Ky41qApoj`-lBo$+v`){wYpmk
zC_PF5b0~E?(wcD`=nbD4xk!#j8B_k$$kI4xk*V80Z!$*59+`bjmXnq)$EC5iXzUk)
zZrz~sms2K~f;1kCv{}`(+UaE)eB0HeHKUE)^t|Ofb}+OBS{b?YRopdNc;01~wP}L$
z6zK!?J!n<B0R6*>Tm>GxXZFX?q@>TY<w)ee^S_e-2)6u(|8#ET#CQG|+P~s?CfFkB
zW`4}x2&LMHgI%;76RTJuLiqVxyT-m<7P8+JzcFWKUQw^aeQ5}&3Qt%r&dI?6QwN5A
zQD(_U>?;B`h@6(;NyNCJUUiKPz9punH8e_MzhTK>3?c2#ypTi9o{KWC?^k+ZI!skv
z4J%6AeO0^%juSV|MUXEGKKVKrBNg4P+-Z9*pfy37HZ(*A!2r#0C?x_dllJa}5JHEq
zk}gZd+z+$(QJ6oc=Et?%)Q*J|Yjm`()k&AXSDd-_rWK*y|IK4O>BZ!eUwTHZI-`|7
zJ&9ALUMM5wx16er{x~V|jbKl4$A)~}Xuvw;up+SZLvUrM;~)0kT4v(u-y?T%r$G}V
zUIk9N`#GGsCc<6KiH$H54nz3&eaAUMyX=YTJ>s;O9;AJF>PQAmQH~V4(v<o6R@$I7
zX0z|BMkwo7gX?xJxG!H9<^5**vCZN$ti1eX1gAK>tXH8vAn={3%}<Af&ksgha7W5%
zv1$!!xx0>m4TSpqq6{J238u}_F--HcGYH(gTm|Zv9NOK;BfIE{7%bCV;9r%~F>??9
z)3q6~`D$-CwVL975LZ(`_r;=cZp~x0PApJ?4@Ia0>+lJB1jh&wqQM=!c7qG!eEK)~
znxfqRX9S|yO@T}#VX()HC`lVnVLhM;vpP~9=1hAjN2io#g1VEt61@dRWp6j=%+kCQ
z;Iq9WFJR89Q74B}yE+8G;awTvJ=Cy815{O2rI^iWqG$VJ))$V#?TGi@bE~SDboiJJ
zqM^ER_=U4hoyH6mlYg=}JIorMSK_LbGUEA01y#@?EMos6!^vxgay%x`9f#V}7<uzx
zf_=#ES9_yCL%#prFnjea6!h{A#w=;`5$2D<*;-tf2yryTY*c(9tVoOeWo;@8_;=8~
zNQ{_&f?j4&8k_-iA9^c~n~*4G<I~v}rUk_aWN;4Sm8Wr%hJ_(;IfMGqV3y0`4mRI5
zCDhWL`q1aF2wW;#L>_J*IiSu{Vhbn(iII-*tYx*(Y?bW|!D96O-R#s_CnU6roX@IE
zTE{uNDB)9a$vGi;wqG|P&qY@ht8`z_@ZhggAxt+nj>zw3JKP4*I6g56xF+zFW#pWG
zaBtj{jXgmj0!qs7J*wnhutL-bfuv`IGRu2Zm}y(CaA=ecQTo-=eiq@nLyCA|21RQT
z@lx#?zwOWa0s$_wKk7aqEsULiQ|c)U{DwR|EPMZCX$*^<@O(#-)2Zqf)sMUXDte0F
z1Z|s}?DF@gcmckTa)0&tl|L=j8#Ackb>|M|UMx^rM|u>4(#%zpg6nj@(6Hb4tjblY
z<@Ti$NI7bCrn=Czh2YB}Q*56VyVJrkaw|g3vwc1!6ucL@nF_5od!Jgj4@M0_tMTj&
zb*SJwJxKX7&kMC^S&UF!9>3*+ePKETj#aGtBpNx)j1^%JNxRG=aaNuP7`MuehePC`
zn$=OXS8~Z=_mvv|s@#m^Iy62e5@zL%1z(HevImhz@gB`k?Y?=<1K1LaSQG~5#^ctL
zBmW6{QT>0A7YIf`fHjL<Fbg&nT3jnYA9sFMhT@1ckN`+@WuTLF-6du~KcYI6t8Rc+
z>e|<HB3T#3kPT~-D+;q(=eU0^J=+n%4|M_14muUYS)8-9r`fXSvj|Sleh3TLx(Z3X
zaS!<o@h$ys7mRmb8iDqBYtejuh?$soX--dJV)6Vnt9rWrAo;`Rp9YFXm>wNB+&IQ&
ziTRgojv#89uF|u&+?2J0f1cZF4%HH0+zACx*q?j!#ed#(&4inFkQ1*qSd7kxS)w#d
zA+vphyMcSqwUXNXvhh|t{$Oj54G#0K*fV(;f->QIz61CdVXEc;Z4rx_ujGPam_yG<
z+QnZlGR?;>41dqpU)ztuZYg$ePZ8ZlI)`sb^5W5YQ9q<G*;zk|C`Vn0RWrm$t_Bl;
z$JnaEIlo!0sJNN!-8{O?$paVl+LMRBXS1lC7MXB-f^c>bmXtg5>;5>2f6<t$d-*J&
ze#IMRS@?VIAMFb(m<nMginx$!TEVLp!LTY|@$$N!S{<q0g=Aggr))hUq2f+jC)I?&
zO$+`w*IuiTL*2Ic()RF<?J)XO^a)<`xyIWbXp?N_w7G*qY*O?7%}>XbSQAb3+*D8z
zxXL`i^69sncWC~@zI!Kjx}_@l9|zd3<PV*T7K>Ry);su9y8--(56jH3pqU#uxO4en
z5Q=6OtA;a|dz$)fp3WK&nMl*d8MF)qPb>uYX(6n^Z)~?q&Z_qi41Qy4<C=r`?l%Mk
zT{3K}Huw!oO*Z(AUE%T#|M*Q3cH^YMZ^#C}v6N5^eiO?R$iDl{as1mS$ECQW@>mBl
zr{25-Ns2Tc<C}Sc1g2SLvIh0gYt{*H*EWPiP6D}%V|k=-6vjNh75nqx;h{*pj9w@)
zGI}z2jA-q75Ls99cF_MQHdprtxI9Kcz*-v6!O@bz^~5sfWBU3N`Co&9ZG+T>f`&Zc
ztr}v1Jb;x~F5JYyD|M4dtVaU^X1#ZAgf4}{Fb7~12Ef8H0at}iP{p0ZE(RMLWd1IV
z<~@NoU14)b&{<7Q4~~ZkN0t&!&4gHrp%_M?q;k#?!`Jfn$4{F%pg#$gryTjLArg*V
z<eigQxUjG`F+PIMy!a#Hmb{Fe(U|d$%=GTB^#1&d+qb%=8)3w|&O$ri&NRo(Gx5b<
zu{P=FRSS<ieu+PQpY0AW$$5m7Yr-knw>Iwc*IalNwK&}9@{;Cx(f>tgEH>gO{~P!-
zVJcotcM&y6z#ifujf#!DC>HO#m4SsGq;u_d5W-l2J73JcaC|6OMkEz(7!1dTN~}|8
zAqhXOyCZhaIrn8c!oZcUDR9YaNCmM%65MC0AQh2}J{i|m8z~xSl!X(v((g||vqRR_
zSaBm%NO2-IUr?!a<ddlubAUKZ(<5eZSw4?DT6`>@k3hr-s+HJksSl%)-{)w2JT8vW
zJ5>uIL98Wz&0fqa^_lr*41);utUOM^f67hl*sdX+ik=^)hCsB+&WjStTL-eM;;^LH
zzKb330!{RuzIc`RA-3D{+&4Ap*|UA@fm7pdJ;KnB17y^<GJ*F`Vn@1lT#SDAmV2KD
z{#JAanC4BbiTHS#g9#<^kZU9Q4>N;yFLM)VQAv6Ddo<{D=CydRCfShl7DEr?J=@_<
zL(Wg&XmCRQ;VnN_!|J`BV|;|gypP<q5hfGd(Y=dr=KLPDfZ~*79B?P{L3{`|_nGOM
z@2tn998Na1sM)H;2=h1i$&)(!yU>;b9fQ2}5)VUO#euM#>?OK>GII1n9)Wihfjugs
z-;J!w!>PO3W&wIwncb1OzB=y;uiKB%uI3)K5$eilIlh(a%`=%v+T+=QN(Y<~@K#hw
zO&$_~v)H4cfEk}-fw0Dvd{Pt9$3q+$=+)pU$cm7dMl>gAC4{9p4KQ5Xp}@h5F&o!&
zx=DBaTbe9f2pG&VH%y(kp+u-RX84Pbi!uZR!c!6|kh4VVLLgu_=q3RwM~8001^^TI
zjn=^2cA2|z6Ph~7bK*O?l2SWltXH!;nL8ih4v(W=s37y77Xi$v8o(A+Y|9h$5U#H3
z)PSGj9AQ@z418(U&_z>RF^V#;7gG&18KoWtRL0nWP=V!CMsd{jNW%=F!)#4R!*ddq
zTl^vq5yLON+d+-E{LrB&>R%^WnCyf*{2=k4q~F5wcl)07mUEQ+v%|&4^XDzGM<XCp
zsil`iotttNwFI}g%r&-Jcyk|SQ_Kc02-hnirJ!Pj2c9V<b~zuv1nVRMgf-!*kGDW}
z7diJZjcr#(L>B}SabXRCE-)@MZ=bmeJgqj5HmR7!jYvg{(^rzps{6;|Px=-xZ!VqM
zBss+)HxNqNlzXt`8s=%eyK_QAcp1*=fp4+sH-C}^FHQ@=_P#e5iHb}GN*vOt0{M0~
z#veg@!{alf!H0)8VJ(_@ydQ5FqfON9w=W6NPuO0-+)>VJNt5+t&$L}L)_AP<gZ7&{
za`o`0`Zmqa`JD3{>8-%4yf*5R;AeZ74lkILh|3jBTMynrlhE1ct&QT$6#~*_O}{z&
zufJzi$1+0O{b;N){WTJM3n35K&<^#;?aNu3wJR9kO`fUO;%8msj}TLWbt8M7Z>sE2
zDMazQq95ccyMo9s2fOw=FB!g0wDcLOJ7DP#CSy#Or#?Rz`T-#`UfG%C$H4fziKAFP
z&<Hy82CS~cXoXTfgT=9naBIF%PY;UkM;E*8R`*+Pdl-zO(Ky2TVw?9$Q(`oxW6X37
zE9siTGICIcj)@-v$a68x{!ElrbzbeJE5V9=MtUxQk+c?eLLmDlPhgJh@4%4JR$=Rv
z_Kf}$HO=L^ji*j^RKlFC{c$e=>@rdQ(RK7zWI;T$U(+nP6h}A*FiK@DZ5xFOGdC@8
z5?<^Nt%J>kF7ngnnJ$78H?L$KM?di9DK5z-5E%$%NRH@YB}u!P)9SqQRNgY-BP2XS
z({|E_%BKz)y^$cMnm^Ir&u)+CmHpZLB;)bM>*&5!rwF!2t2)m*kR>h9S7*!SDAxHG
zQrOr`d%cCe1_5iZABvL$xs=cPKJzw?E6L&))Bob{)`s|04=D{IV>M5pY7WsB0hTP!
z7_lt^i=Q2%CX{q3;Q$NzE530Od_d}{@Odya8hi*H>#TKZF1!s>Q<(1hA9X!PtaIn_
zrhcpyNCI|y#~v;lI&{n-a)~Lw)#+|IdehhU&27p9#{#arVYegF2PMqH(%E(IYSps?
zj+SagA_<I*vAn<a@W_c!DKUlp7?SJuSYr=;#SE$q0<mBj+o}S(EkeSis?^X=NR-5S
z_Z&d(&-o=kJ^gJYJpOBXH#+Em!(~mATIG0xlqN_3dtoQseOAK7T#2N3`@*k4LQZ5p
z{ZTz3PM&{o?A!qRoBKO>$2v3CxjTBw*LQLYniI=yMNfCs$Dv78d(Mb>rt$U3smGxk
z+651z<~>NkQa1<aq0OrXfIP~dmy?Gh7!}5veD;>q{LRd_itqmZz?bv2FUZ2wjLuOP
z@vd<ZROgWGaj`x<s%J$WZ_3xi5?`s-87(%{7_#jIq8&vh5dAZ#%4X|;&Vw<DC$ATn
zZOaYA0iL1&+^W|IEy?TBb3dY_by6MW!T`rjb`!QjCh22NJyBae#;QpR<1r}aj<G>)
z)QaiB_123#F)7vgYnlhB1<rA5qo3G$j&-x9K^>M$7(pDy4+Cgq>H|<f`ynO{0bs2r
z5hp=F5yw}hZ{sO&-V}R0QeESwIDCc#>#(v!Bnk#5W*o>l7(fl6j*?uFYXE!r$Zm_J
z0(|;{EC@DlKJ18*C2<;CFPCP{Mn(?_bmom$b^wG@3rt28mtf!7flL(;XwjFJO5jC&
zU?Q~T#bEwb1UX)A_9s0v?-0#%k?!itka&W{pEvuC8_C925w73e;RAP@#KfGbS`FlF
zQDgqzk<MT)c$`8!SH*UNgPOlETXH2~x?XGY=$p2ND{W0@g1&_UG|)upe+YEl1l+|h
z)3qMLPa%0^;Sb%N<hv<Z|6WtVI5Lj<R`^f2M}?_$z6SbN97$D)MnE*x(p^o+LUVjA
zDckA@r676%0s(Rcfvy_|7L(3IKG>p^RJaA*wU-Y$R2wk}Z@%z#C=(^ZnKFw%EDf^@
zS^Uv853{l2Bz7ljR%_VM-6~UMAa<3aun)hajh08uMm~}R?5%fmIj_LCF*hVaI^F0p
zvt6;wL_K4oLW;{{y1$a}G$v7-1NASnMpr09S&a8WU(O!Mf<MYlS;MbKZ0oUeL^m^)
z$OqPFa_Hjw{BZG{jCuwuSNMBH8ZK^VsH7%CoN?Xyb}Ye9kH2bkhh`TEPmW2Kn|-ST
zIPYSdS?UFR<Zea5L+T2aby1G<PW@W{Ab;QqH%3qP*&b#zrtw(mOFG_+T{XJ68Q$jZ
zX6R8!kCQp8K(?Wfw_KB%!12)WIt}!<2U3?1Y7F5{x~q|Gq=4V2SJ1D>vtfd>ir7C<
zTkJKGqh3A#%S0_2KJ!2;gIQj7RC5thQx+LM>4&qqqxe3(p6uKsOvH%MRzk0pWPdf_
zOHOMOcNWq_SScdg0qzoj;Gk_x_D3hR6*0aHHuI`MlrwjK4Avf^%?Ny}7ty-AtP1X5
zsE4gaV^A2>q&fgGw|PiMb7APUR8*hB|M<^LjPE`x(OVv1jqLZ<LJLB90Dyh}Nej)E
zYn+WRmv1JT_|eJ&8r!ab3OWW5;b^k5hntXIKwamN-Snk`dP&)kAMEO?NkiB&68&2H
zc7*Y1zcckx06R;hLioF9Ymh1Q$ZHpt%Ds^nF$z#;GKK0Bpq`excV9pzadhfe7V&bM
zDJF=ln0ut?I>ZRtl+`wMZK@gvY(mV_*pW-7%*}S+eAVa@9V)P%`r6#JnmhlZmVuGQ
z^Wa5afIqLLO=f0vz`w@p%%^I0{0_8@a5mmsV5Z%KB(3$7(Wu15^I%_{Wr|-A@ao!N
zM6Pi<rT^)FI|M8V#t;A5OSy3)<=^*GEP(CLD^UbWaTf8rQvIvRr0;tvPX$~8OFfHy
z_|<lP5@*vE#x&L;lsunYHNjVnsE=3^<MhOcB!R@pdx?55YaCTiu40xwaJ${tfTr@S
zlAukRJd@SCR(tWV5r<QV;nO-d2~=luisymMc94_tcG+J<^vxWcLxr<vs#v3;NibfX
zLY?fkZ~o3tp~DqIDb`S}IpuI#CTSp{zQmd5Tzyh@=F@vffh^UvA0_z+A7&E?=C}?A
zOfrb8l^vPx^%fva9=E$N((XQTC)uD@`2Uny!;zjMAIbPeL|ZMil$v)$E_{v9-}~)(
zmfd6;kSG06+9ug&^K=Bsc)7uJEo&798%TULxyRC^Xv4uObPVRNGHjA7Z*4ql<5mrl
zy=@{PA7u`X$n6U;=DUfB+($8+t7DGtjPp>B6wmpHd$x0aOHNG@ElCx>k9VWBdXK*(
zhETxIPZ}*XI?L0Nw}w`)q-OU3{?wF$W`9Kd73Dz+I&VX_1$<kBJ(P-5uB=F-fdMGy
zq~5nOb;k^&B0b+pN}_rNuRj{T!~<QGOVi`au}5bd&3+^#`B5-hk)NNl8bnZbF@2>B
z8BG}oTYNE$0~k02f!spL?xLbK9Q7$4<$+-l5XB&kL*6<s3>lM~_2Q%(q16|OJq;?3
zH<5&R*cnqYPQf1RJ5Iw61KmxSS7CCDmhJ*`{Ow&tOx!HddH{bGNQLc%JG<*1Z~L51
z4whSX!t;~7?;1x7U*<zoJ6r^W5r;lWNr=$08$z1t8=*M)QjFY0xKxdyY=5bTw#i)(
zM&^|ySD5<4uG8&juO&;ngA}LF-jL~s&R$tzC2l-7=hiAg`weS$bSFmXw&4!Sq~BMI
zGGIz&Sw_BviK5;*cwuVqi~jjY*cCAUFV&52;Qs+T!T>u6eTQ9;x0f|%$t#dAz)RVV
zyY2bnLf?E_sx>$EZjh#o6io~DobvCL%->Mc0|AcJh3FO8_TQJVlv$}HiJ;XkTx_5|
zGY%+@ge|ZZmp8uW{x0FxC7OF~Qx@&x{YImNyc5NoLfy{(GBp1?>}UA_S=$o>NH*Rt
z*ga~ISZa^;YF-NXM^*|+ZO=~{&SA;QP>O}NdPvq})k(?&2gDGUbe?(B+l>mNodRE;
zgA{Xa(*Zg2rsCXau$WcJlvwRlVjVkb-#I)O-4x7NKwiy%3AMwdSev|WNlGZ&(65tI
zCK4~#q1DSRN0<D-mEre*?AGnCv%ltIDKXhlR(MvxAE<i;7)^3%R+}ip$>-WiLwzWc
zZFl>g{wsT)56Au}2Ys0qWvMkd8&agE&`{k#96!wW%*W|F_aq^dhQ<=b3p6yADrr3R
zpT^Q_G&aC`aGiPZ9Z&5ZvgZXmx@;nIq?}v-z_w@=R|#RA%5zIB-MC_OG{y5Q0*~C{
z0W&cD=2B_LVWoOSkXA5$48zJ<lgAu}P|BYJ#p7b4#VGcuoDRsS@g92cC+RL@M>xbk
zL~Uw+I=732J>Bf*=h4FxG3FCS#Xt9%z75kESKZ9gLUl}m+7dmb?t)+nc$(osFw~%Z
z!CatGRO5z(*H1LOB%w5*2;ontYiLFnLkcYW$X~W6wyqftgctd6(vc9ORNeNwgP_Oa
zF-<5VVa+o)?7%MLX)3YLo8K6nxI%8aB;$w8wZePoQ~|zUnlo%r=IqVgA7~=|9_aLE
zEyN@@Po3+k=W05ze4fHuU+AMCnKw-(oViD5_};QKo9BBuim~%Pl}k>Te+M%l47lv|
z&0gD)%gBDG!S;z-_gI+$*H8NStrj$+F(o5ZXUq5RyKyH)O^5M=eQ%pmzxiw15_kPm
z+++VQ?jjid&s_vF8oSIhtQICQ<}3;2s)F++Y||a~?P8#sYHK8^;Ht<Wl`h!&tVufD
zD=|wow9>re$|H<;z5VDrM?*_%#pn*^b>21N9HqJM$aYyNc3k4RSJ?&z%ea@eu?fj1
zi(0U7nUWZ&4BJmApZE94ggXo=kXr7U8?6kl63`MovoiT2#8Q7ouSimVyL0jTc@FX+
z@zM%RtdI5W05oh9hV?bg3sA1FO2SvAUSRl5^tG@3vU2g+HZ|E4d)Hyq)<s50{II|(
z2DdQ7*p;+e^kQh#Fg2`xFsJ`n^BQOTc;>gPuN6hKM%J2_vy$vj{ipaJuUYx`UHmUL
z%TM~PdAY;v*6KP<&i=~+n-w+{$Y|zVit*711~dij%v`BDNHs}P4d*jSN$Nddek#NX
z0lwcwpaW7FnKCj`#G`e>h3=K9=y<ADRa@k7H)ma}*BjQlg2k2XiL&K{nGrKt+C);m
z71OpxPW9jL+;7q7*-pzvsoe-VIR_DK^8-UTMv9w_P*<i!>JMO6R5-0i#x-tmL?p!s
zO8}Q%C&$X=vaIpSQ0|bReD~K}X%v;<%|#@nWeL~?hRNC-HKmjxc&&yD3A5)2W}!(w
z9b+tPuwuf<D?64?{)O}hh%iRq=5;~A9qnp}sYuueFPtXk0T>y0>NJnwe;tAD0R=^K
z3%vx`eGhLyFm%KThMn0iE>xMl+Vxi=<1Mz>DSoK}6?(cr3;Vim1Sn58aun^)%5RB?
zJc~F0ZQ5=gfqF_3WVAn{WoDZ4DwXT^oV`i94o#OX5|DUXbk%3CJ5-~(i8iju#de*?
zed$m0Awf6E1k+d)5Sbcuxk_?mF3i-%B*$WGHU+`1MXtIFbC<+3jav#61iEj`;hJmA
ebAtIgj!lyKPBhcquk(D0RRqwBOEBpEqW=Z7YA_N2
literal 0
HcmV?d00001
diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js
index 8759c2b..9b73994 100644
--- a/ui/js/src/kimchi.report_add_main.js
+++ b/ui/js/src/kimchi.report_add_main.js
@@ -1,4 +1,5 @@
kimchi.report_add_main = function() {
+ var reportGridID = 'available-reports-grid';
var addReportForm = $('#form-report-add');
var submitButton = $('#button-report-add');
var nameTextbox = $('input[name="name"]', addReportForm);
@@ -13,12 +14,27 @@ kimchi.report_add_main = function() {
return false;
}
var formData = addReportForm.serializeObject();
- submitButton
- .text(i18n['KCHDR6007M'])
- .prop('disabled', true);
- nameTextbox.prop('disabled', true);
+ kimchi.window.close();
+ var reportGrid = null;
+ $('#' + reportGridID +
'-generate-button').prop('disabled',true);
+ $('#' + reportGridID +
'-remove-button').prop('disabled',true);
+ $('#' + reportGridID +
'-download-button').prop('disabled',true);
+ $('#' + reportGridID +
'-rename-button').prop('disabled',true);
+ $('#' +
reportGridID).find('.grid-body').find('table').find('tr').click(function()
{
+ $('#' + reportGridID +
'-remove-button').prop('disabled',true);
+ $('#' + reportGridID +
'-download-button').prop('disabled',true);
+ $('#' + reportGridID +
'-rename-button').prop('disabled',true);
+ });
+ var textboxValue = $('#report-name-textbox').val();
+ if (textboxValue != "") {
+
$('#available-reports-grid').find('.grid-body-view').find('table').prepend('<tr
id="temp-row"><td>' + textboxValue + '</td><td id
="id-debug-img">' + i18n['KCHDR6007M'] +
'</td></tr>');
+ }
+ else {
+
$('#available-reports-grid').find('.grid-body-view').find('table').prepend('<tr
id="temp-row"><td>' + i18n['KCHDR6012M'] +
'</td><td id ="id-debug-img">' + i18n['KCHDR6007M']
+ '</td></tr>');
+ }
kimchi.createReport(formData, function(result) {
- kimchi.window.close();
+ $('#temp-row').remove();
+ $('#' + reportGridID +
'-generate-button').prop('disabled',false);
kimchi.topic('kimchi/debugReportAdded').publish({
result: result
});
diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl
index 25b81c2..375a37a 100644
--- a/ui/pages/i18n.html.tmpl
+++ b/ui/pages/i18n.html.tmpl
@@ -124,6 +124,7 @@ var i18n = {
'KCHDR6009M': "$_("Remove")",
'KCHDR6010M': "$_("Download")",
'KCHDR6011M': "$_("Report name should contain only letters, digits
and/or hyphen ('-').")",
+ 'KCHDR6012M': "$_("Pending...")",
'KCHVM6001M': "$_("This will delete the virtual machine and its
virtual disks. This operation cannot be undone. Would you like to continue?")",
'KCHVM6002M': "$_("Power off Confirmation")",
--
1.7.1
12:50 p.m.
New subject: [Issue 296 V2 2/2] Added the generating progress indicator
On 06/05/2014 10:08 AM, Wang Wen wrote:
Have the generating progress indicator added, which will be removed
after
generating progress finished.
---
ui/css/theme-default/host.css | 7 +++++++
ui/css/theme-default/report-add.css | 9 +--------
ui/images/theme-default/progress.gif | Bin 0 -> 9889 bytes
ui/js/src/kimchi.report_add_main.js | 26 +++++++++++++++++++++-----
ui/pages/i18n.html.tmpl | 1 +
5 files changed, 30 insertions(+), 13 deletions(-)
create mode 100644 ui/images/theme-default/progress.gif
diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css
index a040204..583f360 100644
--- a/ui/css/theme-default/host.css
+++ b/ui/css/theme-default/host.css
@@ -215,6 +215,13 @@
width: 200px;
}
+#id-debug-img {
+ background: url(../../images/theme-default/progress.gif) 7px
+ center no-repeat;
+ background-size: 15px 15px;
+ padding-left: 26px;
+}
+
/* End of Debug Report */
/* Software Updates */
diff --git a/ui/css/theme-default/report-add.css b/ui/css/theme-default/report-add.css
index 236029a..3e52f63 100644
--- a/ui/css/theme-default/report-add.css
+++ b/ui/css/theme-default/report-add.css
@@ -12,11 +12,4 @@
box-sizing: border-box;
margin: .5em 0;
width: 100%;
-}
-
-#button-report-add[disabled] {
- background: #c0c0c0 url(../../images/theme-default/loading.gif) 7px
- center no-repeat;
- color: #DDD;
- padding-left: 26px;
-}
+}
\ No newline at end of file
diff --git a/ui/images/theme-default/progress.gif
b/ui/images/theme-default/progress.gif
Where is this new file from? Be sure we
haven't license issue.
new file mode 100644
index 0000000000000000000000000000000000000000..35aeccba8b624c67acce4242ee139dc48ef97302
GIT binary patch
literal 9889
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
literal 0
HcmV?d00001
diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js
index 8759c2b..9b73994 100644
--- a/ui/js/src/kimchi.report_add_main.js
+++ b/ui/js/src/kimchi.report_add_main.js
@@ -1,4 +1,5 @@
kimchi.report_add_main = function() {
+ var reportGridID = 'available-reports-grid';
var addReportForm = $('#form-report-add');
var submitButton = $('#button-report-add');
var nameTextbox = $('input[name="name"]', addReportForm);
@@ -13,12 +14,27 @@ kimchi.report_add_main = function() {
return false;
}
var formData = addReportForm.serializeObject();
- submitButton
- .text(i18n['KCHDR6007M'])
- .prop('disabled', true);
- nameTextbox.prop('disabled', true);
+ kimchi.window.close();
+ var reportGrid = null;
+ $('#' + reportGridID +
'-generate-button').prop('disabled',true);
+ $('#' + reportGridID +
'-remove-button').prop('disabled',true);
+ $('#' + reportGridID +
'-download-button').prop('disabled',true);
+ $('#' + reportGridID +
'-rename-button').prop('disabled',true);
+ $('#' +
reportGridID).find('.grid-body').find('table').find('tr').click(function()
{
+ $('#' + reportGridID +
'-remove-button').prop('disabled',true);
+ $('#' + reportGridID +
'-download-button').prop('disabled',true);
+ $('#' + reportGridID +
'-rename-button').prop('disabled',true);
+ });
+ var textboxValue = $('#report-name-textbox').val();
+ if (textboxValue != "") {
+
$('#available-reports-grid').find('.grid-body-view').find('table').prepend('<tr
id="temp-row"><td>' + textboxValue + '</td><td id
="id-debug-img">' + i18n['KCHDR6007M'] +
'</td></tr>');
+ }
+ else {
+
$('#available-reports-grid').find('.grid-body-view').find('table').prepend('<tr
id="temp-row"><td>' + i18n['KCHDR6012M'] +
'</td><td id ="id-debug-img">' + i18n['KCHDR6007M']
+ '</td></tr>');
+ }
kimchi.createReport(formData, function(result) {
- kimchi.window.close();
+ $('#temp-row').remove();
+ $('#' + reportGridID +
'-generate-button').prop('disabled',false);
kimchi.topic('kimchi/debugReportAdded').publish({
result: result
});
diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl
index 25b81c2..375a37a 100644
--- a/ui/pages/i18n.html.tmpl
+++ b/ui/pages/i18n.html.tmpl
@@ -124,6 +124,7 @@ var i18n = {
'KCHDR6009M': "$_("Remove")",
'KCHDR6010M': "$_("Download")",
'KCHDR6011M': "$_("Report name should contain only letters,
digits and/or hyphen ('-').")",
+ 'KCHDR6012M': "$_("Pending...")",
'KCHVM6001M': "$_("This will delete the virtual machine and its
virtual disks. This operation cannot be undone. Would you like to continue?")",
'KCHVM6002M': "$_("Power off Confirmation")",
7:47 p.m.
New subject: [Issue 296 V2 2/2] Added the generating progress indicator
On 06/05/2014 10:50 AM, Hongliang Wang wrote:
On 06/05/2014 10:08 AM, Wang Wen wrote:
> Have the generating progress indicator added, which will be removed
> after
> generating progress finished.
> ---
> ui/css/theme-default/host.css | 7 +++++++
> ui/css/theme-default/report-add.css | 9 +--------
> ui/images/theme-default/progress.gif | Bin 0 -> 9889 bytes
> ui/js/src/kimchi.report_add_main.js | 26 +++++++++++++++++++++-----
> ui/pages/i18n.html.tmpl | 1 +
> 5 files changed, 30 insertions(+), 13 deletions(-)
> create mode 100644 ui/images/theme-default/progress.gif
>
> diff --git a/ui/css/theme-default/host.css
> b/ui/css/theme-default/host.css
> index a040204..583f360 100644
> --- a/ui/css/theme-default/host.css
> +++ b/ui/css/theme-default/host.css
> @@ -215,6 +215,13 @@
> width: 200px;
> }
>
> +#id-debug-img {
> + background: url(../../images/theme-default/progress.gif) 7px
> + center no-repeat;
> + background-size: 15px 15px;
> + padding-left: 26px;
> +}
> +
> /* End of Debug Report */
>
> /* Software Updates */
> diff --git a/ui/css/theme-default/report-add.css
> b/ui/css/theme-default/report-add.css
> index 236029a..3e52f63 100644
> --- a/ui/css/theme-default/report-add.css
> +++ b/ui/css/theme-default/report-add.css
> @@ -12,11 +12,4 @@
> box-sizing: border-box;
> margin: .5em 0;
> width: 100%;
> -}
> -
> -#button-report-add[disabled] {
> - background: #c0c0c0 url(../../images/theme-default/loading.gif) 7px
> - center no-repeat;
> - color: #DDD;
> - padding-left: 26px;
> -}
> +}
> \ No newline at end of file
> diff --git a/ui/images/theme-default/progress.gif
> b/ui/images/theme-default/progress.gif
Where is this new file from? Be sure we haven't license issue.
I have made a
new icon that based on Kimchi logo. Thx for the kindly tip
> new file mode 100644
> index
> 0000000000000000000000000000000000000000..35aeccba8b624c67acce4242ee139dc48ef97302
> GIT binary patch
> literal 9889
> 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
>
> literal 0
> HcmV?d00001
>
> diff --git a/ui/js/src/kimchi.report_add_main.js
> b/ui/js/src/kimchi.report_add_main.js
> index 8759c2b..9b73994 100644
> --- a/ui/js/src/kimchi.report_add_main.js
> +++ b/ui/js/src/kimchi.report_add_main.js
> @@ -1,4 +1,5 @@
> kimchi.report_add_main = function() {
> + var reportGridID = 'available-reports-grid';
> var addReportForm = $('#form-report-add');
> var submitButton = $('#button-report-add');
> var nameTextbox = $('input[name="name"]', addReportForm);
> @@ -13,12 +14,27 @@ kimchi.report_add_main = function() {
> return false;
> }
> var formData = addReportForm.serializeObject();
> - submitButton
> - .text(i18n['KCHDR6007M'])
> - .prop('disabled', true);
> - nameTextbox.prop('disabled', true);
> + kimchi.window.close();
> + var reportGrid = null;
> + $('#' + reportGridID +
> '-generate-button').prop('disabled',true);
> + $('#' + reportGridID +
'-remove-button').prop('disabled',true);
> + $('#' + reportGridID +
> '-download-button').prop('disabled',true);
> + $('#' + reportGridID +
'-rename-button').prop('disabled',true);
> + $('#' +
>
reportGridID).find('.grid-body').find('table').find('tr').click(function()
> {
> + $('#' + reportGridID +
> '-remove-button').prop('disabled',true);
> + $('#' + reportGridID +
> '-download-button').prop('disabled',true);
> + $('#' + reportGridID +
> '-rename-button').prop('disabled',true);
> + });
> + var textboxValue = $('#report-name-textbox').val();
> + if (textboxValue != "") {
> +
>
$('#available-reports-grid').find('.grid-body-view').find('table').prepend('<tr
> id="temp-row"><td>' + textboxValue + '</td><td id
="id-debug-img">' +
> i18n['KCHDR6007M'] + '</td></tr>');
> + }
> + else {
> +
>
$('#available-reports-grid').find('.grid-body-view').find('table').prepend('<tr
> id="temp-row"><td>' + i18n['KCHDR6012M'] +
'</td><td id
> ="id-debug-img">' + i18n['KCHDR6007M'] +
'</td></tr>');
> + }
> kimchi.createReport(formData, function(result) {
> - kimchi.window.close();
> + $('#temp-row').remove();
> + $('#' + reportGridID +
> '-generate-button').prop('disabled',false);
> kimchi.topic('kimchi/debugReportAdded').publish({
> result: result
> });
> diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl
> index 25b81c2..375a37a 100644
> --- a/ui/pages/i18n.html.tmpl
> +++ b/ui/pages/i18n.html.tmpl
> @@ -124,6 +124,7 @@ var i18n = {
> 'KCHDR6009M': "$_("Remove")",
> 'KCHDR6010M': "$_("Download")",
> 'KCHDR6011M': "$_("Report name should contain only letters,
> digits and/or hyphen ('-').")",
> + 'KCHDR6012M': "$_("Pending...")",
>
> 'KCHVM6001M': "$_("This will delete the virtual machine and
its
> virtual disks. This operation cannot be undone. Would you like to
> continue?")",
> 'KCHVM6002M': "$_("Power off Confirmation")",
3613
days inactive
3613
days old
4 comments
3 participants
participants (3)
-
Hongliang Wang -
Wang Wen -
Wen Wang