";
html += options.enableQuitBuggingMe ?
("
" +
- "Quit bugging me" +
+ options.messageQuitBuggingMe +
"") :
- ("
" +
"close" +
"");
@@ -132,10 +137,7 @@
this.close();
},
close: function() {
- var overlay = document.getElementById('sevenUpOverlay');
- var lightbox = document.getElementById('sevenUpLightbox');
- if (overlay) { overlay.style.display = 'none'; }
- if (lightbox) { lightbox.style.display = 'none'; }
+ jQuery ("#sevenUpOverlay, #sevenUpLightbox").hide();
},
plugin: {}
};
Index: sevenup/sevenup.info
===================================================================
--- sevenup/sevenup.info (revision 14459)
+++ sevenup/sevenup.info (working copy)
@@ -1,11 +1,6 @@
+;$Id;
name=Seven Up
description=add the sevenup script to suggest/force users to upgrage their browser to something other than IE 6
-core=6.x
-
-;$Id;
-; Information added by drupal.org packaging script on 2009-05-12
-version = "6.x-0.3"
-core = "6.x"
-project = "sevenup"
-datestamp = "1242113162"
+core = 7.x
+files[] = sevenup.module
Index: sevenup/sevenup.module
===================================================================
--- sevenup/sevenup.module (revision 14459)
+++ sevenup/sevenup.module (working copy)
@@ -1,5 +1,5 @@
'Seven Up Settings',
+ 'description' => 'Configure what to do when IE6 is detected.',
'page callback' => 'drupal_get_form',
'page arguments' => array('sevenup_admin_settings_form'),
'access arguments' => array('administer site configuration'),
@@ -25,7 +26,7 @@
/**
* create the admin settings form
*/
-function sevenup_admin_settings_form() {
+function sevenup_admin_settings_form($form, &$form_state) {
$form = array();
$options = array(
'true' => t('Yes'),
@@ -62,7 +63,7 @@
);
$form['sevenUp_downloadLink'] = array(
'#title' => t('What Browser Do you want to suggest?'),
- '#description' => t('A link will be displayed for the user to upgrade their browser. Which browser would you like to recommend? If you choose Internet Explorer and the user is using an operating system that cannot handle IE 7 or IE 8 the user will be pointed to Firefox.s'),
+ '#description' => t('A link will be displayed for the user to upgrade their browser. Which browser would you like to recommend? If you choose Internet Explorer and the user is using an operating system that cannot handle IE 7 or IE 8 the user will be pointed to Firefox.'),
'#default_value' => variable_get('sevenUp_downloadLink', 1),
'#type' => 'radios',
'#options' => array(
@@ -87,21 +88,123 @@
1 => t('Yes'),
),
);
+
+ $form['text'] = array(
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#title' => t('Message text'),
+ '#description' => t('You can change the default message header and text here.
+ Be very careful in changing the body text, as propper HTML must be used.'),
+ );
+ $form['text']['sevenUp_messageHeader'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Message Heading'),
+ '#description' => t('Enter the main heading the message box.'),
+ '#default_value' => variable_get('sevenUp_messageHeader', t('Your web browser is outdated')),
+ );
+ $form['text']['sevenUp_messageEasilyUpgrade'] = array(
+ '#type' => 'textfield',
+ '#title' => t('"Easily upgrade" text'),
+ '#description' => t('Specify text you want to appear for the "You can easily upgrade to the latest version at" for the standard version of sevenUp.'),
+ '#default_value' => variable_get('sevenUp_messageEasilyUpgrade', t('You can easily upgrade to the latest version at')),
+ );
+ $form['text']['sevenUp_messageEasilyUpgradeBlack'] = array(
+ '#type' => 'textfield',
+ '#title' => t('"Easily upgrade" text for the Black plugin'),
+ '#description' => t('Specify text you want to appear for the "You can easily upgrade to the latest version" for the black plugin of sevenUp.'),
+ '#default_value' => variable_get('sevenUp_messageEasilyUpgradeBlack', t('You can easily upgrade to the latest version')),
+ );
+ $form['text']['sevenUp_messageBody'] = array(
+ '#type' => 'textarea',
+ '#title' => t('Message Body'),
+ '#description' => t('Enter the body of the message.
Make sure you use valid HTML, and properly close all tags!'),
+ '#default_value' => variable_get('sevenUp_messageBody', t(
+ "
Why should I upgrade?
+
+ - Websites load faster, often double the speed of this older version
+ - Websites look better, so you see sites they way they were intended
+ - Tabs let you view multiple sites in one window
+ - Safer browsing with phishing protection
+
")),
+ );
+ $form['text']['sevenUp_messageBodyBlack'] = array(
+ '#type' => 'textarea',
+ '#title' => t('Message Body for Black version'),
+ '#description' => t('Enter the body of the message for the black version of sevenUp.
Make sure you use valid HTML, and properly close all tags!'),
+ '#default_value' => variable_get('sevenUp_messageBodyBlack', t(
+ "
Why should I upgrade?
+
+ - Web sites load faster
+ - often double the speed of this older version.
+ - Web sites render correctly
+ - with more web standards compliance.
+ - Tabs Interface
+ - lets you view multiple sites in one window.
+ - Safer browsing
+ - with better security and phishing protection.
+ - Convenient Printing
+ - with fit-to-page capability.
+
")),
+ );
+ $form['text']['sevenUp_exploreOtherHeading'] = array(
+ '#type' => 'textfield',
+ '#title' => t('"Explore other browsers" text'),
+ '#description' => t('Text with which to replace the "Explore other browsers" heading.'),
+ '#default_value' => variable_get('sevenUp_exploreOtherHeading', t('Explore other browsers')),
+ );
+ $form['text']['sevenUp_messageQuitBuggingMe'] = array(
+ '#type' => 'textfield',
+ '#title' => t('"Quit bugging me" text'),
+ '#description' => t('Text with which to replace the "quit bugging me" message.'),
+ '#default_value' => variable_get('sevenUp_messageQuitBuggingMe', t('Remind me again after seven days')),
+ );
+
+
return system_settings_form($form);
}
/**
- * Implementation of hook_init().
+ * Implements hook_init().
*/
function sevenup_init() {
- drupal_add_js(drupal_get_path('module', 'sevenup') .'/sevenup.0.3.js', 'module');
- $test_function = 'sevenUp.test(options);';
+ /* Don't lock yourself out of admin */
+ if (arg (0) == 'admin')
+ return;
+ drupal_add_js(drupal_get_path('module', 'sevenup') . '/sevenup.0.3.js');
if (variable_get('sevenup_black_plugin', 0)) {
- $test_function = 'sevenUp.plugin.black.test';
drupal_add_js(drupal_get_path('module', 'sevenup') .'/sevenup_black.0.3.js');
+ $test_function = 'sevenUp.plugin.black.test';
+ $easily_upgrade_text = variable_get('sevenUp_messageEasilyUpgradeBlack', t('You can easily upgrade to the latest version'));
+ $message_body = preg_replace( "/\s\s+/", ' ', variable_get('sevenUp_messageBodyBlack', t(
+ "
Why should I upgrade?
+
+ - Web sites load faster
+ - often double the speed of this older version.
+ - Web sites render correctly
+ - with more web standards compliance.
+ - Tabs Interface
+ - lets you view multiple sites in one window.
+ - Safer browsing
+ - with better security and phishing protection.
+ - Convenient Printing
+ - with fit-to-page capability.
+
")) );
+ }
+ else {
+ $test_function = 'sevenUp.test(options);';
+ $easily_upgrade_text = variable_get('sevenUp_messageEasilyUpgrade', t('You can easily upgrade to the latest version at'));
+ $message_body = preg_replace( "/\s\s+/", ' ', variable_get('sevenUp_messageBody', t(
+ "
Why should I upgrade?
+
+ - Websites load faster, often double the speed of this older version
+ - Websites look better, so you see sites they way they were intended
+ - Tabs let you view multiple sites in one window
+ - Safer browsing with phishing protection
+
")) );
}
- drupal_add_js('$(document).ready(function(){
+ drupal_add_js('jQuery(document).ready(function(){
var options = {
enableClosing: '. variable_get('sevenUp_enableClosing', 'true') .',
enableQuitBuggingMe: '. variable_get('sevenUp_enableQuitBuggingMe', 'true') .',
@@ -111,8 +214,13 @@
'. (variable_get('sevenUp_downloadLink', 1) ? '' : 'downloadLink: "http://www.getfirefox.com",' ) .'
overrideLightbox: false,
lightboxHTML: null,
- showToAllBrowsers: '. variable_get('sevenUp_showToAllBrowsers', 'false') .'
+ showToAllBrowsers: '. variable_get('sevenUp_showToAllBrowsers', 'false') .',
+ messageHeading: "' . variable_get('sevenUp_messageHeader', t('Your web browser is outdated')) . '",
+ messageEasilyUpgrade: "' . $easily_upgrade_text . '",
+ messageBody: "' . $message_body . '",
+ exploreOtherHeading: "' . variable_get('sevenUp_exploreOtherHeading', t('Explore other browsers')) . '",
+ messageQuitBuggingMe: "' . variable_get('sevenUp_messageQuitBuggingMe', t('Remind me again after seven days')) . '"
};
'. $test_function .'(options);
- });', 'inline');
+ });', array('type' => 'inline'));
}
\ No newline at end of file
Index: sevenup/sevenup.0.3_beta.js
===================================================================
--- sevenup/sevenup.0.3_beta.js (revision 14459)
+++ sevenup/sevenup.0.3_beta.js (working copy)
@@ -1,138 +0,0 @@
-// Thanks for doing your part to liber(IE)t the world from IE6!
-// Here's to the "Support but Discourage" approach :)
-// Original copy written by Jonathan Howard.
-// jon@StaringIsPolite.com // twitter.com/staringispolite
-//
-// GNU LGPL License v3
-// SevenUp is released into the wild under a GNU LGPL v3
-//
-// Browser sniffing technique lovingly adapted from http://www.thefutureoftheweb.com/
-// Simple CSS Lightbox technique adapted equally lovingly from http://www.emanueleferonato.com/
-// Go read their blogs :)
-
-// Constructor technique advocated by Doug Crockford (of LSlint, JSON) in his recent Google tech talk.
-var sevenUp = function() {
- // Define 'private vars' here.
- var osSupportsUpgrade = /(Windows NT 5.1|Windows NT 6.0|Windows NT 6.1|)/i.test(navigator.userAgent); // XP, Vista, Win7
- var options = { // Change these to fit your color scheme via the 'options' arg for test().
- enableClosing: true,
- enableQuitBuggingMe: true,
- overlayColor: "#000000",
- lightboxColor: "#ffffff",
- borderColor: "#6699ff",
- downloadLink: osSupportsUpgrade ?
- "http://www.microsoft.com/windows/internet-explorer" :
- "http://getfirefox.com",
- overrideLightbox: false,
- lightboxHTML: null,
- showToAllBrowsers: false
- };
- // Hate to define CSS this way, but trying to keep to one file.
- // I'll keep it as pretty as possible.
- function overlayCSS() {
- return "display: block; position: absolute; top: 0%; left: 0%;" +
- "width: 100%; height: 100%; background-color: " + options.overlayColor + "; " +
- "filter: alpha(opacity: 80); z-index:1001;";
- }
- function lightboxCSS() {
- return "display: block; position: absolute; top: 25%; left: 25%; width: 50%; " +
- "padding: 16px; border: 8px solid " + options.borderColor + "; " +
- "background-color:" + options.lightboxColor + "; " +
- "z-index:1002; overflow: hidden;";
- }
- function lightboxContents() {
- if (!options.lightboxHTML) {
- var html =
- "
" +
- "
Your web browser is outdated and unsupported
" +
- "
" +
- "
Why should I upgrade?
" +
- "
" +
- "- Websites load faster, often double the speed of this older version
" +
- "- Websites look better, so you see sites they way they were intended
" +
- "- Tabs let you view multiple sites in one window
" +
- "- Safer browsing with phishing protection
" +
- "
" +
- "
";
- if (options.enableClosing) {
- html += "
";
- }
- }
- return (options.lightboxHTML = html);
- }
- function mergeInOptions(newOptions) {
- if (newOptions) {
- for (var i in options) {
- if (newOptions[i] !== undefined) {
- options[i] = newOptions[i];
- }
- }
- }
- }
- function isCookieSet() {
- if (document.cookie.length > 0) {
- var i = document.cookie.indexOf("sevenup=");
- return (i != -1);
- }
- return false;
- }
-
- // Return object literal and public methods here.
- return {
- test: function(newOptions, callback) {
- mergeInOptions(newOptions);
- if (!isCookieSet()) {
- // Write layer into the document.
- var layerHTML = "
";
- if (!options.overrideLightbox) {
- layerHTML += "
" +
- "
" +
- "
" +
- lightboxContents() +
- "
";
- }
- if (options.showToAllBrowsers !== true) {
- layerHTML = "";
- }
- var layer = document.createElement('div');
- layer.innerHTML = layerHTML;
- document.body.appendChild(layer);
- // Fire callback.
- // I don't like this hack but IE6 seems to restrict dynamically created