Merge pull request #27 from plone/lg-prettify-confirm-action

Show title and description in @@confirm-action view, disable editable border
plone · Oct 13, 2015 · e560f73 · e560f73
2 parents adcd123 + a71f2ed
commit e560f73
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,12 @@ Changelog
 3.0.15 (unreleased)
 -------------------
 
+- Disable editable border for @@confirm-action view.
+  [lgraf]
+
+- Make title and description show up on @@confirm-action view.
+  [lgraf]
+
 - Allow views to override 'X-Frame-Options' by setting the response header
   manually.
   [alecm]

diff --git a/plone/protect/confirm.pt b/plone/protect/confirm.pt
@@ -5,14 +5,18 @@
       lang="en"
       metal:use-macro="context/main_template/macros/master"
       i18n:domain="plone">
+
+<metal:block fill-slot="top_slot"
+             tal:define="dummy python:request.set('disable_border', 1)" />
+
 <body>
-  <metal:title define-slot="content-title">
+  <metal:title fill-slot="content-title">
      <h1 class="documentFirstHeading">
          Confirming User Action.
      </h1>
   </metal:title>
 
-  <metal:description define-slot="content-description">
+  <metal:description fill-slot="content-description">
      <div class="documentDescription">
          Confirm that you'd like to perform this action.
      </div>