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 f9293a5..5cdcd1d 100644 Binary files a/locales/de/LC_MESSAGES/loops.mo and b/locales/de/LC_MESSAGES/loops.mo differ 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"