From 7514eb31a914a777c8ea9317e20625ca45471300 Mon Sep 17 00:00:00 2001
From: Gaetan Delannay <gaetan.delannay@gmail.com>
Date: Fri, 2 Sep 2011 09:59:49 +0200
Subject: [PATCH] appy.pod: bugfix in html2odt: in some situations, while using
 stylesMappings, some empty tags were present in the result, producing a
 superflous empty paragraph; bugfix while importing PNG files under Windows;
 appy.gen: began to implement a new global Appy-specific page template and
 styles.

---
 gen/__init__.py                        |   2 +
 gen/plone25/generator.py               |   7 ++-
 gen/plone25/skin/appy.css              |  21 +++++++
 gen/plone25/skin/logo.jpg              | Bin 0 -> 5359 bytes
 gen/plone25/skin/template.pt           |  78 +++++++++++++++++++++++++
 gen/plone25/templates/frontPageAppy.pt |   5 ++
 gen/utils.py                           |  17 ------
 pod/doc_importers.py                   |   2 +-
 pod/xhtml2odt.py                       |   3 +
 9 files changed, 114 insertions(+), 21 deletions(-)
 create mode 100644 gen/plone25/skin/appy.css
 create mode 100644 gen/plone25/skin/logo.jpg
 create mode 100644 gen/plone25/skin/template.pt
 create mode 100644 gen/plone25/templates/frontPageAppy.pt

diff --git a/gen/__init__.py b/gen/__init__.py
index 71b421b..aa79818 100644
--- a/gen/__init__.py
+++ b/gen/__init__.py
@@ -2605,6 +2605,8 @@ class Config:
         # frontPage = True will replace the Plone front page with a page
         # whose content will come fron i18n label "front_page_text".
         self.frontPage = False
+        # You can choose the Plone or Appy main template
+        self.frontPageTemplate = 'plone' # or "appy"
         # If you don't need the portlet that appy.gen has generated for your
         # application, set the following parameter to False.
         self.showPortlet = True
diff --git a/gen/plone25/generator.py b/gen/plone25/generator.py
index 19b80c8..18539ba 100644
--- a/gen/plone25/generator.py
+++ b/gen/plone25/generator.py
@@ -159,8 +159,7 @@ class Generator(AbstractGenerator):
         self.generateTool()
         self.generateInit()
         self.generateTests()
-        if self.config.frontPage:
-            self.generateFrontPage()
+        if self.config.frontPage: self.generateFrontPage()
         self.copyFile('Install.py', self.repls, destFolder='Extensions')
         self.generateConfigureZcml()
         self.copyFile('import_steps.xml', self.repls,
@@ -566,6 +565,8 @@ class Generator(AbstractGenerator):
     def generateFrontPage(self):
         fp = self.config.frontPage
         repls = self.repls.copy()
+        template = 'frontPage.pt'
+        if self.config.frontPageTemplate== 'appy': template = 'frontPageAppy.pt'
         if fp == True:
             # We need a front page, but no specific one has been given.
             # So we will create a basic one that will simply display
@@ -582,7 +583,7 @@ class Generator(AbstractGenerator):
             page, macro = fp.split('/')
             repls['pageContent'] = '<metal:call use-macro=' \
                                    '"context/%s/macros/%s"/>' % (page, macro)
-        self.copyFile('frontPage.pt', repls, destFolder=self.skinsFolder,
+        self.copyFile(template, repls, destFolder=self.skinsFolder,
                       destName='%sFrontPage.pt' % self.applicationName)
 
     def generateTool(self):
diff --git a/gen/plone25/skin/appy.css b/gen/plone25/skin/appy.css
new file mode 100644
index 0000000..c575df5
--- /dev/null
+++ b/gen/plone25/skin/appy.css
@@ -0,0 +1,21 @@
+body {
+  font: 75% Lucida,Helvetica,Arial,sans-serif;
+  background-color: #EAEAEA;
+}
+
+a {text-decoration: none; color: #747171;}
+a:visited {color: #840107;}
+table { font-size: 100%; border-spacing: 0px; }
+
+.main {
+  width: 900px;
+  background-color: white;
+  border-style: solid;
+  border-width: 1px;
+  border-color: grey;
+  box-shadow: 3px 3px 3px #A9A9A9;
+}
+
+.top { height: 80px; margin-left: 3em; vertical-align: top;}
+.lang { margin-right: 3px; }
+.auth { background-color: grey;}
diff --git a/gen/plone25/skin/logo.jpg b/gen/plone25/skin/logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5cf038f229b8bf578009ccfbfdcc313ca863cc34
GIT binary patch
literal 5359
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
a;?)fkqi!?%zQT~<3x&)g_Uw&^BmV--ACsH_

literal 0
HcmV?d00001

diff --git a/gen/plone25/skin/template.pt b/gen/plone25/skin/template.pt
new file mode 100644
index 0000000..c0b8c10
--- /dev/null
+++ b/gen/plone25/skin/template.pt
@@ -0,0 +1,78 @@
+<html metal:define-macro="main"
+      tal:define="user context/portal_membership/getAuthenticatedMember;
+                  isAnon python: user.getUserName() == 'Anonymous User';
+                  app python: tool.getParentNode();
+                  appUrl app/absolute_url;
+                  _ python: tool.translate;
+                  req python: request;
+                  resp req/RESPONSE;
+                  x python: resp.setHeader('Content-Type', 'text/html;;charset=utf-8');
+                  x python: resp.setHeader('Expires', 'Thu, 11 Dec 1975 12:05:00 GMT+2');
+                  x python: resp.setHeader('Content-Language', request.get('language', 'en'))">
+
+<head>
+  <title tal:content="tool/getAppName"></title>
+  <link rel="stylesheet" tal:attributes="href string:$appUrl/skyn/appy.css" type="text/css">
+</head>
+
+<body>
+<table class="main" align="center">
+ <tal:comment replace="nothing">Top banner</tal:comment>
+ <tr class="top" metal:define-slot="top">
+  <td>
+   <table width="100%">
+    <tr valign="top">
+     <tal:comment replace="nothing">Logo</tal:comment>
+     <td><img src="skyn/logo.jpg"/></td>
+     <tal:comment replace="nothing">Language selector (links or listbox)</tal:comment>
+     <td align="right"
+         tal:define="appLangs app/portal_languages/listSupportedLanguages;
+                     defLang python: app.portal_languages.getLanguageBindings()[0];
+                     suffix python: req.get('ACTUAL_URL').split('/')[-1];
+                     asLinks python: len(appLangs) &lt;= 5"
+         tal:condition="python: len(appLangs) &gt;= 2 and (suffix not in ('edit', 'query', 'search'))">
+      <table tal:condition="asLinks">
+       <tr>
+        <td tal:repeat="lang appLangs">
+          <a class="lang"
+             tal:attributes="href python: req.get('ACTUAL_URL')+'/switchLanguage?set_language=%s' % lang[0];
+                             title python: app.portal_languages.getNameForLanguageCode(lang[1])"
+             tal:content="python: lang[0]"></a>
+         </td>
+        </tr>
+      </table>
+      <select tal:condition="not: asLinks"
+              tal:attributes="onchange string:window.location='${context/absolute_url}/switchLanguage?set_language=' + this.options[this.selectedIndex].value">
+       <option tal:repeat="lang appLangs"
+               tal:content="python:app.portal_languages.getNameForLanguageCode(lang[0]) or lang[1]"
+               tal:attributes="selected python:defLanguage == lang[0];
+                               value python:lang[0]">
+       </option>
+      </select>
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+ <tal:comment replace="nothing">The login strip</tal:comment>
+ <tr class="auth">
+  <td>
+   <table witdh="100%">
+    <tr>
+     <td>a  </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+ <tr>
+   <td><span metal:define-slot="content"><span tal:content="isAnon"></span></span></td>
+ </tr>
+</table>
+
+<br/>
+<h1>Appy</h1>
+<h2>Sub appy</h2>
+<h3>Sub sub appy</h3>
+<p>Hello</p>
+</body>
+</html>
diff --git a/gen/plone25/templates/frontPageAppy.pt b/gen/plone25/templates/frontPageAppy.pt
new file mode 100644
index 0000000..b543829
--- /dev/null
+++ b/gen/plone25/templates/frontPageAppy.pt
@@ -0,0 +1,5 @@
+<tal:main define="tool python: context.<!toolInstanceName!>">
+<html metal:use-macro="context/skyn/template/macros/main">
+  <div metal:fill-slot="content"><!pageContent!></div>
+</html>
+</tal:main>
diff --git a/gen/utils.py b/gen/utils.py
index 1340091..62fd2ee 100644
--- a/gen/utils.py
+++ b/gen/utils.py
@@ -213,23 +213,6 @@ class Keywords:
             return op.join(self.keywords)+'*'
         return ''
 
-# ------------------------------------------------------------------------------
-class FakeBrain:
-    '''This class behaves like a brain retrieved from a query to a ZCatalog. It
-       is used for representing a fake brain that was generated from a search in
-       a distant portal_catalog.'''
-    Creator = None
-    created = None
-    modified = None
-    review_state = None
-    def has_key(self, key): return hasattr(self, key)
-    def getPath(self): return self.path
-    def getURL(self, relative=0): return self.url
-    def _unrestrictedGetObject(self): return self
-    def pretty_title_or_id(self): return self.Title
-    def getObject(self, REQUEST=None): return self
-    def getRID(self): return self.url
-
 # ------------------------------------------------------------------------------
 CONVERSION_ERROR = 'An error occurred while executing command "%s". %s'
 class FileWrapper:
diff --git a/pod/doc_importers.py b/pod/doc_importers.py
index 50807ec..4e366ab 100644
--- a/pod/doc_importers.py
+++ b/pod/doc_importers.py
@@ -145,7 +145,7 @@ pxToCm = 44.173513561
 def getSize(filePath, fileType):
     '''Gets the size of an image by reading first bytes.'''
     x, y = (None, None)
-    f = file(filePath)
+    f = file(filePath, 'rb')
     if fileType in jpgTypes:
         # Dummy read to skip header ID
         f.read(2)
diff --git a/pod/xhtml2odt.py b/pod/xhtml2odt.py
index 202ade7..aa636c6 100644
--- a/pod/xhtml2odt.py
+++ b/pod/xhtml2odt.py
@@ -454,6 +454,9 @@ class XhtmlParser(XmlParser):
         currentElem, elemsToReopen = e.onElementEnd(elem)
         # Determine the tag to dump
         startTag, endTag = currentElem.getOdfTags(e)
+        if currentElem.isConflictual:
+            # Compute the start tag, with potential styles applied
+            startTag = e.getTags((currentElem,), start=True)
         if currentElem.isConflictual and e.res.endswith(startTag):
             # We will not dump it, it would constitute a silly empty tag.
             e.res = e.res[:-len(startTag)]