Merge pull request #104 from plone/gforcada-patch-2

Replace showEditableBorder with showToolbar

CHANGES.rst

@@ -23,6 +23,10 @@ Bug fixes:
 - Remove commented out viewlet (meant for Plone 3) and its related template.
   [gforcada]
 
+- Adapt code to some deprecated methods getting finally removed.
+  [gforcada]
+
+
 2.6.1 (2016-06-07)
 ------------------
 

plone/app/layout/viewlets/common.py

@@ -420,12 +420,14 @@ class ManagePortletsFallbackViewlet(ViewletBase):
     def update(self):
         ploneview = getMultiAdapter((
             self.context, self.request), name=u'plone')
+        plonelayout = getMultiAdapter((
+            self.context, self.request), name=u'plone_layout')
         context_state = getMultiAdapter((self.context, self.request),
                                         name=u'plone_context_state')
 
         self.portlet_assignable = context_state.portlet_assignable()
-        self.sl = ploneview.have_portlets('plone.leftcolumn', self.context)
-        self.sr = ploneview.have_portlets('plone.rightcolumn', self.context)
+        self.sl = plonelayout.have_portlets('plone.leftcolumn', self.context)
+        self.sr = plonelayout.have_portlets('plone.rightcolumn', self.context)
         self.object_url = context_state.object_url()
 
     def available(self):

plone/app/layout/viewlets/contentactions_blank.pt

@@ -1,5 +1,5 @@
 <div class="contentActions"
      tal:define="ploneview context/@@plone"
-     tal:condition="ploneview/showEditableBorder">
+     tal:condition="ploneview/showToolbar">
 
-</div>
+</div>

plone/app/layout/viewlets/contentviews.pt

@@ -1,5 +1,5 @@
 <tal:contentviews tal:define="ploneview context/@@plone;"
-                  tal:condition="ploneview/showEditableBorder"
+                  tal:condition="ploneview/showToolbar"
                   i18n:domain="plone">
 
   <tal:block define="actions view/tabSet1;">

plone/app/layout/viewlets/menu.pt

@@ -1,5 +1,5 @@
 <tal:contentviews tal:define="ploneview context/@@plone;"
-                  tal:condition="ploneview/showEditableBorder"
+                  tal:condition="ploneview/showToolbar"
                   i18n:domain="plone">
   <tal:actions tal:repeat="action options/actions">
     <li tal:attributes="id string:contentview-${action/id};
@@ -37,4 +37,4 @@
       </tal:var>
     </li>
   </tal:actions>
-</tal:contentviews>
+</tal:contentviews>