');
+ this.$console = $('#accessibility-console');
+ this.$console.append('
');
+ var $close = this.$console.append('
×');
+ $close.click(function() {
+ that.hide()
+ return false;
});
+ },
+
+ show : function() {
+ this.init();
+ this.$console.removeClass('element-invisible');
+ $('body').trigger('accessibility-console-show');
+ },
+
+ hide : function() {
+ this.init();
+ this.$console.addClass('element-invisible');
+ $('body').trigger('accessibility-console-hide');
+ },
+
+ addTest : function(test) {
+ this.$console.append('
' + this.messages[test].title + '
');
+ },
+
+ showTests : function(tests) {
+ var that = this;
+ that.init();
+ var $content = that.$console.find('.accessibility-console-content');
+ $content.html('');
+ $.each(tests, function(index, test) {
+ $content.append('
' + that.messages[test].title + '
');
+ $content.append(that.messages[test].content);
+ });
+ that.show();
+ }
}
};
diff --git a/js/popover/accessibility.popover.css b/js/popover/accessibility.popover.css
deleted file mode 100644
index 65da779..0000000
--- a/js/popover/accessibility.popover.css
+++ /dev/null
@@ -1,103 +0,0 @@
-.accessibility-popover-wrap {
- display: none;
- position: absolute;
-}
-
-.accessibility-popover {
- z-index: 1000;
- width: 250px;
- padding: 10px;
- background: #f1f1f1;
- position: relative;
- border: 1px solid #999;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- -webkit-box-shadow: 0 1px 3px #aaa;
- -moz-box-shadow: 0 1px 3px #aaa;
- box-shadow: 0 1px 3px #aaa;
-}
-
-.accessibility-popover:before {
- position: absolute;
- content: '';
- top: -14px;
- left: 120px;
- height: 14px;
- width: 32px;
- background: url('arrow.png') no-repeat 0 0;
-}
-
-.accessibility-popover h3.accessibility-popover-title {
- text-align: center;
- color: #333;
- font-weight: bold;
- margin: 0 0 4px;
-}
-
-.accessibility-popover .accessibility-popover-content {
- margin: 0 0 10px;
-}
-
-.accessibility-popover ul {
- width: 100%;
- margin: 0;
-}
-
-.accessibility-popover li {
- list-style: none;
- margin: 0 000 1px;
-}
-
-.accessibility-popover li a {
- display: block;
- line-height: 1.5em;
- padding: 0 10px;
- background: #ccc;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- text-decoration: none;
- color: #000;
- text-shadow: 0 1px 1px #fff;
-}
-
-.accessibility-popover li a:hover {
- background: #cce4e7;
-}
-
-.accessibility-popover a.close {
- font-size: 22px;
- line-height: .5;
- position: absolute;
- bottom: 10px;
- left: 10px;
- color: #aaa;
- text-shadow: 0 -1px 1px rbga(0,0,0,.6);
- font-weight: bold;
- cursor: pointer;
- text-decoration: none !important;
- -webkit-transition: all .15s ease;
- -moz-transition: all .15s ease;
- transition: all .15s ease;
-}
-
-.accessibility-popover a.close:hover {
- color: #666;
-}
-
-.accessibility-popover a.close:active {
- bottom: 9px;
- color: #333;
-}
-
-#accessibility-popover-bg {
- position: fixed;
- background: #000;
- height: 100%;
- width: 100%;
- z-index: 999;
- display: none;
- top: 0;
- left: 0;
-}
\ No newline at end of file
diff --git a/js/popover/accessibility.popover.js b/js/popover/accessibility.popover.js
deleted file mode 100644
index 36ed16b..0000000
--- a/js/popover/accessibility.popover.js
+++ /dev/null
@@ -1,133 +0,0 @@
-;(function($) {
- var count = 0;
-
- $.accessibilityPopover = function(element, options) {
- var $element = $(element), plugin = this;
- var $all, $wrap, bg, $bg,
- activeClass, closeSpeed;
-
- var defaults = {
- remove : false, // If true, we remove the popover
- trigger: 'click', // what event should trigger the popover; http://api.jquery.com/bind/#bind1
- closeHTML: '×', // the text that gets displayed
- appearUnder: element, // accepts any jQuery selector
- escape: true, // enable using the escape button to close the popover
- clickOff: true, // enables closing the popover by clicking anywhere but the popover itself
- maskOpacity: 0, // the opacity of the background mask
- animationSpeed: 370, // the speed of the animation
- title: $element.text(), // the title of the popover
- content: '',
- };
-
- plugin.settings = {};
-
- plugin.init = function() {
- plugin.settings = $.extend({}, defaults, options);
-
- if (plugin.settings.remove) {
- $element.unbind(plugin.settings.trigger, plugin.bindTrigger);
- $('.accessibility-popover-wrap').remove();
- return;
- }
-
- bg = '#accessibility-popover-bg'; $bg = $(bg);
- activeClass = 'accessibility-popover-active';
- closeSpeed = plugin.settings.animationSpeed / 2.5;
-
- buildHTML();
-
- var close = '.accessibility-popover-wrap a.close';
- close += (plugin.settings.clickOff) ? ', ' + bg : '';
-
- $element.bind(plugin.settings.trigger, plugin.bindTrigger);
-
- if (plugin.settings.escape) {
- $('body').keyup(function(e) {
- if (e.which === 27) {
- var speed = (e.shiftKey) ? closeSpeed * 7 : closeSpeed;
- plugin.hidePopover(speed);
- }
- });
- }
-
- $(close).click(function(e) {
- var speed = (e.shiftKey) ? closeSpeed * 7 : closeSpeed;
- plugin.hidePopover(speed);
- e.preventDefault();
- });
- };
-
- plugin.destroy = function() {
-
- };
-
- plugin.showPopover = function(speed) {
- speed = typeof(speed) != 'undefined' ? speed : plugin.settings.animationSpeed;
-
- plugin.hidePopover();
-
- $bg.css('opacity', plugin.settings.maskOpacity).show();
- $element.addClass(activeClass);
-
- var $under = $(plugin.settings.appearUnder);
- var pos = $under.offset();
- var width = $under.width();
- var height = $under.height();
- var pop = $wrap.width();
- var context = { left : 0, top: 0 };
- if(typeof plugin.settings.context !== 'undefined') {
- context = plugin.settings.context.offset();
- }
-
- $wrap.css({
- left: (pos.left + (width / 2) - (pop / 2)) + context.left + 'px',
- top: (pos.top + height + 14) + context.top + 'px'
- }).fadeIn(speed);
- };
-
- plugin.hidePopover = function(speed) {
- speed = typeof(speed) != 'undefined' ? speed : closeSpeed;
- $bg.hide();
- $('.' + activeClass).removeClass(activeClass);
- $all.fadeOut(speed);
- };
-
- var buildHTML = function() {
- if (!$bg.length) $('body').append('
');
- $bg = $(bg);
- var markup = '
';
- $('body').append(markup);
-
- $all = $('.accessibility-popover-wrap');
- $wrap = $($all[count]);
-
- $wrap.find('.accessibility-popover-content').html(plugin.settings.content);
- };
-
- plugin.bindTrigger = function(e) {
- plugin.showPopover();
- e.preventDefault();
- };
-
- plugin.init();
- };
-
- $.fn.accessibilityPopover = function(options) {
- return this.each(function() {
- if (!$(this).data('accessibility-popover')) {
- var plugin = new $.accessibilityPopover(this, options);
- $(this).data('accessibility-popover', plugin);
- count++;
- }
- if(options.remove) {
- $(this).data('accessibility-popover', false);
- var plugin = new $.accessibilityPopover(this, options);
- count--;
- }
- });
- };
-})(jQuery);
\ No newline at end of file
diff --git a/js/popover/arrow.png b/js/popover/arrow.png
deleted file mode 100644
index d4a02e9..0000000
Binary files a/js/popover/arrow.png and /dev/null differ
diff --git a/modules/accessibility_content/css/accessibility_content.css b/modules/accessibility_content/css/accessibility_content.css
index 0c78d94..badb60d 100644
--- a/modules/accessibility_content/css/accessibility_content.css
+++ b/modules/accessibility_content/css/accessibility_content.css
@@ -3,7 +3,7 @@
bottom: 0px;
left: 20px;
font-size: 14px;
- background: #3A5D67;
+ background: #737C70;
padding: 10px;
border-radius: 5px 5px 0 0;
}
diff --git a/modules/accessibility_content/js/accessibility_content.js b/modules/accessibility_content/js/accessibility_content.js
index 873cda1..824f015 100644
--- a/modules/accessibility_content/js/accessibility_content.js
+++ b/modules/accessibility_content/js/accessibility_content.js
@@ -79,7 +79,8 @@
if ($('body').hasClass('accessibility-checked')) {
$(this).html(Drupal.settings.accessibility_content.toggle.off_message);
$('body').removeClass('accessibility-checked');
- that.removeChecks();
+ Drupal.accessibility.cleanUpHighlight();
+ Drupal.accessibility.errorConsole.hide();
}
else {
$(this).html(Drupal.settings.accessibility_content.toggle.on_message);
@@ -90,21 +91,12 @@
if (Drupal.settings.accessibility_content.show_default) {
$('#accessibility-content-toggle a').click();
}
- },
-
- removeChecks : function() {
- var that = this;
- $('.accessibility-result').each(function() {
- $(this).removeClass('accessibility-result')
- .removeClass('severe')
- .removeClass('moderate')
- .removeClass('suggestion');
- if (typeof $.fn.accessibilityPopover !== 'undefined') {
- $(this).accessibilityPopover({ remove : true });
- }
- else {
- $(this).unwrap();
- }
+ $('body').bind('accessibility-console-show', function() {
+ var height = $('#accessibility-console').outerHeight();
+ $('#accessibility-content-toggle').css('bottom', height + 'px');
+ });
+ $('body').bind('accessibility-console-hide', function() {
+ $('#accessibility-content-toggle').css('bottom', '0px');
});
},
@@ -114,17 +106,7 @@
return;
}
$('body').addClass('accessibility-checked');
- Drupal.accessibility.checkElement($('.ac-check-field'), this.testFailed);
- },
-
- testFailed : function(event) {
- var that = this;
- if (!event.element.hasClass('accessibility-result')) {
- event.element.addClass('accessibility-result')
- .addClass(event.severity);
-
- Drupal.accessibility.attachHint(event);
- }
+ Drupal.accessibility.checkElement($('.ac-check-field'));
}
};
})(jQuery);