Index: print_pdf/print_pdf.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/print/print_pdf/print_pdf.module,v
retrieving revision 1.1.2.45
diff -u -r1.1.2.45 print_pdf.module
--- print_pdf/print_pdf.module	13 Oct 2009 00:04:25 -0000	1.1.2.45
+++ print_pdf/print_pdf.module	6 Mar 2010 13:10:16 -0000
@@ -282,8 +282,11 @@
  */
 function print_pdf_form_alter(&$form, $form_state, $form_id) {
   // Add the node-type settings option to activate the PDF version link
+  // Get the position of the link, if disabled do not display settings fieldset on edit forms
+  $pdf_link_pos = variable_get('print_pdf_link_pos', array(PRINT_PDF_LINK_POS_DEFAULT => PRINT_PDF_LINK_POS_DEFAULT));
+  $show_pdf_link = ($pdf_link_pos['link'] != '0' || $pdf_link_pos['corner'] != '0') ? TRUE : FALSE;
   if ((user_access('administer print') || user_access('node-specific print configuration')) && (($form_id == 'node_type_form') ||
-      (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id))) {
+      (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id)) && $show_pdf_link) {
     $form['print']['pdf_label'] = array(
       '#type' => 'markup',
       '#value' => '<p><strong>'. t('PDF version') .'</strong></p>',
Index: print.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/print/print.module,v
retrieving revision 1.25.2.77
diff -u -r1.25.2.77 print.module
--- print.module	13 Oct 2009 00:04:25 -0000	1.25.2.77
+++ print.module	6 Mar 2010 13:10:16 -0000
@@ -364,9 +364,18 @@
  * Implementation of hook_form_alter().
  */
 function print_form_alter(&$form, $form_state, $form_id) {
+	// Get the position of the links
+  $html_link_pos = variable_get('print_html_link_pos', array(PRINT_HTML_LINK_POS_DEFAULT => PRINT_HTML_LINK_POS_DEFAULT));
+  $mail_link_pos = variable_get('print_email_link_pos', array(PRINT_MAIL_LINK_POS_DEFAULT => PRINT_MAIL_LINK_POS_DEFAULT));
+  $pdf_link_pos = variable_get('print_pdf_link_pos', array(PRINT_PDF_LINK_POS_DEFAULT => PRINT_PDF_LINK_POS_DEFAULT));
+  // If disabled do not display settings fieldset on edit forms
+  $show_html_link = ($html_link_pos['link'] != '0' || $html_link_pos['corner'] != '0') ? TRUE : FALSE;
+  $show_mail_link = ($mail_link_pos['link'] != '0' || $mail_link_pos['corner'] != '0') ? TRUE : FALSE;
+  $show_pdf_link = ($pdf_link_pos['link'] != '0' || $pdf_link_pos['corner'] != '0') ? TRUE : FALSE; 
   // Add the node-type settings option to activate the printer-friendly version link
   if ((user_access('administer print') || user_access('node-specific print configuration')) && (($form_id == 'node_type_form') ||
-      (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id))) {
+      (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id)) && 
+      ($show_html_link || $show_email_link || $show_pdf_link)) {
     $form['print'] = array(
       '#type' => 'fieldset',
       '#title' => t('Printer, e-mail and PDF versions'),
@@ -397,14 +406,12 @@
       $form['print']['print_display']['#default_value'] = variable_get('print_display_'. $form['#node_type']->type, PRINT_TYPE_SHOW_LINK_DEFAULT);
       $form['print']['print_display_comment']['#default_value'] = variable_get('print_display_comment_'. $form['#node_type']->type, PRINT_TYPE_COMMENT_LINK_DEFAULT);
       $form['print']['print_display_urllist']['#default_value'] = variable_get('print_display_urllist_'. $form['#node_type']->type, PRINT_TYPE_URLLIST_DEFAULT);
-      $form['print']['label']['#value'] = '<p><em>'. t('The settings below only apply when some of the corresponding module-wide link settings are enabled.') .'</em></p>'. $form['print']['label']['#value'];
     }
     else {
       $node = $form['#node'];
       $form['print']['print_display']['#default_value'] = isset($node->print_display) ? $node->print_display : PRINT_TYPE_SHOW_LINK_DEFAULT;
       $form['print']['print_display_comment']['#default_value'] = isset($node->print_display_comment) ? $node->print_display_comment : PRINT_TYPE_COMMENT_LINK_DEFAULT;
       $form['print']['print_display_urllist']['#default_value'] = isset($node->print_display_urllist) ? $node->print_display_urllist : PRINT_TYPE_URLLIST_DEFAULT;
-      $form['print']['label']['#value'] = '<p><em>'. t('The settings below only apply in case the corresponding type-specific setting is also enabled (except for the "Show link in individual comments").') .'</em></p>'. $form['print']['label']['#value'];
     }
   }
 }
Index: print_mail/print_mail.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/print/print_mail/print_mail.module,v
retrieving revision 1.1.2.42
diff -u -r1.1.2.42 print_mail.module
--- print_mail/print_mail.module	15 Oct 2009 23:43:27 -0000	1.1.2.42
+++ print_mail/print_mail.module	6 Mar 2010 13:10:16 -0000
@@ -232,8 +232,11 @@
  */
 function print_mail_form_alter(&$form, $form_state, $form_id) {
   // Add the node-type settings option to activate the mail version link
+  // Get the position of the link, if disabled do not display settings fieldset on edit forms
+  $mail_link_pos = variable_get('print_mail_link_pos', array(PRINT_MAIL_LINK_POS_DEFAULT => PRINT_MAIL_LINK_POS_DEFAULT));
+  $show_mail_link = ($mail_link_pos['link'] != '0' || $mail_link_pos['corner'] != '0') ? TRUE : FALSE;
   if ((user_access('administer print') || user_access('node-specific print configuration')) && (($form_id == 'node_type_form') ||
-      (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id))) {
+      (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id)) && $show_email_link) {
     $form['print']['mail_label'] = array(
       '#type' => 'markup',
       '#value' => '<p><strong>'. t('Send by e-mail') .'</strong></p>',
