diff --git a/gen/generator.py b/gen/generator.py index ecd05fa..9520c8c 100644 --- a/gen/generator.py +++ b/gen/generator.py @@ -397,6 +397,7 @@ class ZopeGenerator(Generator): # Some global i18n messages poMsg = msg(app, '', app); poMsg.produceNiceDefault() self.labels += [poMsg, + msg('app_name', '', msg.APP_NAME), msg('workflow_state', '', msg.WORKFLOW_STATE), msg('appy_title', '', msg.APPY_TITLE), msg('data_change', '', msg.DATA_CHANGE), diff --git a/gen/installer.py b/gen/installer.py index 4527e8c..68f21d9 100644 --- a/gen/installer.py +++ b/gen/installer.py @@ -124,7 +124,11 @@ class ZopeInstaller: zopeName = name if hasattr(zopeFolder.aq_base, zopeName): continue f = file(j(root, name)) - if ext in gen.File.imageExts: + if zopeName == 'favicon.ico': + if not hasattr(self.app, zopeName): + # Copy it at the root. Else, IE won't notice it. + manage_addImage(self.app, zopeName, f) + elif ext in gen.File.imageExts: manage_addImage(zopeFolder, zopeName, f) elif ext == '.pt': manage_addPageTemplate(zopeFolder,zopeName,'',f.read()) diff --git a/gen/po.py b/gen/po.py index b3305a4..91fd74e 100644 --- a/gen/po.py +++ b/gen/po.py @@ -26,6 +26,7 @@ fallbacks = {'en': 'en-us en-ca', class PoMessage: '''Represents a i18n message (po format).''' CONFIG = "Configuration panel for product '%s'" + APP_NAME = "Appy" # The following messages (starting with MSG_) correspond to tool # attributes added for every gen-class (warning: the message IDs correspond # to MSG_). diff --git a/gen/ui/appy.css b/gen/ui/appy.css index 875c8b9..b445ee7 100644 --- a/gen/ui/appy.css +++ b/gen/ui/appy.css @@ -115,8 +115,7 @@ img { border: 0; vertical-align: middle} .objectTitle { font-size: 11pt; border-bottom: 3px solid grey; font-weight: bold;} .by { padding-top: 5px;} -.workflow { text-align: center; border-top: 1px solid grey; - background-color: #ececec } +.workflow { text-align: center; border-top: 1px solid grey } .underTitle { background-color: #e9e9e9 } .objectNavigate { margin-top: 3px;} .underline { border-bottom: 1px dotted grey;} diff --git a/gen/ui/close.png b/gen/ui/close.png new file mode 100644 index 0000000..3eb5e55 Binary files /dev/null and b/gen/ui/close.png differ diff --git a/gen/ui/favicon.ico b/gen/ui/favicon.ico new file mode 100644 index 0000000..d3eddeb Binary files /dev/null and b/gen/ui/favicon.ico differ diff --git a/gen/ui/template.pt b/gen/ui/template.pt index da3ab80..86a6235 100644 --- a/gen/ui/template.pt +++ b/gen/ui/template.pt @@ -19,7 +19,8 @@ tal:attributes="dir python: tool.getLanguageDirection(lang)"> - + +