From 42b4f2b16db76ee80be8068d702937f9ea2fb8b2 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Wed, 20 Oct 2010 15:41:56 -0700 Subject: [PATCH] Better template for DataForm email, with 1 table for each tab (or untab). Fixes bug #11921. --- docs/changelog/7.x.x.txt | 1 + docs/templates.txt | 9 +++++++-- .../packages-7.10.4/default_email.wgpkg | Bin 1142 -> 1158 bytes 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index b32b5923e..26b9c9cd4 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,5 +1,6 @@ 7.10.4 - fixed #11920: Defaul DataForm emails missing entries. + - fixed #11921: DataForm emails contain 1 table per field 7.10.3 - fixed #11903: Unnecessary debug in Thingy diff --git a/docs/templates.txt b/docs/templates.txt index a08bec1d1..c374449ac 100644 --- a/docs/templates.txt +++ b/docs/templates.txt @@ -1,11 +1,17 @@ This is a running list of template changes made during upgrades. If you have copied the default templates, you will need to apply these changes manually to your copies. +7.10.3 + + * DataForm email template - default_email + Do HTML escaping on field values. Move table tags outside of the loops so only one table + is generated. + 7.10.3 * Carousel Default Template - root/import/carousel/carousel-default Add a height parameter to the template. - + * survey.css Removed relative positioning and offset from top. @@ -16,7 +22,6 @@ templates, you will need to apply these changes manually to your copies. * root/import/workflow-activity-templates Added a folder to hold the assorted Workflow Activity templates. - 7.10.2 * The Make Page Printable template has changed (as per bug #11857). The HTML diff --git a/docs/upgrades/packages-7.10.4/default_email.wgpkg b/docs/upgrades/packages-7.10.4/default_email.wgpkg index 9255e2ecfd3fbcb6c978a08c7a69ce379829cb3a..77ec097929f6af1c08be1106bd2750c4ab8493e6 100644 GIT binary patch literal 1158 zcmV;11bO=(iwFP!00000|Ls?8Z`(Ey_UHTxLBqZ+jwHV*_S^tzUh1SxYAnt=Y#s{Q zVr(WfsghI@Z|HyTk(5RGB^j{V%RWQ~Y?*hwJ3c2q4^^#f{|bU2jvJLq5QK3f(7!=g zuU9HwaRrqytT*CjGmfLE;)P*QYg9a#vi&QQ3JEA_#3^BSPv^@d7V>GcUKCtrapw0K z*Z-5rR2{l+dmBX6Tglmm3Wey+CiMG>{x=&@ywv}CEofFeKy&-ow)$V)e(9UY@b?aE zLSHH_&=~t(+xz3spUhAyc#4H0Sn5&ZraeajBZZToI%bQPbFE+haZ(dU5t`G z8p|FU-9b30cp)W!U|3wkzCJUy@@f{QuS`TzVwF$oy;ZOtvw@1Q{f4VB6Vw!);2V@t z^%+kQq0UTXmm~>h#wRR~_XJm5%~A_WY0YE7vlM_#h_bUHH%(zEW)5U$D7?J``#oSC zg@zP+BTQ+El7z7Fn}J^&_+~_=Xk zZV0A{xrOn8vX+cdETy$oiM)X2o@&3`MVMdhoD`v>8ie)`C1VDO1Q}11u3`+F%yk(* z9G~hBj7c@47)FNBQH=vjc8yazcljAg>=%goCM~A(WH{JflhrED$L^GVH)=2Fsiv!$fG%aQtT>D?6 zYyat(;gC-Sz0JD22u)*CR4D;bCC5FK7%8W!bcOt#%r0KFr15nZzyifalzFy z0wIu>XliNe6CS?1K5MrRHDk8h{W(1qx}as_f+qwXDNDj(v>!L&co^1QOhuGc4FA}& zsCTl+qB$l0O0ZRk*v%zU6Q$lp%M>f`NP5W?q#hwfEG&MBf&s6r|4*4UbeWMKAEls~ z_hs2KI&nq*vZR*Ie?0m@@)dIF?&TNB7CWJG@8TF}KL5!FdkAuTmPWZzaJLO_((I_nyj?Pwr=Xz`^C}n2wxM&5k zI6;1-yHJ)>+L!{;xoX`m5KQ#Yk$hU=>f+?A`>8tux}s?1dX zTDgjj77SX5p4rZuI?3c+EwU`>)_>YrSH!AfZKb;|;dgbobZT+C7PFCp+RHTuBbl&i(hUB!kRL?mBZJxeqZjV6>~~aey>pl%)5M=gS4=;&HQD6kK|7`u8)g z-;znA_U*U1^@8f1VCfS9h3Jh2^!t(iH=-ck=zl%*!iodc-2b(&{#W-8{V6j1djOlz z6_Rl@#;((H{`~6)J(O{lVJ-<4YE-)^&k@H+;^gf@jk=+$ot1$iA07ur@{&D!*>iAV@6i%Gq=64s+P(CX_bvIuidHRuF?L^+io z@Dveh%|x7&B*Cfn@yp{q&LoqI%oL@x<}qh^28B$BG_wLbO=1AEEM$Agom$6y57M^6 z`GGQ)IUfn8iN5WqaWtgZ8DUB@lq4h_zZtmUz||unLnAX1z{rsC1amNZ@MlI6If45l z@B4uZaR$<4$Ww}iFgdD3T)}d?DqrEk^{;YHRw05ALO6($aS8!B8Be6jHU>^+D&2Rd zUG;%6Ar}X0Uf+No8z{0LCm!;V4nfOr9eq9LXor`4{3ttJ7BgbzSo#}P*g zM=5XDQ=iY~H7+`@F0e{^c5`yvJ9~59zq%{{JRq9mBDJbiO`1Bujp~Z2nQBH&cf;H* z`=u&YZXdX;nl}kbiv>f~EVW$&!{(&wbM#$d(0N|I_ZG?v_TPf|+Gn76R@4se*d0&O z3FbuJa@yr=+CvZK`b&CR>4K7tE0z#=WDE)W!BO1s{KzYjp(N5MhI?vQ z)Hz#c(Sj0xBiJZJZ1E7Gh*DA9CdG<-l3gQx>(F4ywoq6{?i zp)6ZkCvM0;CUxM2rRW*rpgbDWBSmVp6oG7)jEGC7^vr1RnxYX=6liO$r4DObvl%y= zQ5=+>5{@5;fI6Hm^&tF*6KqIWCK9!akE??uWLcRX4c9jkuun)f>~b^%d>XYg4kB9y>!g{FKZ0v2lcQSHJS~Z5r`RtvVeE^ z^U?WTJ(|Mtk=|W5551G$|Co=h^NQLEeCpNd)4`{Mr+77cjqzH6*9yE=V6PSU4|jTZ Ii~tq@0MAQ2&;S4c