diff --git CHANGELOG.txt CHANGELOG.txt index 2f03aba..4e03d03 100644 --- CHANGELOG.txt +++ CHANGELOG.txt @@ -1,6 +1,5 @@ // $Id$ - qTip 7.x-1.x-dev, 2010-08-18 ------------------------------- -Initial release of qTip module (early development). \ No newline at end of file +Initial release of qTip module (early development). diff --git README.txt README.txt index 3f98740..526baf8 100644 --- README.txt +++ README.txt @@ -74,7 +74,6 @@ Current maintainers: * Jacob Neher (bocaj) - http://drupal.org/user/582042 - -- SPECIAL THANKS -- To Craig Thompson, creator of the qTip jQuery plugin! -http://craigsworks.com \ No newline at end of file +http://craigsworks.com diff --git js/qtip.admin.js js/qtip.admin.js index 410304d..6318f14 100644 --- js/qtip.admin.js +++ js/qtip.admin.js @@ -1,8 +1,8 @@ (function ($) { $(document).ready(function() { /** - Load the page initially with the correct settings - */ + * Load the page initially with the correct settings + */ _qtip_handle_speech_bubble(); /* diff --git js/qtip.js js/qtip.js index 714a2e0..5f987b3 100644 --- js/qtip.js +++ js/qtip.js @@ -60,7 +60,7 @@ solid_tip = 5; } -/*** Standard Settings ***/ + /*** Standard Settings ***/ $('.qtip-link').each(function() { if(Drupal.settings.qtip.show_event_type == 'click') { $(this).addClass('ui-tooltip-click'); @@ -78,7 +78,7 @@ build_qtip(this, 'node'); }); -/*** Additional Elements ***/ + /*** Additional Elements ***/ if(Drupal.settings.qtip.additional_elements) { $(Drupal.settings.qtip.additional_elements).each(function() { $(this).addClass('qtip-additional-element'); @@ -99,7 +99,7 @@ }); } -/*** Webform Settings ***/ + /*** Webform Settings ***/ // Does the admin even want the descriptions to show up in a tooltip? if (Drupal.settings.qtip.show_webform_descriptions) { /* diff --git qtip.admin.inc qtip.admin.inc index d8e6fe1..1e69a26 100644 --- qtip.admin.inc +++ qtip.admin.inc @@ -25,41 +25,14 @@ '#type' => 'item', '#markup' => '' . t('qTip Library Version') . ': ' . QTIP_VERSION, ); - /* FIELDSETS */ + + /* STYLE SECTION */ $form['style'] = array( '#type' => 'fieldset', '#title' => t('Styling options'), '#collapsible' => TRUE, '#collapsed' => FALSE, - ); - $form['event'] = array( - '#type' => 'fieldset', - '#title' => t('Event options'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - ); - $form['form'] = array( - '#type' => 'fieldset', - '#title' => t('Form settings'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - ); -/* - $form['form']['webform'] = array( - '#type' => 'fieldset', - '#title' => t('Webform settings'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - ); -*/ - $form['advanced'] = array( - '#type' => 'fieldset', - '#title' => t('Advanced options'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, ); - - /* STYLE SECTION */ $form['style']['qtip_target_position'] = array( '#type' => 'select', '#title' => t('Tooltip Position'), @@ -153,6 +126,12 @@ '#field_suffix' => '', ); /* EVENT SECTION */ + $form['event'] = array( + '#type' => 'fieldset', + '#title' => t('Event options'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + ); $form['event']['qtip_show_event_type'] = array( '#type' => 'radios', '#title' => t('Show Event Type'), @@ -161,8 +140,8 @@ 'click' => 'Click', ), '#description' => t('The action the user must take to activate the qtip. -
Hover: User moves mouse over link text. -
Click: User must click on the link text to activate qtip'), +
Hover: User moves mouse over link text. +
Click: User must click on the link text to activate qtip'), '#default_value' => variable_get('qtip_show_event_type', 'mouseenter'), ); $form['event']['qtip_hide_event_type'] = array( @@ -173,8 +152,8 @@ 'unfocus' => 'Click', ), '#description' => t('The action the user must take to hide the qtip. -
Leave: User moves the mouse away from the link text. -
Click: User clicks anywhere on the document.'), +
Leave: User moves the mouse away from the link text. +
Click: User clicks anywhere on the document.'), '#default_value' => variable_get('qtip_hide_event_type', 'mouseleave'), ); /* @@ -183,8 +162,16 @@ '#title' => t('Only allow one qtip to show at a time'), '#description' => t('If checked, only one tooltip will be visible to the user at a time.'), '#default_value' => variable_get('qtip_show_solo', TRUE), + ); +*/ + + /* FORM SETTINGS */ + $form['form'] = array( + '#type' => 'fieldset', + '#title' => t('Form settings'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, ); -*/ /* FORM SETTINGS */ $form['form']['webform']['qtip_show_webform_descriptions'] = array( '#type' => 'checkbox', '#title' => t('Use tooltips on webform descriptions'), @@ -202,7 +189,14 @@ ); $form['form']['webform']['qtip_show_webform_descriptions']['#attributes'] = array('disabled' => 'disabled'); } + /* ADVANCED SECTION */ + $form['advanced'] = array( + '#type' => 'fieldset', + '#title' => t('Advanced options'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); $form['advanced']['qtip_additional_elements'] = array( '#type' => 'textfield', '#title' => t('Define additional elements to show with tooltips'), diff --git qtip.info qtip.info index 4108018..c598efb 100644 --- qtip.info +++ qtip.info @@ -8,3 +7,4 @@ ;package = core = 7.x \ No newline at end of file +core = 7.x diff --git qtip.install qtip.install index d102ffe..bcc090a 100644 --- qtip.install +++ qtip.install @@ -7,19 +7,20 @@ */ /** - * Implements hook_install(). - */ -function qtip_install() { - // un-comment this once you've implemented the schema - //drupal_install_schema('qtip'); -} - -/** * Implements hook_uninstall(). */ function qtip_uninstall() { - // Remove any set variables used for the qTip module - db_query("DELETE FROM {variable} WHERE name LIKE 'qtip\_%'"); - // Remove qTip from the filter table - db_query("DELETE FROM {filter} WHERE module='qtip'"); -} \ No newline at end of file + variable_del('qtip_target_position'); + variable_del('qtip_show_speech_bubble_tip'); + variable_del('qtip_show_speech_bubble_tip_side'); + variable_del('qtip_speech_bubble_tip_size'); + variable_del('qtip_show_speech_bubble_tip_solid'); + variable_del('qtip_show_shadow'); + variable_del('qtip_rounded_corners'); + variable_del('qtip_color'); + variable_del('qtip_custom_color'); + variable_del('qtip_show_event_type'); + variable_del('qtip_hide_event_type'); + variable_del('qtip_show_webform_descriptions'); + variable_del('qtip_additional_elements'); +} diff --git qtip.module qtip.module index 05b1e99..014f0fa 100644 --- qtip.module +++ qtip.module @@ -6,73 +6,67 @@ */ define('QTIP_VERSION', '2.0.0pre'); define('QTIP_PATH', drupal_get_path('module', 'qtip') . '/library/'); -//define('QTIP_FILE', 'jquery.qtip-' . QTIP_VERSION . (variable_get('qtip_use_uncompressed_js', 0) == 1 ? '' : '.min') . '.js'); -define ('QTIP_FILE', 'jquery.qtip-' . QTIP_VERSION . '.js'); +define('QTIP_FILE', 'jquery.qtip-' . QTIP_VERSION . '.js'); /** - * Implements hook_init(). + * Implements hook_library(). */ -function qtip_init() { - // We have to get the right setting for the tooltip - switch (variable_get('qtip_target_position', 'top_right')) { - case 'top_left': - $tooltip_position = 'bottom_right'; - break; - case 'top_center': - $tooltip_position = 'bottom_center'; - break; - case 'top_right': - $tooltip_position = 'bottom_left'; - break; - case 'right_center': - $tooltip_position = 'left_center'; - break; - case 'bottom_right': - $tooltip_position = 'top_left'; - break; - case 'bottom_center': - $tooltip_position = 'top_center'; - break; - case 'bottom_left': - $tooltip_position = 'top_right'; - break; - case 'left_center': - $tooltip_position = 'right_center'; - } +function qtip_library() { + + $positionTooltipMapper = array( + 'top_left' => 'bottom_right', + 'top_center' => 'bottom_center', + 'top_right' => 'bottom_left', + 'right_center' => 'left_center', + 'bottom_right' => 'top_left', + 'bottom_center' => 'top_center', + 'bottom_left' => 'top_right', + 'left_center' => 'right_center', + ); + + $tooltip_position = $positionTooltipMapper[variable_get('qtip_target_position', 'top_right')]; + + $libraries['qtip'] = array( + 'title' => 'qTip', + 'website' => 'http://craigsworks.com/projects/qtip', + 'version' => '2.0.0pre', + 'js' => array( + QTIP_PATH . QTIP_FILE => array(), + drupal_get_path('module', 'qtip') . '/js/qtip.js' => array(), + //drupal_get_path('module', 'qtip') . '/js/qtip.admin.js' => array(), + ), + 'css' => array( + drupal_get_path('module', 'qtip') . '/library/jquery.qtip.css' => array( + 'type' => 'file', + 'media' => 'screen', + ), + drupal_get_path('module', 'qtip') . '/css/qtip.css' => array( + 'type' => 'file', + 'media' => 'screen', + ), + ), + ); - // Settings set by the administrator to send to qtip.js - drupal_add_js(array( - 'qtip' => array( - 'target_position' => variable_get('qtip_target_position', 'top_right'), - 'tooltip_position' => $tooltip_position, - 'show_speech_bubble_tip' => variable_get('qtip_show_speech_bubble_tip', TRUE), - 'show_speech_bubble_tip_side' => variable_get('qtip_show_speech_bubble_tip_side', FALSE), - 'speech_bubble_size' => variable_get('qtip_speech_bubble_tip_size', 12), - 'show_speech_bubble_tip_solid' => variable_get('qtip_show_speech_bubble_tip_solid', FALSE), - 'show_shadow' => variable_get('qtip_show_shadow', FALSE), - 'rounded_corners' => variable_get('qtip_rounded_corners', FALSE), - 'color' => variable_get('qtip_color', ''), - 'custom_color' => variable_get('qtip_custom_color', ''), - 'show_event_type' => variable_get('qtip_show_event_type', 'mouseenter'), - 'hide_event_type' => variable_get('qtip_hide_event_type', 'mouseleave'), -// 'show_solo' => variable_get('qtip_show_solo', TRUE), - 'show_webform_descriptions' => variable_get('qtip_show_webform_descriptions', FALSE), - 'additional_elements' => variable_get('qtip_additional_elements', ''), - ) - ), 'setting'); + $settings = array( + 'target_position' => variable_get('qtip_target_position', 'top_right'), + 'tooltip_position' => $tooltip_position, + 'show_speech_bubble_tip' => variable_get('qtip_show_speech_bubble_tip', TRUE), + 'show_speech_bubble_tip_side' => variable_get('qtip_show_speech_bubble_tip_side', FALSE), + 'speech_bubble_size' => variable_get('qtip_speech_bubble_tip_size', 12), + 'show_speech_bubble_tip_solid' => variable_get('qtip_show_speech_bubble_tip_solid', FALSE), + 'show_shadow' => variable_get('qtip_show_shadow', FALSE), + 'rounded_corners' => variable_get('qtip_rounded_corners', FALSE), + 'color' => variable_get('qtip_color', ''), + 'custom_color' => variable_get('qtip_custom_color', ''), + 'show_event_type' => variable_get('qtip_show_event_type', 'mouseenter'), + 'hide_event_type' => variable_get('qtip_hide_event_type', 'mouseleave'), + 'show_webform_descriptions' => variable_get('qtip_show_webform_descriptions', FALSE), + 'additional_elements' => variable_get('qtip_additional_elements', ''), + ); - drupal_add_css(drupal_get_path('module', 'qtip') . '/library/jquery.qtip.css'); - drupal_add_css(drupal_get_path('module', 'qtip') . '/css/qtip.css'); - // Check to see if qtip library is in sites/all/libraries/qtip first... - if (file_exists(QTIP_PATH . QTIP_FILE)) { - drupal_add_js(QTIP_PATH . QTIP_FILE); - } - drupal_add_js(drupal_get_path('module', 'qtip') . '/js/qtip.js'); + drupal_add_js(array('qtip' => $settings), 'setting'); - // Only load qtip.admin.js file if currently viewing qTip settings page - if (request_uri() == base_path() . 'admin/config/content/qtip') { - drupal_add_js(drupal_get_path('module', 'qtip') . '/js/qtip.admin.js'); - } + return $libraries; } /** @@ -110,9 +104,9 @@ -/** +/****************************************** * Private functions - */ + ******************************************/ /** * Callback function for qtip_filter_info().