Issue #2966921 by Liam Morland: Display the token tree in a dialog

fillpdf.admin.inc

@@ -344,14 +344,10 @@ function fillpdf_form_edit($form, &$form_state, $fid) {
       field supports tokens.</strong>'),
   );
 
-  $form['title_tokens_fieldset'] = array(
-    '#type' => 'fieldset',
+  $form['title_tokens'] = array(
+    '#type' => 'item',
     '#title' => 'Tokens',
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-  );
-
-  $form['title_tokens_fieldset']['tokens'] = _fillpdf_admin_token_form();
+  ) + _fillpdf_admin_token_form(TRUE);
 
   $form['default_nid'] = array(
     '#type' => 'textfield',
@@ -441,13 +437,10 @@ function fillpdf_form_edit($form, &$form_state, $fid) {
     '#description' => t("<strong>This setting is applicable only if a <em>Custom path for generated PDFs</em> is set.</strong> Instead of redirecting your visitors to the front page, it will redirect them directly to the PDF. However, if you pass Drupal's <em>destination</em> query string parameter, that will override this setting."),
     '#default_value' => $pdf_form->destination_redirect,
   );
-  $form['extra']['tokens_fieldset'] = array(
-    '#type' => 'fieldset',
+  $form['extra']['tokens'] = array(
+    '#type' => 'item',
     '#title' => 'Tokens',
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-  );
-  $form['extra']['tokens_fieldset']['tokens'] = _fillpdf_admin_token_form();
+  ) + _fillpdf_admin_token_form(TRUE);
   $form['extra']['replacements'] = array(
     '#type' => 'textarea',
     '#title' => t('Transform filled PDF field values'),
@@ -840,14 +833,11 @@ function fillpdf_field_edit($form, &$form_state, $pdf_form, $field) {
       <strong>[stamp:field_image]</strong>.</p>'),
     '#weight' => 4,
   );
-  $form['tokens_fieldset'] = array(
-    '#type' => 'fieldset',
+  $form['tokens'] = array(
+    '#type' => 'item',
     '#title' => 'Tokens',
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
     '#weight' => 5,
-  );
-  $form['tokens_fieldset']['tokens'] = _fillpdf_admin_token_form();
+  ) + _fillpdf_admin_token_form(TRUE);
   $form['suffix'] = array(
     '#type' => 'textarea',
     '#title' => t('Suffix'),