diff --git a/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig index 574f7d55fb..9af10f81d3 100644 --- a/templates/web/prod/Tooltip/Basket.html.twig +++ b/templates/web/prod/Tooltip/Basket.html.twig @@ -1,5 +1,5 @@ {% import 'common/thumbnail.html' as thumbnail %} -
+
{{ basket.getName() }} @@ -15,13 +15,15 @@ {{ nb_records }} records {% endtrans %} - {{ date }} -
-
- {% for element in basket.getElements() %} - {% if loop.index <= 9 %} -
- {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80 , '', session) }} -
- {% endif %} - {% endfor %} +
+
+ {% for element in basket.getElements() %} + {% if loop.index <= 9 %} +
+ {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80 , '', session) }} +
+ {% endif %} + {% endfor %} +
+
diff --git a/templates/web/prod/Tooltip/Story.html.twig b/templates/web/prod/Tooltip/Story.html.twig index fa08e664e2..944532df88 100644 --- a/templates/web/prod/Tooltip/Story.html.twig +++ b/templates/web/prod/Tooltip/Story.html.twig @@ -1,5 +1,5 @@ {% import 'common/thumbnail.html' as thumbnail %} -
+
{{ Story.get_title() }} @@ -15,13 +15,15 @@ {{ nb_records }} records {% endtrans %} - {{ date }} -
-
- {% for element in Story.get_children().get_elements() %} - {% if loop.index <= 9 %} -
- {{ thumbnail.format(element.get_thumbnail(), 80, 80 , '', session) }} -
- {% endif %} - {% endfor %} +
+
+ {% for element in Story.get_children().get_elements() %} + {% if loop.index <= 9 %} +
+ {{ thumbnail.format(element.get_thumbnail(), 80, 80 , '', session) }} +
+ {% endif %} + {% endfor %} +
+
diff --git a/www/include/jquery.tooltip.js b/www/include/jquery.tooltip.js index 441e0d2960..326509c66b 100644 --- a/www/include/jquery.tooltip.js +++ b/www/include/jquery.tooltip.js @@ -7,14 +7,14 @@ * Copyright (c) 2006 - 2008 J�rn Zaefferer * * $Id: jquery.tooltip.js 5741 2008-06-21 15:22:16Z joern.zaefferer $ - * + * * Dual licensed under the MIT and GPL licenses: * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl.html */ - + (function($) { - + // the tooltip element var helper = {}, // the title of the current element, used for restoring @@ -25,7 +25,7 @@ IE = $.browser.msie && (/MSIE\s(5\.5|6\.)/).test(navigator.userAgent), // flag for mouse tracking track = false; - + $.tooltip = { blocked: false, ajaxTimeout : false, @@ -71,7 +71,7 @@ }); } }; - + $.fn.extend({ tooltip: function(settings) { settings = $.extend({}, $.tooltip.defaults, settings); @@ -131,7 +131,7 @@ return this.attr('href') || this.attr('src'); } }); - + function createHelper(settings) { // there can be only one tooltip helper if( helper.parent ) @@ -142,7 +142,7 @@ .appendTo(document.body) // hide it at first .hide(); - + // apply bgiframe if available if ( $.fn.bgiframe ) helper.parent.bgiframe(); @@ -152,11 +152,11 @@ helper.body = $('div.body', helper.parent); helper.url = $('div.url', helper.parent); } - + function settings(element) { return $.data(element, "tooltip"); } - + // main event handler to start showing tooltips function handle(event) { @@ -169,15 +169,15 @@ else visible(); show(); - + // if selected, update the helper position when the mouse moves track = !!settings(this).track; $(document.body).bind('mousemove', update); - + // update at least once update(event); } - + // save elements title before the tooltip is displayed function save(event) { // if this is the current source, or it has no title (occurs with click event), stop @@ -192,7 +192,7 @@ // save current $.tooltip.current = this; title = this.tooltipText; - + // if ( settings(this).bodyHandler ) { // helper.title.hide(); // var bodyContent = settings(this).bodyHandler.call(this); @@ -215,13 +215,13 @@ // } else { // helper.body.html(title).show(); // } - + // if element has href or src, add and show it, otherwise hide it if( settings(this).showURL && $(this).url() ) helper.url.html( $(this).url().replace('http://', '') ).show(); else helper.url.hide(); - + // add an optional class for this tip // helper.parent.addClass(settings(this).extraClass); if(this.ajaxLoad) @@ -251,8 +251,11 @@ var width = 'auto'; var height = 'auto'; var ratio = 1; + var resizeImgTips = false; var $imgTips = $('#' + settings($.tooltip.current).id + ' .imgTips'); - if ($imgTips[0]) { + + if ($imgTips[0] && $('#' + settings($.tooltip.current).id + ' .noToolTipResize').length === 0) { + resizeImgTips = true; width = parseInt($imgTips[0].style.width); height = parseInt($imgTips[0].style.height); ratio = width/height; @@ -325,7 +328,7 @@ //correction par ratio - if ($('#' + settings($.tooltip.current).id + ' .imgTips')[0]) { + if (resizeImgTips && $('#' + settings($.tooltip.current).id + ' .imgTips')[0]) { if(ratioSurfaceH > ratioImage) { @@ -403,7 +406,7 @@ //si ya une image on re-ajuste au ratio - if ($('#' + settings($.tooltip.current).id + ' .imgTips')[0]) { + if (resizeImgTips && $('#' + settings($.tooltip.current).id + ' .imgTips')[0]) { if(width == 'auto') width = $('#' + settings($.tooltip.current).id).width(); if(height == 'auto') @@ -439,20 +442,14 @@ top: top }); - $imgTips.css({ - width: width, - height: height -// , -// left: left, -// top: top - }); + if(resizeImgTips) + { + $imgTips.css({ + width: width, + height: height + }); + } -// if($imgTips.size() > 0) -// { -// $('#' + settings($.tooltip.current).id).image_enhance('destroy').image_enhance({ -// zoomable:true -// }); -// } } } @@ -463,7 +460,7 @@ // delete timeout and show helper function show() { tID = null; - + if ((!IE || !$.fn.bgiframe) && settings($.tooltip.current).fade) { if (helper.parent.is(":animated")) helper.parent.stop().show().fadeTo(settings($.tooltip.current).fade, 100); @@ -474,7 +471,7 @@ } update(); } - + function fix(event) { if(!settings(this).fixable) @@ -489,21 +486,21 @@ $('#tooltip .tooltip_closer').show(); $.tooltip.blocked = true; } - + function visible(){ $.tooltip.visible = true; helper.parent.css({ visibility:'visible' }); } - + /** * callback for mousemove * updates the helper position * removes itself when no current element */ function update(event) { - + if($.tooltip.blocked) return; @@ -515,7 +512,7 @@ if ( !track && helper.parent.is(":visible")) { $(document.body).unbind('mousemove', update); } - + // if no current element is available, remove this listener if( $.tooltip.current === null ) { $(document.body).unbind('mousemove', update); @@ -524,7 +521,7 @@ // remove position helper classes helper.parent.removeClass("viewport-right").removeClass("viewport-bottom"); - + if(!settings($.tooltip.current).outside) { var left = helper.parent[0].offsetLeft; @@ -546,7 +543,7 @@ top: top }); } - + var v = viewport(), h = helper.parent[0]; // check horizontal position @@ -565,17 +562,17 @@ } } } - + function viewport() { return { x: $(window).width(), y: $(window).height(), - + cx: 0, cy: 0 }; } - + // hide helper and restore added classes and the title function hide(event) { @@ -603,11 +600,11 @@ helper.parent.stop().fadeOut(tsettings.fade, complete); } else complete(); - + if( tsettings.fixPNG ) helper.parent.unfixPNG(); } - + })(jQuery); function unfix_tooltip()