From 543a2e41270820d823be728ec1a2cc62ff017df1 Mon Sep 17 00:00:00 2001 From: helmutm Date: Mon, 28 Jul 2008 12:35:24 +0000 Subject: [PATCH] work in progress: handle videos integrated as external access (xa) objects git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@2776 fd906abe-77d9-0310-91a1-e0d9ade77398 --- browser/form.py | 7 ++++++- browser/loops.css | 2 +- integrator/content/browser.py | 1 + integrator/content/view_macros.pt | 11 +++++------ locales/de/LC_MESSAGES/loops.mo | Bin 6632 -> 6675 bytes locales/de/LC_MESSAGES/loops.po | 5 ++++- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/browser/form.py b/browser/form.py index a853125..a89423c 100644 --- a/browser/form.py +++ b/browser/form.py @@ -71,13 +71,18 @@ class ObjectForm(NodeView): template = ViewPageTemplateFile('form_macros.pt') customMacro = None formState = FormState() # dummy, don't update! - isInnerHtml = True + #isInnerHtml = True def __init__(self, context, request): super(ObjectForm, self).__init__(context, request) # target is the object the view acts upon - this is not necessarily # the same object as the context (the object the view was created for) self.target = context + #self.registerDojoForm() + + @Lazy + def isInnerHtml(self): + return bool(self.request.form.get('dialog')) def closeAction(self, submit=False): if self.isInnerHtml: diff --git a/browser/loops.css b/browser/loops.css index 6226b14..28389ad 100644 --- a/browser/loops.css +++ b/browser/loops.css @@ -224,7 +224,7 @@ img.notselected { margin: 1em 0 1em 0; } -.button a, .button a:visited { +.button a:link, .button a:visited { padding: 2px 4px 2px 4px; background-color: #e8e8e8; text-decoration: None; diff --git a/integrator/content/browser.py b/integrator/content/browser.py index 741c437..46b5586 100644 --- a/integrator/content/browser.py +++ b/integrator/content/browser.py @@ -59,4 +59,5 @@ class FlashVideo(ConceptView): @Lazy def startName(self): + # HTML file has the same name as the directory it is in. return self.adapted.address + '.html' diff --git a/integrator/content/view_macros.pt b/integrator/content/view_macros.pt index 6bb1136..383a960 100755 --- a/integrator/content/view_macros.pt +++ b/integrator/content/view_macros.pt @@ -3,13 +3,12 @@
-

- Title -

-

- +
+ Open Resource + tal:attributes="href string:$baseUrl/xa/${item/startName}">Play Movie
diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index f9293a5d3240bf6925e3826346b33161f2a9a961..5cdcd1db978551b99c41e5cf3ff4f057a2f2b148 100644 GIT binary patch delta 2175 zcmXxkTTB#J9LMn^E)3gs1w=qxu2D*gRZ&*Kc&W*Xf>ji-TJVCatg?#tV7yOn52h)x zWQq?yh^A@cOIwm{Xe=$hDAuHj)fi*bYGO>pOKsA4iMKTU{>)**e?Mo=%$)!KoHN6{ z3NP&58sqCW9PLCNacHD5>i8>#AC7XrG0SlpPQp*n!SApT`!F4^<0u?LhA>YsfX{8e z?=54pIM2XrEJZH4W*!aYs=+i|hK<;QshB_|{24RxJdVK|sKgIZiC?3}@sm~k>8SgQ z?fDEG%lSgg!PPj9{ALdg4fut<(1W`1N6g3HFasZ;4__mdn-OHCX#%LkIjDjQa5R>p zo|}m(sK)j;q4Kq17WvIV8bRzr-PnUl(2Gj=6Dq+u4CA1^{tES6GCxY3iFz&%wPJ6h z3YcP@k1DJIRd^I#CD=xTvCM8PK^IlXH>iR7PzeUG94{iPZJyifBNUtFU zGh6u4+kP1Jd3B*Ca0c~G3|N0fQkkpRg6|Te_nK3vL_eSk>qjlwB~;?; zw*M9?@!zPKI{YYcKGJ2vr~+zH<8QS6AE65G#(=*6Z)s?+&Y}{Z!?`$!T4EogYRQAB z|7>}vB`rc-FGIH7RNy#_pzdFTDts$y{C&3n2x?0^F`NA6EDhcGJ8Hn2Sci8}1J9sb z6;_SxmRW*Yi57dl88y=bsKUOooaD&>LwkJ>mEZ}^L5JyR z;036J>rex3vgg}S_jh0zkK#M{3u?wgI1L}!^FjtwAtk7l4Ck```Yx;J&`ejL_PiA} zlijGqhj1o-hWeM>Z~Om1CAw`Lvi*-xFXL0x#2j7}J~Hz@Q9!8JmBfTMqtn>v-A@Sx zH_@sk^t#k}8BVBVGp*sHl}4pK`4CG96|>f>cS6ZqX)W}2Ihp>YwDc*rc%4p8aT6^a z9}w#at+$R9#4IB2U2rD&7tx9mtG$1nLU#$R;bSU|bwtc|=)a7PYC^C1DngstOz3kM zK9<==5^66Sh$^C3>*J#IXPX delta 2141 zcmXxkTWnNC7{KxAb-UUNw7|9$C{3vr5G-s{N&u^1xe9Hq7pPXC6$Be&QV9=UvLRmL zi-EA|gHdV|1fpn7td<9BVrpXQB_>9RMhHG=VvT)30}sfH|G!R8_S@f_*>mRmX6BsD zHch27SIYAT14loxfH;yDf*s!!^2M<@8A1ov;&L3o1P);hp2b=C1s3Cv$PnQ-ycMTn z|23S;dCn~%%)=DYl?f|pn5zZLuob(o9gFZZn(#fWz>lyTC(*>0(8SZ|I5%Ry*}Z-? zdR;xv!DdY14y+`9=%e9)&&MB*qZgjTg*cA0@n_7(X{7S-7xD==`7&{WDlE7ZOEHDs zcNP$shV@l;AP+!sBRyVKm{pXo3&03CH5^f1>wYM-%69;(f*Fip@g{ zSQKqU3)_em-ia9#^w408(2Mo>G+M|YI?!1(!3Z|uh1frZZrN2VKu4z;3emlugWk6c z&6CFewi@|_)>78rN_KHpjos)CN6`y2$S1tQ*D@SLm+muk!0*w-KgIJa=!}2G6?h#T zw~i{kt`*(dws_uM#`-(+eRMeBQ)uM_X#cCo^ArZr!iLf7-oZO?1bquGp(}M0O_ay- zX%g)(L&r;@<1E3J9E!})xR;KDl)VnmqZj;+%ke7C#|2EA$%HlN@0-z;Xy?nPycd0~ zj-nHI4Sg0)N8d+Mg$uYBC(*6SG;p^SHls^(7rG@~@q9136-UtPo_31O{wzAdlUU&UKSaaCZ{r3$k1p{a=#u}9{-foP#U(93e=kF} zJ5*vNHlWwvgBIR_J_9|mzYpEg0pt^g_$nrU_?U(RPT(&58ZBr(<+4qo7F~g+c)lK; zVLMvT;pj8yeJ`Meyo8RMMdlFRL?7l4(G~a4di2WmI zqOs_B?4Lj%!mrSoT}Ixnu$@>$SnPvD9pTYStR^;uY;K~w@aVUE+ zQJ36IYah{_%_*wM?4UJs+)1N{cszF0ME$eyF@K0~Q}+J$h!=iNevg)VI0+0=GW2mjD0& diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po index 2e1a03e..bcc94c9 100644 --- a/locales/de/LC_MESSAGES/loops.po +++ b/locales/de/LC_MESSAGES/loops.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: $Id$\n" "POT-Creation-Date: 2007-05-22 12:00 CET\n" -"PO-Revision-Date: 2008-01-23 12:00 CET\n" +"PO-Revision-Date: 2008-07-28 12:00 CET\n" "Last-Translator: Helmut Merz \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -80,6 +80,9 @@ msgstr "Glossareintrag anlegen..." msgid "Create Glossary Item" msgstr "Glossareintrag anlegen" +msgid "Play Movie" +msgstr "Video abspielen" + msgid "Favorites" msgstr "Lesezeichen"