Merge pull request #1374 from plone/hero_in_content

move hero to content
plone · Feb 22, 2016 · a74391d · a74391d
2 parents d6b1255 + 5ced858
commit a74391d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 26 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -28,6 +28,10 @@ New:
 
 Fixes:
 
+- Move hero on welcome page from theme into managed content.
+  Issue https://github.com/plone/Products.CMFPlone/issues/974
+  [gyst]
+
 - 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
@@ -211,13 +211,6 @@
       allowed_interface="Products.CMFPlone.interfaces.defaultpage.IDefaultPage"
       />
 
-  <browser:page
-      for="*"
-      name="hero"
-      permission="zope.Public"
-      template="templates/hero.pt"
-      />
-
   <browser:page
       for="*"
       name="footer"

diff --git a/Products/CMFPlone/browser/templates/hero.pt b/Products/CMFPlone/browser/templates/hero.pt
diff --git 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>
 
-<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.