From c965d59bc1631219ec09a4f2ccf186e1b7e3b255 Mon Sep 17 00:00:00 2001
From: jensens <jk@kleinundpartner.at>
Date: Mon, 22 Feb 2016 17:08:21 +0100
Subject: [PATCH] [fc] Repository: plonetheme.barceloneta Branch:
 refs/heads/master Date: 2016-02-22T16:52:44+01:00 Author: Guido A.J. Stevens
 (gyst) <guido.stevens@cosent.nl> Commit:
 https://github.com/plone/plonetheme.barceloneta/commit/0b849a181603c417d468dd9c7a689ac6b8d8ba96
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

move hero to content
fixes https://github.com/plone/Products.CMFPlone/issues/974
requires https://github.com/plone/Products.CMFPlone/pull/1374

Files changed:
M CHANGES.rst
M plonetheme/barceloneta/theme/index.html
M plonetheme/barceloneta/theme/rules.xml
Repository: plonetheme.barceloneta
Branch: refs/heads/master
Date: 2016-02-22T17:08:21+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plonetheme.barceloneta/commit/d3838e12bb5185b3e81837b453195e59032149b3

Merge pull request #83 from plone/hero_in_content

move hero to content, refs https://github.com/plone/Products.CMFPlone…

Files changed:
M CHANGES.rst
M plonetheme/barceloneta/theme/index.html
M plonetheme/barceloneta/theme/rules.xml
---
 last_commit.txt | 160 +++++++++++++++++++++++++++++-------------------
 1 file changed, 98 insertions(+), 62 deletions(-)

diff --git a/last_commit.txt b/last_commit.txt
index 3540ccfe27..250967cc6d 100644
--- a/last_commit.txt
+++ b/last_commit.txt
@@ -1,100 +1,136 @@
-Repository: plone.app.content
+Repository: plonetheme.barceloneta
 
 
 Branch: refs/heads/master
-Date: 2016-02-19T14:21:25-08:00
-Author: Alec Mitchell (alecpm) <alecpm@gmail.com>
-Commit: https://github.com/plone/plone.app.content/commit/d97dca00521e1558dd61973de19ecff289ac67b4
+Date: 2016-02-22T16:52:44+01:00
+Author: Guido A.J. Stevens (gyst) <guido.stevens@cosent.nl>
+Commit: https://github.com/plone/plonetheme.barceloneta/commit/0b849a181603c417d468dd9c7a689ac6b8d8ba96
 
-Add fallback to global vocabulary permission check when permission checker can't be found.
+move hero to content
+fixes https://github.com/plone/Products.CMFPlone/issues/974
+requires https://github.com/plone/Products.CMFPlone/pull/1374
 
 Files changed:
 M CHANGES.rst
-M plone/app/content/browser/vocabulary.py
+M plonetheme/barceloneta/theme/index.html
+M plonetheme/barceloneta/theme/rules.xml
 
 diff --git a/CHANGES.rst b/CHANGES.rst
-index e010215..3d0d95f 100644
+index 16e8e2f..43a42ac 100644
 --- a/CHANGES.rst
 +++ b/CHANGES.rst
-@@ -10,7 +10,9 @@ New:
+@@ -11,6 +11,10 @@ New:
  
  Fixes:
  
--- *add item here*
-+- Add fallback to global vocabulary permission check when permission
-+  checker can't be found.
-+  [alecm]
++- Move hero to content
++  Issue https://github.com/plone/Products.CMFPlone/issues/974
++  [gyst]
++
+ - Add ``barceloneta-mixin-font`` to the registerless profile.
+   [pcdummy]
  
+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" />
  
- 3.0.18 (2016-02-19)
-diff --git a/plone/app/content/browser/vocabulary.py b/plone/app/content/browser/vocabulary.py
-index 3e19121..4931aa5 100644
---- a/plone/app/content/browser/vocabulary.py
-+++ b/plone/app/content/browser/vocabulary.py
-@@ -223,8 +223,13 @@ def get_vocabulary(self):
-                 if permission_checker is not None:
-                     authorized = permission_checker.validate(field_name,
-                                                              factory_name)
-+                elif sm.checkPermission(_permissions[factory_name], context):
-+                    # If no checker, fall back to checking the global registry
-+                    authorized = True
-+
-             if not authorized:
-                 raise VocabLookupException('Vocabulary lookup not allowed')
-+
-         # Short circuit if we are on the site root and permission is
-         # in global registry
-         elif not sm.checkPermission(_permissions[factory_name], context):
+-  <!-- 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" />
 
 
-Repository: plone.app.content
+Repository: plonetheme.barceloneta
 
 
 Branch: refs/heads/master
-Date: 2016-02-22T15:59:33+01:00
+Date: 2016-02-22T17:08:21+01:00
 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
-Commit: https://github.com/plone/plone.app.content/commit/6d4f5097390fdecfbccea2137783483c17340d89
+Commit: https://github.com/plone/plonetheme.barceloneta/commit/d3838e12bb5185b3e81837b453195e59032149b3
 
-Merge pull request #72 from plone/navroot-fixes
+Merge pull request #83 from plone/hero_in_content
 
-Add fallback to global vocabulary permission check when permission checker can't be found.
+move hero to content, refs https://github.com/plone/Products.CMFPlone…
 
 Files changed:
 M CHANGES.rst
-M plone/app/content/browser/vocabulary.py
+M plonetheme/barceloneta/theme/index.html
+M plonetheme/barceloneta/theme/rules.xml
 
 diff --git a/CHANGES.rst b/CHANGES.rst
-index e010215..3d0d95f 100644
+index 16e8e2f..43a42ac 100644
 --- a/CHANGES.rst
 +++ b/CHANGES.rst
-@@ -10,7 +10,9 @@ New:
+@@ -11,6 +11,10 @@ New:
  
  Fixes:
  
--- *add item here*
-+- Add fallback to global vocabulary permission check when permission
-+  checker can't be found.
-+  [alecm]
++- Move hero to content
++  Issue https://github.com/plone/Products.CMFPlone/issues/974
++  [gyst]
++
+ - Add ``barceloneta-mixin-font`` to the registerless profile.
+   [pcdummy]
  
+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" />
  
- 3.0.18 (2016-02-19)
-diff --git a/plone/app/content/browser/vocabulary.py b/plone/app/content/browser/vocabulary.py
-index 3e19121..4931aa5 100644
---- a/plone/app/content/browser/vocabulary.py
-+++ b/plone/app/content/browser/vocabulary.py
-@@ -223,8 +223,13 @@ def get_vocabulary(self):
-                 if permission_checker is not None:
-                     authorized = permission_checker.validate(field_name,
-                                                              factory_name)
-+                elif sm.checkPermission(_permissions[factory_name], context):
-+                    # If no checker, fall back to checking the global registry
-+                    authorized = True
-+
-             if not authorized:
-                 raise VocabLookupException('Vocabulary lookup not allowed')
-+
-         # Short circuit if we are on the site root and permission is
-         # in global registry
-         elif not sm.checkPermission(_permissions[factory_name], context):
+-  <!-- 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" />