diff --git a/core/css/jquery-tipsy.css b/core/css/jquery-tipsy.css
index 5075f41c9f..957385a269 100644
--- a/core/css/jquery-tipsy.css
+++ b/core/css/jquery-tipsy.css
@@ -1,7 +1,25 @@
-.tipsy { padding: 5px; font-size: 10px; opacity: 0.8; filter: alpha(opacity=80); background-repeat: no-repeat; background-image: url(../img/jquery-tipsy.gif); }
- .tipsy-inner { padding: 5px 8px 4px 8px; background-color: black; color: white; max-width: 200px; text-align: center; }
- .tipsy-inner { -moz-border-radius:3px; -webkit-border-radius:3px; }
- .tipsy-north { background-position: top center; }
- .tipsy-south { background-position: bottom center; }
- .tipsy-east { background-position: right center; }
- .tipsy-west { background-position: left center; }
+.tipsy { font-size:10px; position:absolute; padding:5px; z-index:100000; }
+.tipsy-inner { background-color:#000; color:#FFF; max-width:200px; padding:5px 8px 4px 8px; text-align:center; }
+
+/* Rounded corners */
+.tipsy-inner { border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; }
+
+/* Uncomment for shadow */
+/*.tipsy-inner { box-shadow:0 0 5px #000000; -webkit-box-shadow:0 0 5px #000000; -moz-box-shadow:0 0 5px #000000; }*/
+
+.tipsy-arrow { position:absolute; width:0; height:0; border:5px solid transparent; }
+
+/* Rules to colour arrows */
+.tipsy-arrow-n { border-bottom-color:#000; }
+.tipsy-arrow-s { border-top-color:#000; }
+.tipsy-arrow-e { border-left-color:#000; }
+.tipsy-arrow-w { border-right-color:#000; }
+
+.tipsy-n .tipsy-arrow, .tipsy-nw .tipsy-arrow, .tipsy-ne .tipsy-arrow { top:0; border-top:none; }
+.tipsy-s .tipsy-arrow, .tipsy-sw .tipsy-arrow, .tipsy-se .tipsy-arrow { bottom:0; border-bottom:none; }
+.tipsy-n .tipsy-arrow, .tipsy-s .tipsy-arrow { left:50%; margin-left:-5px; }
+.tipsy-nw .tipsy-arrow, .tipsy-sw .tipsy-arrow { left:10px; }
+.tipsy-ne .tipsy-arrow, .tipsy-se .tipsy-arrow { right:10px; }
+.tipsy-e .tipsy-arrow, .tipsy-w .tipsy-arrow { top:50%; margin-top:-5px; }
+.tipsy-e .tipsy-arrow { right:0; border-right:none; }
+.tipsy-w .tipsy-arrow { left:0; border-left:none; }
diff --git a/core/js/jquery-tipsy.js b/core/js/jquery-tipsy.js
index 58d834771f..9567ed3bac 100644
--- a/core/js/jquery-tipsy.js
+++ b/core/js/jquery-tipsy.js
@@ -1,84 +1,194 @@
-// tipsy - Facebook-style tooltip plugin for jQuery
-// (c) 2008-2009 Jason Frame (jason@onehackoranother.com)
-// Released under The MIT License.
+// tipsy, facebook style tooltips for jquery
+// version 1.0.0a
+// (c) 2008-2010 jason frame [jason@onehackoranother.com]
+// released under the MIT license
(function($) {
- $.fn.tipsy = function(options) {
-
- options = $.extend({}, $.fn.tipsy.defaults, options);
-
- return this.each(function() {
-
- var opts = $.fn.tipsy.elementOptions(this, options);
-
- $(this).hover(function() {
-
- $.data(this, 'cancel.tipsy', true);
-
- var tip = $.data(this, 'active.tipsy');
- if (!tip) {
- tip = $('
');
- tip.css({position: 'absolute', zIndex: 100000});
- $.data(this, 'active.tipsy', tip);
- }
-
- if ($(this).attr('title') || typeof($(this).attr('original-title')) != 'string') {
- $(this).attr('original-title', $(this).attr('title') || '').removeAttr('title');
- }
-
- var title;
- if (typeof opts.title == 'string') {
- title = $(this).attr(opts.title == 'title' ? 'original-title' : opts.title);
- } else if (typeof opts.title == 'function') {
- title = opts.title.call(this);
- }
-
- tip.find('.tipsy-inner')[opts.html ? 'html' : 'text'](title || opts.fallback);
-
- var pos = $.extend({}, $(this).offset(), {width: this.offsetWidth, height: this.offsetHeight});
- tip.get(0).className = 'tipsy'; // reset classname in case of dynamic gravity
- tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).appendTo(document.body);
- var actualWidth = tip[0].offsetWidth, actualHeight = tip[0].offsetHeight;
- var gravity = (typeof opts.gravity == 'function') ? opts.gravity.call(this) : opts.gravity;
-
+
+ function maybeCall(thing, ctx) {
+ return (typeof thing == 'function') ? (thing.call(ctx)) : thing;
+ };
+
+ function Tipsy(element, options) {
+ this.$element = $(element);
+ this.options = options;
+ this.enabled = true;
+ this.fixTitle();
+ };
+
+ Tipsy.prototype = {
+ show: function() {
+ var title = this.getTitle();
+ if (title && this.enabled) {
+ var $tip = this.tip();
+
+ $tip.find('.tipsy-inner')[this.options.html ? 'html' : 'text'](title);
+ $tip[0].className = 'tipsy'; // reset classname in case of dynamic gravity
+ $tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).prependTo(document.body);
+
+ var pos = $.extend({}, this.$element.offset(), {
+ width: this.$element[0].offsetWidth,
+ height: this.$element[0].offsetHeight
+ });
+
+ var actualWidth = $tip[0].offsetWidth,
+ actualHeight = $tip[0].offsetHeight,
+ gravity = maybeCall(this.options.gravity, this.$element[0]);
+
+ var tp;
switch (gravity.charAt(0)) {
case 'n':
- tip.css({top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}).addClass('tipsy-north');
+ tp = {top: pos.top + pos.height + this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2};
break;
case 's':
- tip.css({top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}).addClass('tipsy-south');
+ tp = {top: pos.top - actualHeight - this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2};
break;
case 'e':
- tip.css({top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}).addClass('tipsy-east');
+ tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth - this.options.offset};
break;
case 'w':
- tip.css({top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}).addClass('tipsy-west');
+ tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width + this.options.offset};
break;
}
-
- if (opts.fade) {
- tip.css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: 0.8});
- } else {
- tip.css({visibility: 'visible'});
- }
-
- }, function() {
- $.data(this, 'cancel.tipsy', false);
- var self = this;
- setTimeout(function() {
- if ($.data(this, 'cancel.tipsy')) return;
- var tip = $.data(self, 'active.tipsy');
- if (opts.fade) {
- tip.stop().fadeOut(function() { $(this).remove(); });
+
+ if (gravity.length == 2) {
+ if (gravity.charAt(1) == 'w') {
+ tp.left = pos.left + pos.width / 2 - 15;
} else {
- tip.remove();
+ tp.left = pos.left + pos.width / 2 - actualWidth + 15;
}
- }, 100);
-
- });
-
- });
+ }
+
+ $tip.css(tp).addClass('tipsy-' + gravity);
+ $tip.find('.tipsy-arrow')[0].className = 'tipsy-arrow tipsy-arrow-' + gravity.charAt(0);
+ if (this.options.className) {
+ $tip.addClass(maybeCall(this.options.className, this.$element[0]));
+ }
+
+ if (this.options.fade) {
+ $tip.stop().css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: this.options.opacity});
+ } else {
+ $tip.css({visibility: 'visible', opacity: this.options.opacity});
+ }
+ }
+ },
+ hide: function() {
+ if (this.options.fade) {
+ this.tip().stop().fadeOut(function() { $(this).remove(); });
+ } else {
+ this.tip().remove();
+ }
+ },
+
+ fixTitle: function() {
+ var $e = this.$element;
+ if ($e.attr('title') || typeof($e.attr('original-title')) != 'string') {
+ $e.attr('original-title', $e.attr('title') || '').removeAttr('title');
+ }
+ },
+
+ getTitle: function() {
+ var title, $e = this.$element, o = this.options;
+ this.fixTitle();
+ var title, o = this.options;
+ if (typeof o.title == 'string') {
+ title = $e.attr(o.title == 'title' ? 'original-title' : o.title);
+ } else if (typeof o.title == 'function') {
+ title = o.title.call($e[0]);
+ }
+ title = ('' + title).replace(/(^\s*|\s*$)/, "");
+ return title || o.fallback;
+ },
+
+ tip: function() {
+ if (!this.$tip) {
+ this.$tip = $('').html('');
+ }
+ return this.$tip;
+ },
+
+ validate: function() {
+ if (!this.$element[0].parentNode) {
+ this.hide();
+ this.$element = null;
+ this.options = null;
+ }
+ },
+
+ enable: function() { this.enabled = true; },
+ disable: function() { this.enabled = false; },
+ toggleEnabled: function() { this.enabled = !this.enabled; }
+ };
+
+ $.fn.tipsy = function(options) {
+
+ if (options === true) {
+ return this.data('tipsy');
+ } else if (typeof options == 'string') {
+ var tipsy = this.data('tipsy');
+ if (tipsy) tipsy[options]();
+ return this;
+ }
+
+ options = $.extend({}, $.fn.tipsy.defaults, options);
+
+ function get(ele) {
+ var tipsy = $.data(ele, 'tipsy');
+ if (!tipsy) {
+ tipsy = new Tipsy(ele, $.fn.tipsy.elementOptions(ele, options));
+ $.data(ele, 'tipsy', tipsy);
+ }
+ return tipsy;
+ }
+
+ function enter() {
+ var tipsy = get(this);
+ tipsy.hoverState = 'in';
+ if (options.delayIn == 0) {
+ tipsy.show();
+ } else {
+ tipsy.fixTitle();
+ setTimeout(function() { if (tipsy.hoverState == 'in') tipsy.show(); }, options.delayIn);
+ }
+ };
+
+ function leave() {
+ var tipsy = get(this);
+ tipsy.hoverState = 'out';
+ if (options.delayOut == 0) {
+ tipsy.hide();
+ } else {
+ setTimeout(function() { if (tipsy.hoverState == 'out') tipsy.hide(); }, options.delayOut);
+ }
+ };
+
+ if (!options.live) this.each(function() { get(this); });
+
+ if (options.trigger != 'manual') {
+ var binder = options.live ? 'live' : 'bind',
+ eventIn = options.trigger == 'hover' ? 'mouseenter' : 'focus',
+ eventOut = options.trigger == 'hover' ? 'mouseleave' : 'blur';
+ this[binder](eventIn, enter)[binder](eventOut, leave);
+ }
+
+ return this;
+
+ };
+
+ $.fn.tipsy.defaults = {
+ className: null,
+ delayIn: 0,
+ delayOut: 0,
+ fade: false,
+ fallback: '',
+ gravity: 'n',
+ html: false,
+ live: false,
+ offset: 0,
+ opacity: 0.8,
+ title: 'title',
+ trigger: 'hover'
};
// Overwrite this method to provide options on a per-element basis.
@@ -89,14 +199,6 @@
return $.metadata ? $.extend({}, options, $(ele).metadata()) : options;
};
- $.fn.tipsy.defaults = {
- fade: false,
- fallback: '',
- gravity: 'n',
- html: false,
- title: 'title'
- };
-
$.fn.tipsy.autoNS = function() {
return $(this).offset().top > ($(document).scrollTop() + $(window).height() / 2) ? 's' : 'n';
};
@@ -105,4 +207,35 @@
return $(this).offset().left > ($(document).scrollLeft() + $(window).width() / 2) ? 'e' : 'w';
};
+ /**
+ * yields a closure of the supplied parameters, producing a function that takes
+ * no arguments and is suitable for use as an autogravity function like so:
+ *
+ * @param margin (int) - distance from the viewable region edge that an
+ * element should be before setting its tooltip's gravity to be away
+ * from that edge.
+ * @param prefer (string, e.g. 'n', 'sw', 'w') - the direction to prefer
+ * if there are no viewable region edges effecting the tooltip's
+ * gravity. It will try to vary from this minimally, for example,
+ * if 'sw' is preferred and an element is near the right viewable
+ * region edge, but not the top edge, it will set the gravity for
+ * that element's tooltip to be 'se', preserving the southern
+ * component.
+ */
+ $.fn.tipsy.autoBounds = function(margin, prefer) {
+ return function() {
+ var dir = {ns: prefer[0], ew: (prefer.length > 1 ? prefer[1] : false)},
+ boundTop = $(document).scrollTop() + margin,
+ boundLeft = $(document).scrollLeft() + margin,
+ $this = $(this);
+
+ if ($this.offset().top < boundTop) dir.ns = 'n';
+ if ($this.offset().left < boundLeft) dir.ew = 'w';
+ if ($(window).width() + $(document).scrollLeft() - $this.offset().left < margin) dir.ew = 'e';
+ if ($(window).height() + $(document).scrollTop() - $this.offset().top < margin) dir.ns = 's';
+
+ return dir.ns + (dir.ew ? dir.ew : '');
+ }
+ };
+
})(jQuery);
diff --git a/core/js/js.js b/core/js/js.js
index cddf95a843..e226368593 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -298,11 +298,17 @@ $(document).ready(function(){
$('#settings #expanddiv').slideUp();
}
});
-
- if($('.action').attr('title')) $('.action').tipsy({gravity:'s', fade:true, live:true});
- $('.selectedActions a').tipsy({gravity:'n', fade:true, live:true});
+
+ $('.remove .action').tipsy({gravity:'se', fade:true, live:true});
+ $('.date .action').tipsy({gravity:'se', fade:true, live:true});
+ $('.action').tipsy({gravity:'s', fade:true, live:true});
$('.selectedActions a.delete').tipsy({gravity: 'ne', fade:true, live:true});
- $('input#identity').tipsy({gravity:'w', fade:true});
+ $('.selectedActions a').tipsy({gravity:'n', fade:true, live:true});
+ $('input').each(function(i,input) {
+ if($(input).attr('title')) {
+ $(input).tipsy({gravity:'w', fade:true});
+ }
+ });
});
if (!Array.prototype.map){
diff --git a/files/js/files.js b/files/js/files.js
index 23ea0fd279..4eb8feb87d 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -19,7 +19,7 @@ $(document).ready(function() {
});
$('.file_upload_button_wrapper').tipsy({gravity:'e', fade:true});
- $('td.filesize').tipsy({gravity:'se', fade:true, live:true});
+ $('td.filesize').tipsy({gravity:'s', fade:true, live:true});
$('td .modified').tipsy({gravity:'s', fade:true, live:true});
// Sets the file-action buttons behaviour :
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 7499de1e05..c73e08437c 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -11,7 +11,7 @@ td.password>img, td.remove>img { display:none; cursor:pointer; }
td.password>span { margin-right:1.2em; }
td.password { width:12em; cursor:pointer; }
-td.remove { width:1em; }
+td.remove { width:1em; padding-right:1em; }
tr:hover>td.password>span { margin:0; cursor:pointer; }
tr:hover>td.remove>img, tr:hover>td.password>img { display:inline; cursor:pointer; }
tr:hover>td.remove>img { float:right; }
diff --git a/settings/js/users.js b/settings/js/users.js
index 4c9aedd0e2..bc1b8fc3ed 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -104,7 +104,7 @@ $(document).ready(function(){
});
tr.find('td.groups').append(select);
if(tr.find('td.remve img').length==0){
- tr.find('td.remove').append($(''));
+ tr.find('td.remove').append($(''));
}
applyMultiplySelect(select);
$('#content table tr').last().after(tr);
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 5919ccb7df..01e2adf4e9 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -22,7 +22,7 @@ foreach($_["groups"] as $group) {
|
●●●●●●●
-
+
|
|
-
+
|