Merge pull request #61 from plone/issue-60

Structured description and explicit macro call
plone · Jan 25, 2022 · 795ee56 · 795ee56
2 parents f0b955f + f1bea3a
commit 795ee56
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/news/60.bugfix b/news/60.bugfix
@@ -0,0 +1,2 @@
+structured form description and explicit macro call
+[petschki]
diff --git a/plone/app/registry/browser/templates/controlpanel_layout.pt b/plone/app/registry/browser/templates/controlpanel_layout.pt
@@ -3,7 +3,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       lang="en"
-      metal:use-macro="here/prefs_main_template/macros/master"
+      metal:use-macro="context/@@prefs_main_template/macros/master"
       i18n:domain="plone">
 
 <body>
@@ -12,11 +12,11 @@
   <header>
 
     <h1 tal:content="view/label">View Title</h1>
-    <p class="lead" tal:condition="view/description | nothing" tal:content="view/description">View Description</p>
+    <p class="lead" tal:condition="view/description | nothing" tal:content="structure view/description">View Description</p>
 
   </header>
 
-  <div metal:use-macro="context/global_statusmessage/macros/portal_message">
+  <div metal:use-macro="context/@@global_statusmessage/macros/portal_message">
     Portal status message
   </div>
 

diff --git a/plone/app/registry/browser/templates/delete_layout.pt b/plone/app/registry/browser/templates/delete_layout.pt
@@ -3,7 +3,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       lang="en"
-      metal:use-macro="here/prefs_main_template/macros/master"
+      metal:use-macro="context/@@prefs_main_template/macros/master"
       i18n:domain="plone">
 
 <metal:block fill-slot="top_slot"

diff --git a/plone/app/registry/browser/templates/edit_layout.pt b/plone/app/registry/browser/templates/edit_layout.pt
@@ -3,7 +3,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       lang="en"
-      metal:use-macro="here/prefs_main_template/macros/master"
+      metal:use-macro="context/@@prefs_main_template/macros/master"
       i18n:domain="plone">
 
 <metal:block fill-slot="top_slot"

diff --git a/plone/app/registry/browser/templates/records.pt b/plone/app/registry/browser/templates/records.pt
@@ -3,7 +3,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       lang="en"
-      metal:use-macro="here/prefs_main_template/macros/master"
+      metal:use-macro="context/@@prefs_main_template/macros/master"
       i18n:domain="plone">
 
 <metal:block fill-slot="top_slot">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		structured form description and explicit macro call
		[petschki]