diff --git a/print.admin.inc b/print.admin.inc index 5920b953f5411280c467dab203edd8dd99a0a015..f6b03a69e44f4e2c6542bb897f021a899b2d7786 100644 --- a/print.admin.inc +++ b/print.admin.inc @@ -42,6 +42,13 @@ function print_main_settings() { '#disabled' => !user_access('administer site configuration'), ); + $form['settings']['print_keep_theme_css'] = array( + '#type' => 'checkbox', + '#title' => t('Keep the current theme CSS'), + '#default_value' => variable_get('print_keep_theme_css', PRINT_KEEP_THEME_CSS_DEFAULT), + '#description' => t('If set, the current theme css will still be applied to the printer-friendly versions.'), + ); + $form['settings']['print_urls'] = array( '#type' => 'checkbox', '#title' => t('Printer-friendly URLs list'), diff --git a/print.install b/print.install index 8d209bbfc97f7605275ebffac622451de4b2e497..86df202ae3b787dbcdc40965087beebc3476969c 100644 --- a/print.install +++ b/print.install @@ -44,6 +44,7 @@ function print_uninstall() { variable_del('print_logo_url'); variable_del('print_logo_options'); variable_del('print_css'); + variable_del('print_keep_theme_css'); variable_del('print_urls'); variable_del('print_urls_anchors'); variable_del('print_comments'); diff --git a/print.module b/print.module index 4f9394f28c56f46f96fe4df058e205015f424563..1f7d0ac76708f3a9a0b91c06a76d472dc2f85f7d 100644 --- a/print.module +++ b/print.module @@ -46,6 +46,7 @@ define('PRINT_LOGO_URL_DEFAULT', ''); define('PRINT_FOOTER_OPTIONS_DEFAULT', 1); define('PRINT_FOOTER_USER_DEFAULT', ''); define('PRINT_CSS_DEFAULT', ''); +define('PRINT_KEEP_THEME_CSS_DEFAULT', 0); define('PRINT_URLS_DEFAULT', 1); define('PRINT_URLS_ANCHORS_DEFAULT', 0); define('PRINT_COMMENTS_DEFAULT', 0); diff --git a/print.pages.inc b/print.pages.inc index 13a592e82016e65e20684acdd7ccd01022ea7dc4..5292677f5a8b229f7d00395c249b49e6d10f1eeb 100644 --- a/print.pages.inc +++ b/print.pages.inc @@ -156,6 +156,7 @@ function _print_var_generator($node, $message = NULL, $cid = NULL) { // print module settings $print_css = variable_get('print_css', PRINT_CSS_DEFAULT); + $print_keep_theme_css = variable_get('print_keep_theme_css', PRINT_KEEP_THEME_CSS_DEFAULT); $print_logo_options = variable_get('print_logo_options', PRINT_LOGO_OPTIONS_DEFAULT); $print_logo_url = variable_get('print_logo_url', PRINT_LOGO_URL_DEFAULT); $print_html_new_window = variable_get('print_html_new_window', PRINT_HTML_NEW_WINDOW_DEFAULT); @@ -187,10 +188,12 @@ function _print_var_generator($node, $message = NULL, $cid = NULL) { drupal_add_css(drupal_get_path('module', 'print') . '/css/print.css'); } $drupal_css = drupal_add_css(); - foreach ($drupal_css as $key => $css_file) { - if ($css_file['group'] == CSS_THEME) { - // Unset the theme's CSS - unset($drupal_css[$key]); + if (!$print_keep_theme_css) { + foreach ($drupal_css as $key => $css_file) { + if ($css_file['group'] == CSS_THEME) { + // Unset the theme's CSS + unset($drupal_css[$key]); + } } }