From 494d97c53fc92d2020454f87a245b57ef0fd51c7 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Sat, 5 Sep 2009 14:56:16 -0700 Subject: [PATCH] Fix the carousel in the Story. Bug #10915 Add a template variables for the photoWidth from the Story's Archive. Document the new template variable, with i18n. Modify both Archive and Topic templates. --- docs/changelog/7.x.x.txt | 1 + .../root_import_storymanager_storytemplate.wgpkg | Bin 0 -> 2106 bytes ..._import_storymanager_storytemplatetopic.wgpkg | Bin 0 -> 1813 bytes lib/WebGUI/Asset/Story.pm | 1 + lib/WebGUI/Help/Asset_Story.pm | 1 + lib/WebGUI/i18n/English/Asset_Story.pm | 6 ++++++ 6 files changed, 9 insertions(+) create mode 100644 docs/upgrades/packages-7.8.0/root_import_storymanager_storytemplate.wgpkg create mode 100644 docs/upgrades/packages-7.8.0/root_import_storymanager_storytemplatetopic.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 433175139..69094db2f 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -14,6 +14,7 @@ - fixed #10902: Shelf asset is whiny - fixed #10879: Collaboration System Thread lose attachments - fixed #10876: EMS Schedule displaying wrong dates for ticket events + - fixed #10915: StoryManager: Carousel clips content 7.7.19 - fixed #10838: Forwarded forum post email to new CS adds reply to original thread diff --git a/docs/upgrades/packages-7.8.0/root_import_storymanager_storytemplate.wgpkg b/docs/upgrades/packages-7.8.0/root_import_storymanager_storytemplate.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..919ecdbfbfe8b6a36e5a17d445ee9b14f493bdb6 GIT binary patch literal 2106 zcmV-A2*vjwiwFP!00000|Ls}pZ`(K$&*%Ls1b?q7veM1X2Dp0MnCv%Er5Avcq?aqvRp z@cj>#{*_3mbjQ;iShe(%-3o@tSqg?Qu3dJZcL^hh!Oitcyf@nf@v^)0w(UdCkC}r90NpS8e zKcI{?{ywODnNjf;%I%4XS&&4PuzrhxUS|KZkbZ@zKONMskWog{CH?2Zil?Ov>6`o) zbu50HyiX6Wd(U4L>dni&L!SbLNHDsBbJby~t{NR(gH|cYpbiQ1rL0V=% zG6rAcHg*-wNT%hDNBP*Zn(<5to=8{>k2`j)-WIc)Xa@CDf`A)FmuK1&P+fooD`ieH zN1llyof;A{NI1_Ud^ph`LnS7Y7l&u(lZkt#?NLl6)IFhz#4n^QhF)8U5Evb(Z+2Qk zL+w$IB7;&ZBPa96xq4!4G$bw4>?-x_Xv5GM4R&HOoNHyB65!Vb6nrS~G*GMd2rcqf zluDP*9!*8m0huTo#MK`VM^XB=WXf$~jBvII3+Wb8dD_&U6kxfE;KN{dA?HxGs6R zvb&FXl8`C%BwD44^eJuy^P2dExsvc1?yemmH2sC8x%K*JxDC;dX-wn-Y_`F*Nz)W! zB2O1kcqDjPgPrPOMOjEM%SWykA3-4?V7~zIcALvXmdz82TPz8=A{kQy8I(s|)5@1i zWtKt#JtDdGT+MbP-H&F-m_WE8!tn7x$PzJ&)t}C9GU0FwE)+}J&osPJ z&S;z7JcvGeW?F>4C(6b+`Y8h38W|ao?sKZzM;1CZa{d@)MS8&`nwVbHUS70`4=temF_c z^M|7a$>xp23%HK${G;V(WnG+`l@l{B58J3$02UBXyra{Olr76Ag_?p^Awm}3dXL?17#Kbr>Hi$9GJUAE}9PADHfkuMfzzO8p&*eC(DHs4J zVWi{|B5)@hyp!xX7pd_^ARHz}W)4+OrBH)FvPPGHE@sA07-i46grean>uUk2zn>*w zGqAZ0=etc}nEt$m*6>eY(+X?}k?BTU8ng}pDs>%_!-u{xz{IzW7q%)D7UJ=6?eeXoQ0E(uDZdtjI+h+tep3XB1CMWoK1Vgdo4W8X z!=81nVSYFu*?{g8LnHuoAF^ z;`$w-Mh`3JC6KEea%@94W#;Gcp<}w{@UVA6CCq?q69(Ln4Q~E~u*}DI-3FU1?l|a< zGR&bh1-)nPGa?-H-d#ql%?trV*&jUuF!h~7Cl8v+Az-Z(SD{katyL1${AK z6Z}=U37z1N$<=0j=b*ncc-#-b4PXesb5^}8zC6B~zrOyvI{XkzH4w%8oX@>_t_!#N k>0h@${qX5Feo4RQaqoe958Qj;|H}ja0YkR31pp`j034DGZ~y=R literal 0 HcmV?d00001 diff --git a/docs/upgrades/packages-7.8.0/root_import_storymanager_storytemplatetopic.wgpkg b/docs/upgrades/packages-7.8.0/root_import_storymanager_storytemplatetopic.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..3cad2f860e5b60d7b4726528efbfaa215d759362 GIT binary patch literal 1813 zcmV+w2kQ7AiwFP!00000|Ls_9ZxcBX?q`0*Dj!ghxV*J#Xc{8*3S4_vpwJX_y52?3 zu9Nt>S+8tw(t!ByHy(S}-c52Gf(oQ-BuMJk|7kXx-EL=RM}Hse<9BNx zzJub^+-bGioo1(V(A{tE1g%!H-Q5X*r+Bx{3bNKx) zTYn@HTHSL0@9*L7{rcaMC*R0Wka%FveZ%>;_L}YL`S0(wAPpdzcmKJo^RM5%>EA-b z#|Ll;Yl_a(m?%0TN|A6jr-_oapcnk{=VPQx#RZvCe<>9_r9v@^8&Qmw6ceeQ-=JELXmThhsEK}FX;HPkT0wwYs8D__&Big4Ga5N!LYMDZ67eN+H64N8DnU*u ziH2k#At}%Ts7ESJKN9^TFprU zQ4;2lJf@1LEOaIlDXFqDhvR4AyYun*Lvq2IXH9YYX3{=+zrqOG(+zd;7q ziD6@tAS8*_H|VDWCo1HL5jV1m;f|;Nb(C(~-BL$~D^9`qU z)VCh($dZ^!85BAnPSuh1(U7!G!*s|o{rHRYCmSa$2lkXp$T48`wcCq0m|}alVFf=I>tp7p#@iIq$>}o|LZJK zR3t<(o{)G~SF9j2)W^sAc0M`^obQ%0WOF(QDy(G64aewG=kO!QflaD^Ug=X@*F0WX z?h_uzWDF%%n^e+1MpkfdlUzSnVjd!Qs ziy0Io3GvmlTluo0E~Mw>Bh{Nvpb!x7Ux0ecR^%Z|rZGhpOG2qg#?(Lo`Bm4n{8OYd zn?uDtA*qgB#do9KkV>wXdA50-tJ2?Pb>}cB4xoUpRS^`7RIRV58htjO22zBjii3Nv zuf%Kzo!lE>cl%GY)+w-(u#X zjiTPONX-UPtzz9om-?@sk)&^zwWx>F9t9^JlAWPP3gUx|!apj(@}W`2|N zS2+wRSa^{~hJvL~5sH=Hk56B}u4jtH_2&y1;p;rn#TS0Pg-K$ydtEb^z!l`j!6ZvU zT|0wax_A_Pbi%X>oyj3FS0;EGz!)AF9gyx*s_G|}wo&p&7{ll9m}KLa_JUUM>CsVH zdM>#xXcAGeyOl0yd|9HFL_yo~1L2C7(dMR~qHg9xi*^s2)|USI8(l5Ah$K{tO5?w= zl*+t-HN?{FEVH3Ytj(I11FRqe=)y(&%gw?G$IbC9nNh(M^o|#T&o2ms&&>KBJiz(- z6%6<|?7yeuU#`x2J)CZOy`e>WPNbesEWWF`w}2+T3*;{XZZ~4JlNm{-n~UHL9SIv4F5*xXM;tY$^e=sj40>C3~+!Fp??{xU` zJa^AG90oQ(vIZoVuq>0$=!9gkIq!P;0MU@eBH0y?^x0TbWOWH`kHn`X?l>S5Wu+5srYNc}ua zEmxZYqON&`WfD`rG)Y_CKFlmUbfEETL1rP+A;s?sG4Vy?d%?>puH80fe;K%}N-a(q zCes2bZh(7V2rY{i?6Tf9;HnKjMEf<*3$9uzGPRF)oh*5KvzWfTUF`kz_JGh8zc@Kx zx}8j3t|U~jYMq3>gzux9Iun-YyzW>?803ZMW D|L}{hasPhotos} = $photoCounter; $var->{singlePhoto} = $photoCounter == 1; $var->{canEdit} = $self->canEdit; + $var->{photoWidth} = $archive->get('photoWidth'); return $var; } diff --git a/lib/WebGUI/Help/Asset_Story.pm b/lib/WebGUI/Help/Asset_Story.pm index e42314d59..214747381 100644 --- a/lib/WebGUI/Help/Asset_Story.pm +++ b/lib/WebGUI/Help/Asset_Story.pm @@ -85,6 +85,7 @@ our $HELP = { }, ], }, + { name => 'photoWidth', }, { name => 'hasPhotos', }, { name => 'singlePhoto', }, { name => 'photo_loop', diff --git a/lib/WebGUI/i18n/English/Asset_Story.pm b/lib/WebGUI/i18n/English/Asset_Story.pm index d49ad7524..1b7e2ce79 100644 --- a/lib/WebGUI/i18n/English/Asset_Story.pm +++ b/lib/WebGUI/i18n/English/Asset_Story.pm @@ -418,6 +418,12 @@ our $I18N = { lastUpdated => 0, }, + 'photoWidth' => { + message => q|The width of photos, set in the Story Archive for this Story.|, + context => q|Template variable|, + lastUpdated => 0, + }, + 'hasPhoto' => { message => q|This template variable will be true if the a photo in the photo_loop has an image in it.|, context => q|Template variable|,