diff --git a/text_resize.install b/text_resize.install index c628c4d..d928579 100644 --- a/text_resize.install +++ b/text_resize.install @@ -10,4 +10,4 @@ */ function text_resize_uninstall() { db_query("DELETE FROM {variable} WHERE name LIKE 'text_resize_%'"); -} \ No newline at end of file +} diff --git a/text_resize.js b/text_resize.js index b394bdb..501e2c4 100644 --- a/text_resize.js +++ b/text_resize.js @@ -1,104 +1,108 @@ (function ($) { // JavaScript should be compatible with other libraries than jQuery Drupal.behaviors.textResize = { // D7 "Changed Drupal.behaviors to objects having the methods "attach" and "detach"." attach: function(context) { + var element_to_resize = []; // Which div or page element are we resizing? if (text_resize_scope) { // Admin-specified scope takes precedence. - if ($('#'+text_resize_scope).length > 0) { - var element_to_resize = $('#'+text_resize_scope); // ID specified by admin - } - else if ($('.'+text_resize_scope).length > 0) { - var element_to_resize = $('.'+text_resize_scope); // CLASS specified by admin - } - else { - var element_to_resize = $(text_resize_scope); // It's just a tag specified by admin + var text_resize_scope_array = text_resize_scope.split(", "); + for (i=0; i 0) { + element_to_resize.push($(text_resize_scope_array[i])); // GENERIC SELECTOR specified by admin + } } } else { // Look for some default scopes that might exist. if ($('DIV.left-corner').length > 0) { - var element_to_resize = $('DIV.left-corner'); // Main body div for Garland + element_to_resize.push('DIV.left-corner'); // Main body div for Garland } else if ($('#content-inner').length > 0) { - var element_to_resize = $('#content-inner'); // Main body div for Zen-based themes + element_to_resize.push('#content-inner'); // Main body div for Zen-based themes } else if ($('#squeeze > #content').length > 0) { - var element_to_resize = $('#squeeze > #content'); // Main body div for Zen Classic + element_to_resize.push('#squeeze > #content'); // Main body div for Zen Classic } } // Set the initial font size if necessary - if ($.cookie('text_resize') != null) { - element_to_resize.css('font-size', parseFloat($.cookie('text_resize')) + 'px'); - } - if (text_resize_line_height_allow) { - // Set the initial line height if necessary - if ($.cookie('text_resize_line_height') != null) { - element_to_resize.css('line-height', parseFloat($.cookie('text_resize_line_height')) + 'px'); + if(text_resize_store_font_size){ + for (j=0; j= text_resize_minimum) { + // Allow resizing as long as font size doesn't go below text_resize_minimum. + $.cookie('text_resize', new_font_size, { path: '/' }); + if (text_resize_line_height_allow) { $.cookie('text_resize_line_height', new_line_height, { path: '/' }); } + var allow_change = true; + } + else { + // If it goes below text_resize_minimum, just leave it at text_resize_minimum. + $.cookie('text_resize', text_resize_minimum, { path: '/' }); + if (text_resize_line_height_allow) { $.cookie('text_resize_line_height', text_resize_line_height_min, { path: '/' }); } + var reset_size_min = true; + } } - } - else if (this.id == 'text_resize_decrease') { - var new_font_size = currentFontSize / 1.2; - if (text_resize_line_height_allow) { var new_line_height = current_line_height / 1.2; } - if (new_font_size >= text_resize_minimum) { - // Allow resizing as long as font size doesn't go below text_resize_minimum. - $.cookie('text_resize', new_font_size, { path: '/' }); - if (text_resize_line_height_allow) { $.cookie('text_resize_line_height', new_line_height, { path: '/' }); } - var allow_change = true; + else if (this.id == 'text_resize_reset') { + $.cookie('text_resize', null, { path: '/' }); + if (text_resize_line_height_allow) { $.cookie('text_resize_line_height', null, { path: '/' }); } + var reset_size_original = true; } - else { - // If it goes below text_resize_minimum, just leave it at text_resize_minimum. - $.cookie('text_resize', text_resize_minimum, { path: '/' }); - if (text_resize_line_height_allow) { $.cookie('text_resize_line_height', text_resize_line_height_min, { path: '/' }); } - var reset_size_min = true; + // jQuery lets us set the font size value of the main text div + if (allow_change == true) { + element_to_resize[k].css('font-size', new_font_size + 'px'); // Add 'px' onto the end, otherwise ems are used as units by default + if (text_resize_line_height_allow) { element_to_resize[k].css('line-height', new_line_height + 'px'); } + //return false; } - } - else if (this.id == 'text_resize_reset') { - $.cookie('text_resize', null, { path: '/' }); - if (text_resize_line_height_allow) { $.cookie('text_resize_line_height', null, { path: '/' }); } - var reset_size_original = true; - } - // jQuery lets us set the font size value of the main text div - if (allow_change == true) { - element_to_resize.css('font-size', new_font_size + 'px'); // Add 'px' onto the end, otherwise ems are used as units by default - if (text_resize_line_height_allow) { element_to_resize.css('line-height', new_line_height + 'px'); } - return false; - } - else if (reset_size_min == true) { - element_to_resize.css('font-size', text_resize_minimum + 'px'); - if (text_resize_line_height_allow) { element_to_resize.css('line-height', text_resize_line_height_min + 'px'); } - return false; - } - else if (reset_size_max == true) { - element_to_resize.css('font-size', text_resize_maximum + 'px'); - if (text_resize_line_height_allow) { element_to_resize.css('line-height', text_resize_line_height_max + 'px'); } - return false; - } - else if (reset_size_original == true) { - element_to_resize.css('font-size', ''); - if (text_resize_line_height_allow) { element_to_resize.css('line-height', ''); } - return false; - } + else if (reset_size_min == true) { + element_to_resize[k].css('font-size', text_resize_minimum + 'px'); + if (text_resize_line_height_allow) { element_to_resize[k].css('line-height', text_resize_line_height_min + 'px'); } + //return false; + } + else if (reset_size_max == true) { + element_to_resize[k].css('font-size', text_resize_maximum + 'px'); + if (text_resize_line_height_allow) { element_to_resize[k].css('line-height', text_resize_line_height_max + 'px'); } + //return false; + } + else if (reset_size_original == true) { + element_to_resize[k].css('font-size', text_resize_default + 'px'); + if (text_resize_line_height_allow) { element_to_resize[k].css('line-height', text_resize_line_height_default + 'px'); } + //return false; + } + } }); } }; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/text_resize.module b/text_resize.module index 7ead9a4..a6fdab4 100644 --- a/text_resize.module +++ b/text_resize.module @@ -16,7 +16,7 @@ function text_resize_menu() { 'access arguments' => array('administer site configuration'), 'page callback' => 'drupal_get_form', 'page arguments' => array('_text_resize_admin_settings'), - 'type' => MENU_NORMAL_ITEM + 'type' => MENU_NORMAL_ITEM, ); return $items; } @@ -29,14 +29,23 @@ function _text_resize_admin_settings() { $form['text_resize_scope'] = array( '#type' => 'textfield', + '#maxlength' => 1000, '#title' => t('Text Resize Scope'), '#default_value' => variable_get('text_resize_scope', 'main'), '#description' => t('Which portion of the body would you like to be resized by the Text Resize block? You may enter either the CSS class attribute, the CSS id attribute, or an HTML tag.
For example, if you want all text within <div id="my-container"> to be resized, enter the ID my-container.
If, on the other hand, you would like all text within the BODY tag to be resized, enter body.'), '#required' => TRUE, ); + $form['text_resize_default'] = array( + '#type' => 'textfield', + '#title' => t('Default Text Size'), + '#maxlength' => 2, + '#default_value' => variable_get('text_resize_default', '14'), + '#description' => t('What is the default font size (in pixels) of your text?'), + '#required' => TRUE, + ); $form['text_resize_minimum'] = array( '#type' => 'textfield', - '#title' => t('Default/Minimum Text Size'), + '#title' => t('Minimum Text Size'), '#maxlength' => 2, '#default_value' => variable_get('text_resize_minimum', '12'), '#description' => t('What is the smallest font size (in pixels) that your text can be resized to by users?'), @@ -62,11 +71,24 @@ function _text_resize_admin_settings() { '#default_value' => variable_get('text_resize_line_height_allow', FALSE), '#description' => t('Do you want to allow Text Resize to change the spacing between the lines of text?'), ); + $form['text_resize_store_font_size'] = array( + '#type' => 'checkbox', + '#title' => t('Store Font Size'), + '#default_value' => variable_get('text_resize_store_font_size', FALSE), + '#description' => t('Do you want to store the font size in a cookie for the next time the user visits a new page in your site see it with the fonts and line-heights already resized?'), + ); + $form['text_resize_line_height_default'] = array( + '#type' => 'textfield', + '#title' => t('Default Line-Height'), + '#maxlength' => 2, + '#default_value' => variable_get('text_resize_line_height_default', 16), + '#description' => t('What is the default line-height (in pixels) of your?'), + ); $form['text_resize_line_height_min'] = array( '#type' => 'textfield', '#title' => t('Minimum Line-Height'), '#maxlength' => 2, - '#default_value' => variable_get('text_resize_line_height_min', 16), + '#default_value' => variable_get('text_resize_line_height_min', 14), '#description' => t('What is the smallest line-height (in pixels) that your text can be resized to by users?'), ); $form['text_resize_line_height_max'] = array( @@ -113,7 +135,9 @@ function text_resize_theme() { ); } -// Create a theme function that can be overridden by other theme developers. +/** + * Implements a theme function that can be overridden by other theme developers. + */ function theme_text_resize_block() { // Add js, css, and library $content = array( @@ -121,9 +145,12 @@ function theme_text_resize_block() { 'js' => array( array( 'data' => "var text_resize_scope = " . drupal_json_encode(variable_get('text_resize_scope', 'main')) . "; + var text_resize_default = " . drupal_json_encode(variable_get('text_resize_default', '14')) . "; var text_resize_minimum = " . drupal_json_encode(variable_get('text_resize_minimum', '12')) . "; var text_resize_maximum = " . drupal_json_encode(variable_get('text_resize_maximum', '25')) . "; var text_resize_line_height_allow = " . drupal_json_encode(variable_get('text_resize_line_height_allow', FALSE)) . "; + var text_resize_store_font_size = " . drupal_json_encode(variable_get('text_resize_store_font_size', FALSE)) . "; + var text_resize_line_height_default = " . drupal_json_encode(variable_get('text_resize_line_height_default', 14)) . "; var text_resize_line_height_min = " . drupal_json_encode(variable_get('text_resize_line_height_min', 16)) . "; var text_resize_line_height_max = " . drupal_json_encode(variable_get('text_resize_line_height_max', 36)) . ";", 'type' => 'inline', @@ -160,18 +187,18 @@ function text_resize_help($path, $arg) { $output = '

' . t('The Text Resize module creates a block on the page that can be used by your site visitors to quickly and easily adjust the sizing of text as it displays for them. In order to enable the functionality of the Text Resize module, you will need to make sure that you have enabled the Text Resize block on the blocks page. You will also probably want to configure the behavior of the module at the administration pages listed at the bottom of this page.') . '

'; $output .= '

' . t('Changing How Text Resize Looks') . '

'; $output .= '

' . t('Method 1: Just CSS') . '

'; - $output .= '

' . t('Text Resize creates two stylized hyperlinks on the page (and a third if you enable the reset button option). You can add new styles to your own theme\'s stylesheet that will override the default CSS styles produced by Text Resize. The ids you\'ll want to add and modify in your stylesheet are:') . '

'; + $output .= '

' . t("Text Resize creates two stylized hyperlinks on the page (and a third if you enable the reset button option). You can add new styles to your own theme's stylesheet that will override the default CSS styles produced by Text Resize. The ids you'll want to add and modify in your stylesheet are:") . '

'; $output .= ''; + $output .= '
  • #text_resize_reset ' . t("(if you've chosen to use the reset button option)") . '
    • '; $output .= '

    ' . t('Method 2: A Theme Function') . '

    '; - $output .= '

    ' . t('If you need to change the HTML that is produced by Text Resize in some way, you can create a small function in your theme\'s template.php file. An example is below:') . '

    '; + $output .= '

    ' . t("If you need to change the HTML that is produced by Text Resize in some way, you can create a small function in your theme's template.php file. An example is below:") . '

    '; $output .= '

    function YOUR_THEME_NAME_text_resize_block() {
      $output = t(\'<a href="javascript:;" class="changer" id="text_resize_decrease"><sup>-</sup>A</a> <a href="javascript:;" class="changer" id="text_resize_increase"><sup>+</sup>A</a> <a href="/contact">Contact</a> | <a href="/pages/site-map">Site Map</a><div id="text_resize_clear"></div>\');
      return $output;
    }

    '; $output .= '

    ' . t('In the example above, the HTML output code is just modified so that two new hyperlinks are added into the original block code.') . '

    '; return $output; - break; + case 'admin/settings/modules#description': return t('Creates a block that allows your users to resize text on the page.'); - break; + } -} \ No newline at end of file +}