[fc] Repository: Products.CMFPlone

Branch: refs/heads/master Date: 2016-02-22T15:36:58+01:00 Author: Guido A.J. Stevens (gyst) <guido.stevens@cosent.nl> Commit: plone/Products.CMFPlone@5ced858 move hero to content fixes plone/Products.CMFPlone#974 requires plone/plonetheme.barceloneta#83 Files changed: M CHANGES.rst M Products/CMFPlone/browser/configure.zcml M Products/CMFPlone/browser/templates/plone-frontpage.pt D Products/CMFPlone/browser/templates/hero.pt Repository: Products.CMFPlone Branch: refs/heads/master Date: 2016-02-22T17:08:28+01:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/Products.CMFPlone@a74391d Merge pull request #1374 from plone/hero_in_content move hero to content Files changed: M CHANGES.rst M Products/CMFPlone/browser/configure.zcml M Products/CMFPlone/browser/templates/plone-frontpage.pt D Products/CMFPlone/browser/templates/hero.pt
plone · Feb 22, 2016 · 106ea86 · 106ea86
1 parent c965d59
commit 106ea86
Showing 1 changed file with 149 additions and 89 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,136 +1,196 @@
-Repository: plonetheme.barceloneta
+Repository: Products.CMFPlone
 
 
 Branch: refs/heads/master
-Date: 2016-02-22T16:52:44+01:00
+Date: 2016-02-22T15:36:58+01:00
 Author: Guido A.J. Stevens (gyst) <guido.stevens@cosent.nl>
-Commit: https://github.com/plone/plonetheme.barceloneta/commit/0b849a181603c417d468dd9c7a689ac6b8d8ba96
+Commit: https://github.com/plone/Products.CMFPlone/commit/5ced85888673e0491c5388e32d0624fa168a1769
 
 move hero to content
 fixes https://github.com/plone/Products.CMFPlone/issues/974
-requires https://github.com/plone/Products.CMFPlone/pull/1374
+requires https://github.com/plone/plonetheme.barceloneta/pull/83
 
 Files changed:
 M CHANGES.rst
-M plonetheme/barceloneta/theme/index.html
-M plonetheme/barceloneta/theme/rules.xml
+M Products/CMFPlone/browser/configure.zcml
+M Products/CMFPlone/browser/templates/plone-frontpage.pt
+D Products/CMFPlone/browser/templates/hero.pt
 
 diff --git a/CHANGES.rst b/CHANGES.rst
-index 16e8e2f..43a42ac 100644
+index a5edf71..b545021 100644
 --- a/CHANGES.rst
 +++ b/CHANGES.rst
-@@ -11,6 +11,10 @@ New:
+@@ -28,6 +28,10 @@ New:
 
  Fixes:
 
-+- Move hero to content
++- Move hero on welcome page from theme into managed content.
 +  Issue https://github.com/plone/Products.CMFPlone/issues/974
 +  [gyst]
 +
- - Add ``barceloneta-mixin-font`` to the registerless profile.
-   [pcdummy]
+ - Get ``email_from_name`` from the mail settings registry.
+   Fixes https://github.com/plone/Products.CMFPlone/issues/1382
+   [tmog]
+diff --git a/Products/CMFPlone/browser/configure.zcml b/Products/CMFPlone/browser/configure.zcml
+index c1bec77..2b70f9e 100644
+--- a/Products/CMFPlone/browser/configure.zcml
++++ b/Products/CMFPlone/browser/configure.zcml
+@@ -213,13 +213,6 @@
 
-diff --git a/plonetheme/barceloneta/theme/index.html b/plonetheme/barceloneta/theme/index.html
-index 313f387..e5ec563 100644
---- a/plonetheme/barceloneta/theme/index.html
-+++ b/plonetheme/barceloneta/theme/index.html
-@@ -33,6 +33,12 @@
-         <div id="mainnavigation">
-         </div>
-       </div>
-+      <div id="hero" class="principal">
-+        <div class="container">
-+          <div class="gigantic">
-+          </div>
-+        </div>
-+      </div>
-       <div id="above-content-wrapper">
-           <div id="above-content">
-           </div>
-diff --git a/plonetheme/barceloneta/theme/rules.xml b/plonetheme/barceloneta/theme/rules.xml
-index fe53605..4eb0c70 100644
---- a/plonetheme/barceloneta/theme/rules.xml
-+++ b/plonetheme/barceloneta/theme/rules.xml
-@@ -33,8 +33,10 @@
-   <!-- move global nav -->
-   <replace css:theme-children="#mainnavigation" css:content-children="#portal-mainnavigation" method="raw" />
+   <browser:page
+       for="*"
+-      name="hero"
+-      permission="zope.Public"
+-      template="templates/hero.pt"
+-      />
+-
+-  <browser:page
+-      for="*"
+       name="footer"
+       permission="zope.Public"
+       template="templates/footer.pt"
+diff --git a/Products/CMFPlone/browser/templates/hero.pt b/Products/CMFPlone/browser/templates/hero.pt
+deleted file mode 100644
+index d6871aa..0000000
+--- a/Products/CMFPlone/browser/templates/hero.pt
++++ /dev/null
+@@ -1,18 +0,0 @@
+-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+-      xmlns:tal="http://xml.zope.org/namespaces/tal"
+-      xmlns:metal="http://xml.zope.org/namespaces/metal"
+-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+-      lang="en"
+-      tal:omit-tag=""
+-      i18n:domain="plone">
+-
+-<div class="principal" role="complementary">
+-    <div class="container">
+-        <div class="gigantic">
+-          <h1 i18n:translate="">Welcome!</h1>
+-          <p><a href="http://plone.com" class="context" role="button" target="_blank" i18n:translate="">Learn more about Plone</a></p>
+-        </div>
+-    </div>
+-</div>
+-
+-</html>
+\ No newline at end of file
+diff --git a/Products/CMFPlone/browser/templates/plone-frontpage.pt b/Products/CMFPlone/browser/templates/plone-frontpage.pt
+index 75abc2e..e64e70c 100644
+--- a/Products/CMFPlone/browser/templates/plone-frontpage.pt
++++ b/Products/CMFPlone/browser/templates/plone-frontpage.pt
+@@ -7,7 +7,14 @@
+     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ </head>
 
--  <!-- include view @@hero on homepage only -->
--  <after css:theme="#mainnavigation-wrapper" css:content=".principal" href="/@@hero" css:if-content="body.template-document_view.section-front-page" />
-+  <!-- move hero to top -->
-+  <replace css:theme-children="#hero .gigantic" css:content-children=".hero"/>
-+  <drop css:theme="#hero" css:if-not-content=".hero" />
-+  <drop css:content=".hero" />
-
-   <!-- full-width breadcrumb -->
-   <replace css:content="#viewlet-above-content" css:theme="#above-content" />
+-<body i18n:translate="front-text"><p class="discreet">
++<body i18n:translate="front-text">
++
++  <div class="hero">
++    <h1>Welcome!</h1>
++    <p><a class="context" href="http://plone.com" target="_blank">Learn more about Plone</a></p>
++  </div>
++  
++  <p class="discreet">
+ If you're seeing this instead of the web site you were expecting, the owner of
+ this web site has just installed Plone. Do not contact the Plone Team or the
+ Plone support channels about this.
 
 
-Repository: plonetheme.barceloneta
+Repository: Products.CMFPlone
 
 
 Branch: refs/heads/master
-Date: 2016-02-22T17:08:21+01:00
+Date: 2016-02-22T17:08:28+01:00
 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
-Commit: https://github.com/plone/plonetheme.barceloneta/commit/d3838e12bb5185b3e81837b453195e59032149b3
+Commit: https://github.com/plone/Products.CMFPlone/commit/a74391d0f0cc90595760c9f5e6b2a5626d62aff7
 
-Merge pull request #83 from plone/hero_in_content
+Merge pull request #1374 from plone/hero_in_content
 
-move hero to content, refs https://github.com/plone/Products.CMFPlone…
+move hero to content
 
 Files changed:
 M CHANGES.rst
-M plonetheme/barceloneta/theme/index.html
-M plonetheme/barceloneta/theme/rules.xml
+M Products/CMFPlone/browser/configure.zcml
+M Products/CMFPlone/browser/templates/plone-frontpage.pt
+D Products/CMFPlone/browser/templates/hero.pt
 
 diff --git a/CHANGES.rst b/CHANGES.rst
-index 16e8e2f..43a42ac 100644
+index a5edf71..b545021 100644
 --- a/CHANGES.rst
 +++ b/CHANGES.rst
-@@ -11,6 +11,10 @@ New:
+@@ -28,6 +28,10 @@ New:
 
  Fixes:
 
-+- Move hero to content
++- Move hero on welcome page from theme into managed content.
 +  Issue https://github.com/plone/Products.CMFPlone/issues/974
 +  [gyst]
 +
- - Add ``barceloneta-mixin-font`` to the registerless profile.
-   [pcdummy]
+ - Get ``email_from_name`` from the mail settings registry.
+   Fixes https://github.com/plone/Products.CMFPlone/issues/1382
+   [tmog]
+diff --git a/Products/CMFPlone/browser/configure.zcml b/Products/CMFPlone/browser/configure.zcml
+index c1bec77..2b70f9e 100644
+--- a/Products/CMFPlone/browser/configure.zcml
++++ b/Products/CMFPlone/browser/configure.zcml
+@@ -213,13 +213,6 @@
 
-diff --git a/plonetheme/barceloneta/theme/index.html b/plonetheme/barceloneta/theme/index.html
-index 313f387..e5ec563 100644
---- a/plonetheme/barceloneta/theme/index.html
-+++ b/plonetheme/barceloneta/theme/index.html
-@@ -33,6 +33,12 @@
-         <div id="mainnavigation">
-         </div>
-       </div>
-+      <div id="hero" class="principal">
-+        <div class="container">
-+          <div class="gigantic">
-+          </div>
-+        </div>
-+      </div>
-       <div id="above-content-wrapper">
-           <div id="above-content">
-           </div>
-diff --git a/plonetheme/barceloneta/theme/rules.xml b/plonetheme/barceloneta/theme/rules.xml
-index fe53605..4eb0c70 100644
---- a/plonetheme/barceloneta/theme/rules.xml
-+++ b/plonetheme/barceloneta/theme/rules.xml
-@@ -33,8 +33,10 @@
-   <!-- move global nav -->
-   <replace css:theme-children="#mainnavigation" css:content-children="#portal-mainnavigation" method="raw" />
+   <browser:page
+       for="*"
+-      name="hero"
+-      permission="zope.Public"
+-      template="templates/hero.pt"
+-      />
+-
+-  <browser:page
+-      for="*"
+       name="footer"
+       permission="zope.Public"
+       template="templates/footer.pt"
+diff --git a/Products/CMFPlone/browser/templates/hero.pt b/Products/CMFPlone/browser/templates/hero.pt
+deleted file mode 100644
+index d6871aa..0000000
+--- a/Products/CMFPlone/browser/templates/hero.pt
++++ /dev/null
+@@ -1,18 +0,0 @@
+-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+-      xmlns:tal="http://xml.zope.org/namespaces/tal"
+-      xmlns:metal="http://xml.zope.org/namespaces/metal"
+-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+-      lang="en"
+-      tal:omit-tag=""
+-      i18n:domain="plone">
+-
+-<div class="principal" role="complementary">
+-    <div class="container">
+-        <div class="gigantic">
+-          <h1 i18n:translate="">Welcome!</h1>
+-          <p><a href="http://plone.com" class="context" role="button" target="_blank" i18n:translate="">Learn more about Plone</a></p>
+-        </div>
+-    </div>
+-</div>
+-
+-</html>
+\ No newline at end of file
+diff --git a/Products/CMFPlone/browser/templates/plone-frontpage.pt b/Products/CMFPlone/browser/templates/plone-frontpage.pt
+index 75abc2e..e64e70c 100644
+--- a/Products/CMFPlone/browser/templates/plone-frontpage.pt
++++ b/Products/CMFPlone/browser/templates/plone-frontpage.pt
+@@ -7,7 +7,14 @@
+     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ </head>
 
--  <!-- include view @@hero on homepage only -->
--  <after css:theme="#mainnavigation-wrapper" css:content=".principal" href="/@@hero" css:if-content="body.template-document_view.section-front-page" />
-+  <!-- move hero to top -->
-+  <replace css:theme-children="#hero .gigantic" css:content-children=".hero"/>
-+  <drop css:theme="#hero" css:if-not-content=".hero" />
-+  <drop css:content=".hero" />
-
-   <!-- full-width breadcrumb -->
-   <replace css:content="#viewlet-above-content" css:theme="#above-content" />
+-<body i18n:translate="front-text"><p class="discreet">
++<body i18n:translate="front-text">
++
++  <div class="hero">
++    <h1>Welcome!</h1>
++    <p><a class="context" href="http://plone.com" target="_blank">Learn more about Plone</a></p>
++  </div>
++  
++  <p class="discreet">
+ If you're seeing this instead of the web site you were expecting, the owner of
+ this web site has just installed Plone. Do not contact the Plone Team or the
+ Plone support channels about this.