From cc11480d6dc508d7b302a75219f2b5292eb79e50 Mon Sep 17 00:00:00 2001 From: Kaleb Murphy Date: Mon, 16 Mar 2009 15:59:20 +0000 Subject: [PATCH] Added Edit Survey loading mask to reduce loading confusing on slow connections. --- docs/changelog/7.x.x.txt | 2 +- ...ot_import_survey_default-survey-edit.wgpkg | Bin 1593 -> 1670 bytes lib/WebGUI/Asset/Wobject/Survey.pm | 5 ++- www/extras/wobject/Survey/administersurvey.js | 2 ++ www/extras/wobject/Survey/editsurvey/comm.js | 2 ++ www/extras/wobject/Survey/surveyedit.css | 34 ++++++++++++++++++ 6 files changed, 41 insertions(+), 4 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 88ee9a3c0..5aa123840 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -15,7 +15,7 @@ - fixed #9943: Upgrade script fails with Payment Gateways - fixed #9948: Data form cannot be deleted. - fixed #9950: Wrong var in help for thread - + - added Survey now has a loading mask on Survey edit ajax calls. 7.6.14 - fixed: IE6 shows Admin Bar over Asset Manager - fixed #9808: Search i18n diff --git a/docs/upgrades/packages-7.7.0/root_import_survey_default-survey-edit.wgpkg b/docs/upgrades/packages-7.7.0/root_import_survey_default-survey-edit.wgpkg index 1b2f5d2bece02739acac5e2ae9d93709292311e7..844aafa6e30eb799a5af9d04be33f3991a791dea 100644 GIT binary patch literal 1670 zcmV;126_1(iwFP!000001MOICa~d}g_UHVHD<5z&<3nH|6nt^UP3*)I+jU~QNv3W* z;!c2qPP#}s2ubtbyOOvUz;4RVo;QE$QvmTdl)Dvc$mh7%l)$ldb3M>odR=f;`$|Kw-2ZWPaE z*M7HZAC=&1vH>_gZnX-(8wn;3ockM%W~aU6|5mfv-17bv6gTDn+M2-IFq^LrzzY?n zg~UTr@p|5`zwOweM2dt+O^Gt2cAA+PN`f_sewvxlO0!}o8v?^hAAU}R1nPlZ!&Am` zGGv*y{3}V?XH<`j+xYOfA!TK~OU;5=B?pi76-YN)dS+Eh|DkYl&YH99`n! z>O!m((ep(w-dvp>g_=cILy`EO-khZ3=J`P(J(bKdmqKVnV`Cdqshp4*ipT(`O#AMy zPa>*|byU5iQAD_1+$fKqOQD6HB@T&_p+hOsEy|E<(c4`aP41$lA$!-_C6c~E6K5@f@Aj3LU)E^vU6ZSyt%MYJlYG8Ta_`%-ht9HMm%F~ zCO%XO#AOqV1$`0Cysuu2<&g4Tea}m96j44jpWm{H0kW*}h50z6eC$cWfWMsqVMR1p zy&}^aNiu+09}Z1)sE4zZqJBzQga!bRa!)^|yap;h+5;9Smlmu+ip5SLHKrV%IJRGF zl{FRpk0jK{d1W4_CN9@1Wh5p&T1L=wUw4MNyMdNxRV2oh&P znAursGdvQa7K#`dXJFWBLPiuC38lgR=qXOM0BXXBCe?nbwcu3~&6q;!S0k*k5~&PH z)tppSCWb>8jtNhzk|_FxR28HwBL)H?tEr}pn%%5=dVE&phI1bndA?uxS%s1&dLei| z;t6)c5E4p;w}w#88|7bce3~fQhsd=||GALDU{rkCh+Vs=GV-YWXEWk*r=t98GlEQT zAoJJ^dl#dyt(Z{Vj0h9z$UHW~-X#%oug!>Xxry9sGa_8ZqjLKHsi1u0`g{4mwBbh4 zx^jMru`$P$852^hzlm*P&Ub;&7?q}w*a0ObXf@pEA7jSz}e1zWiXCy#H=WFL;? zd0~=ALqsPYjbK)c)!4_3EmST+PG$m|g2gw}?2ZqVe7lDdZF%AXn>jsGDB}giFby%B zTT7EY@5D)~)oPidwhlx~LKprA`9HHJTNhxDLoo*i(kReyRNhRm^lYJW3>9X@8Gkzs z&NZCdm@_QvaIJy=yy&Wd6-%{btJ~ahRi>#Q@xJ$a#swByW$3_DL@6jeYoJ#RM^K#o z%&pLCUFQCDkn-?}$&ytu?N0k{F=#HQFr=ij)V5G8@^k+XMc~tJp%U# Q{Ff2<1E@p;Hvk*}0Q#*jJ^%m! literal 1593 zcmV-92FCdxiwFP!000001MOH_a~d}k_H%xP$^%Yj4C1z?VB(D9OU%@vNo*(S)J;b0 z3Q*XUHj)-X(){-xNxSSC?53Tdy9`TCLXhyq%p|t={%(`7c^N zwViss?s@xOquKO!5PaA7cMvSu{*x$8B#0Ihtzr`0%kW2ZP!b-aocp~O=>J8q($@2L zvtz#Nt?DNw_=ZFU!2MP$_j?ux&i!>uyzPIl)~M|uu;%ukZTY{tebG0;;oBqdLP=>M z$(WW<7ybUno*jy%h^f?!Dl=-QnVBI``t(aIq^7}^b{ZEHV(Od)0p+Xa8B3AG{ovH_w3ch+aGFMOm|3qk0i_RbxXGPf zL^VMZt>X&)oUqx`o6@o1nsQya0^T&|on<(NTDS{0Whu%+o}VDnH+p4pEAx znGWgUJ34%E-A5n#03jb9V58{{z&Gb$%Ej5Ey4K&dN!s#MT#5GVnSDTj#mVW;TYVC-T@r5O#){!v|! zi4av^MA*21z=q<7RN;wG8vKo)kwgoi#v#?TJWR9}ylkSDFi7EYKr~Szkv=V(^Qat( z@fe09%9FCBihZSJ1xXxIqr8yiM6-~YJ*)h(KPYp9JOm(Asbt<&zGSh!6)>O3jJRP4 z110@C!)A$$mtSy1n#eiqVYm9fvdERi`KOK14Kpg*92fs=gW1xVc=@#rHYOynd2IvS z#U*SYCOo&nzyvoouWf+4q`~fI8w^|~V)wHR1}?jCG1dQuO}at-yG&o%QiEVK*}Vd5 z6mjLnmf<1UqG;PZ+$ppfF8Oh@zS;F~TJ+rTo~;~ws6rKN(+JL#iaBK~aLC#MBlSH& z9BLJq!GfNK^Wo!+NMujtJ`_(S#DaTiu$`0JMMuD9*?{grz2z#4D)3t=l3JbSo-3bB zVMGqmpH7?`?Sx<>q^MF*QB^^nDhZ(e_>}|pjfN>phL%nAc{0^EoL_35RP$DH>t_=Cx>6ABfM;Qws)5m$2x2DuBlS1@^ICs1-tQy44Q zxwy(|YC}E^s*DKvgiS&n=FJA<6Dpa$mf@Kc(JOE!cO6NgiGd24rrlyGzd5McTZHWX zAV;*F-|>X-@v<*0^kX)1Ok-i&9+y4cu8qHL_bTgrmTjbIKVOP~jTrQgu2E|4x4pX8 zDD;|XGxe5H*HE@|VQjZz7oNCo54ns$r;u*>G}u$(fzZIlw;hmUmD8Cr^NqPzDRz^& zgu>JknvG5;Uu7(j*lx8%V(71D#U9wyE?1@l`>}Mf>EEQCcaOok-SexL7whI@>O%O_ z%n!FZccxN{SloiQi~h5;PN&`Jc-*5 diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index 95282db7c..ce32730a9 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -377,7 +377,6 @@ Loads the initial edit survey page. All other edit actions are ajax calls from t sub www_editSurvey { my $self = shift; - return $self->session->privilege->insufficient() if !$self->session->user->isInGroup( $self->get('groupToEditSurvey') ); @@ -398,7 +397,7 @@ See L. sub www_submitObjectEdit { my $self = shift; - + return $self->session->privilege->insufficient() if !$self->session->user->isInGroup( $self->get('groupToEditSurvey') ); @@ -674,7 +673,7 @@ If undef, the address is pulled form the form POST. sub www_loadSurvey { my ( $self, $options ) = @_; my $editflag = 1; - +sleep(2); my $address = defined $options->{address} ? $options->{address} : undef; if ( !defined $address ) { if ( my $inAddress = $self->session->form->process('data') ) { diff --git a/www/extras/wobject/Survey/administersurvey.js b/www/extras/wobject/Survey/administersurvey.js index a91b42696..4d4218568 100644 --- a/www/extras/wobject/Survey/administersurvey.js +++ b/www/extras/wobject/Survey/administersurvey.js @@ -353,6 +353,7 @@ if (typeof Survey === "undefined") { } else { document.getElementById('questions').style.display = 'inline'; +console.log(2); Survey.Form.addWidgets(qs); } lastSection = s.id; @@ -361,6 +362,7 @@ if (typeof Survey === "undefined") { document.getElementById('headertitle').style.display = 'block'; document.getElementById('headertext').style.display = 'block'; document.getElementById('questions').style.display = 'inline'; +console.log(3); Survey.Form.addWidgets(qs); } }, diff --git a/www/extras/wobject/Survey/editsurvey/comm.js b/www/extras/wobject/Survey/editsurvey/comm.js index a4c4b760d..dce40eb8d 100644 --- a/www/extras/wobject/Survey/editsurvey/comm.js +++ b/www/extras/wobject/Survey/editsurvey/comm.js @@ -6,6 +6,7 @@ Survey.Comm = new function(){ var callMade = 0; var request = function(sUrl,callback,postData){ + YAHOO.util.Dom.setStyle('mask-all','display','block'); if(callMade == 1){ alert("Waiting on previous request"); }else{ @@ -15,6 +16,7 @@ Survey.Comm = new function(){ } this.callback = { success:function(o){ + YAHOO.util.Dom.setStyle('mask-all','display','none'); callMade = 0; Survey.Data.loadData(YAHOO.lang.JSON.parse(o.responseText)); }, diff --git a/www/extras/wobject/Survey/surveyedit.css b/www/extras/wobject/Survey/surveyedit.css index 3ff5260fc..21ea03b2d 100644 --- a/www/extras/wobject/Survey/surveyedit.css +++ b/www/extras/wobject/Survey/surveyedit.css @@ -1,4 +1,38 @@ +#loading-mask { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + z-index: 20000; + background-color: white; + opacity:0.6; + filter:alpha(opacity=60); +} + +#loading { + position: absolute; + left: 50%; + top: 50%; + padding: 2px; + z-index: 20001; + height: auto; + margin: -35px 0 0 -30px; +} + +#loading .loading-indicator { + background: url(/extras/yui/rel_interstitial_loading.gif) no-repeat; + color: #555; + font: bold 13px tahoma,arial,helvetica; + padding: 18px 80px; + margin: 0; + text-align: center; + height: auto; + z-index: 20002; +} + + div.testarea { width: 200px; height: 100px;