#552020: Show the administrative description on page manager edit forms.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index aa096cc..4414ee3 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,7 @@ Make sure that tasks that will not override existing overrides refuse to enable
 #531936: Cache handling on contexts was spotty and could cause random errors.
 #545540 by Roger López: Add 5 page elements as available panes for using Panels as your primary page layout: breadcrumb, page title, messages, tabs and help box.
 #537776 by rfay: CTools Plugin Example module to help guide people in making plugins.
+#552020: Show the administrative description on page manager edit forms.
 
 ctools 6.x-1.0-rc1
 ==================

diff --git a/page_manager/page_manager.admin.inc b/page_manager/page_manager.admin.inc
index ff8ac85..cc0d837 100644 (file)
--- a/page_manager/page_manager.admin.inc
+++ b/page_manager/page_manager.admin.inc
@@ -885,9 +885,11 @@ function _page_manager_get_operation_content($js, &$page, $active, $operation, $
       $output = $messages . $output;
     }
 
+    $description = isset($operation['admin description']) ? $operation['admin description'] : (isset($operation['description']) ? $operation['description'] : '');
     $return = array(
       'title' => $title,
       'content' => $output,
+      'description' => $description,
     );
 
     // Append any extra content, used for the preview which is submitted then
@@ -1648,9 +1650,11 @@ function page_manager_page_summary(&$form, &$form_state) {
 
   $output = '';
 
+/*
   if (isset($form_state['subtask']['admin title'])) {
     $form_state['title'] = $form_state['subtask']['admin title'];
   }
+*/
 
   if (isset($form_state['subtask']['admin description'])) {
     $output .= '<div class="description">' . $form_state['subtask']['admin description'] . '</div>';

diff --git a/page_manager/plugins/tasks/page.admin.inc b/page_manager/plugins/tasks/page.admin.inc
index 64c7cf8..8ad5428 100644 (file)
--- a/page_manager/plugins/tasks/page.admin.inc
+++ b/page_manager/plugins/tasks/page.admin.inc
@@ -802,11 +802,6 @@ function page_manager_page_form_access(&$form, &$form_state) {
     $form_state['contexts'] = ctools_context_get_placeholders_from_argument($arguments);
   }
 
-  $form['markup'] = array(
-    '#value' => '<div class="description">' .
-    t('Access rules are used to test if the page is accessible and any menu items associated with it are visible.') .
-    '</div>',
-  );
   ctools_include('context-access-admin');
   $form = array_merge($form, ctools_access_admin_form($form_state));
 }

diff --git a/page_manager/plugins/tasks/page.inc b/page_manager/plugins/tasks/page.inc
index 75dcaaf..dcf7a5f 100644 (file)
--- a/page_manager/plugins/tasks/page.inc
+++ b/page_manager/plugins/tasks/page.inc
@@ -164,6 +164,7 @@ function page_manager_page_build_subtask($task, $page) {
   $settings['access'] = array(
     'title' => t('Access'),
     'description' => t('Control what users can access this page.'),
+    'admin description' => t('Access rules are used to test if the page is accessible and any menu items associated with it are visible.'),
     'form' => 'page_manager_page_form_access',
   );
 

diff --git a/page_manager/theme/page-manager-edit-page.tpl.php b/page_manager/theme/page-manager-edit-page.tpl.php
index 8b6de5b..276a2ba 100644 (file)
--- a/page_manager/theme/page-manager-edit-page.tpl.php
+++ b/page_manager/theme/page-manager-edit-page.tpl.php
@@ -5,7 +5,7 @@
  * Template for the page manager page editor.
  *
  * Variables available:
- * - 
+ * -
  *
  * For javascript purposes the id must not change.
  */
@@ -39,6 +39,11 @@
           </div>
 
           <div class="content-content">
+            <?php if (!empty($content['description'])): ?>
+              <div class="description">
+                <?php print $content['description']; ?>
+              </div>
+              <?php endif; ?>
             <?php print $content['content']; ?>
           </div>
         </div>