From a7690d3cacb679146feb329a215d8a30b8502820 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Wed, 7 Aug 2013 18:47:34 +0200 Subject: [PATCH] Fix #1409 Css issue for record caption in lightbox --- templates/web/lightbox/IE6/feed.html.twig | 6 ++--- templates/web/lightbox/IE6/validate.html.twig | 6 ++--- templates/web/lightbox/feed.html.twig | 6 ++--- templates/web/lightbox/validate.html.twig | 6 ++--- www/skins/lightbox/jquery.lightbox.ie6.js | 24 +++++++++---------- www/skins/lightbox/jquery.lightbox.js | 24 +++++++++---------- www/skins/lightbox/lightbox.css | 6 ++--- www/skins/lightbox/lightboxie6.css | 2 +- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/templates/web/lightbox/IE6/feed.html.twig b/templates/web/lightbox/IE6/feed.html.twig index 8d5ab5ac33..654cdd89f3 100644 --- a/templates/web/lightbox/IE6/feed.html.twig +++ b/templates/web/lightbox/IE6/feed.html.twig @@ -32,7 +32,7 @@ -
+
{% if first_item %} {% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.get_record(), 'preview') %} {% set preview = first_item.get_record().get_preview() %} @@ -62,7 +62,7 @@
-
+
@@ -80,7 +80,7 @@
-
+
{% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %} {% if first_item %} {{caption.format_caption(first_item.get_record(), '', null, business)}} diff --git a/templates/web/lightbox/IE6/validate.html.twig b/templates/web/lightbox/IE6/validate.html.twig index eeccdff074..1e1f77b7e4 100644 --- a/templates/web/lightbox/IE6/validate.html.twig +++ b/templates/web/lightbox/IE6/validate.html.twig @@ -34,7 +34,7 @@
-
+
{% if basket_element %} {% set bask_prev = basket_element.getRecord(app).get_preview() %} @@ -68,7 +68,7 @@
-
+
@@ -92,7 +92,7 @@
-
+
{% if basket_element %} {% set business = app['authentication'].getUser().ACL().has_right_on_base(basket_element.getRecord(app).get_base_id(), 'canmodifrecord') %} {{caption.format_caption(basket_element.getRecord(app), '', null, business)}} diff --git a/templates/web/lightbox/feed.html.twig b/templates/web/lightbox/feed.html.twig index 05e37be5c3..b5ea76a30d 100644 --- a/templates/web/lightbox/feed.html.twig +++ b/templates/web/lightbox/feed.html.twig @@ -40,7 +40,7 @@
-
+
{% if first_item %} {% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.get_record(), 'preview') %} {% set bask_prev = first_item.get_record().get_preview() %} @@ -70,7 +70,7 @@
-
+
@@ -80,7 +80,7 @@
-
+
{% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %} {% if first_item %} {{caption.format_caption(first_item.get_record(), '', null, business)}} diff --git a/templates/web/lightbox/validate.html.twig b/templates/web/lightbox/validate.html.twig index 317285198e..a9e60c5ae2 100644 --- a/templates/web/lightbox/validate.html.twig +++ b/templates/web/lightbox/validate.html.twig @@ -47,7 +47,7 @@
-
+
{% if basket_element %} {% set bask_prev = basket_element.getRecord(app).get_preview() %} @@ -81,7 +81,7 @@
-
+
@@ -95,7 +95,7 @@
-
+
{% if basket_element %} {% set business = app['authentication'].getUser().ACL().has_right_on_base(basket_element.getRecord(app).get_base_id(), 'canmodifrecord') %} {{caption.format_caption(basket_element.getRecord(app), '', null, business)}} diff --git a/www/skins/lightbox/jquery.lightbox.ie6.js b/www/skins/lightbox/jquery.lightbox.ie6.js index 375ee723ec..c113182262 100644 --- a/www/skins/lightbox/jquery.lightbox.ie6.js +++ b/www/skins/lightbox/jquery.lightbox.ie6.js @@ -42,7 +42,7 @@ $(document).ready(function(){ // $('.right_column_wrapper').height(right_column_wrapper_height); $('.record_display_box').each(function(i,n){ - $('.container',n).height($(n).innerHeight() - $('.header').outerHeight()); + $('.lightbox_container',n).height($(n).innerHeight() - $('.header').outerHeight()); }); display_record($('#record_compare').css('visibility') != 'hidden'); } @@ -100,7 +100,7 @@ $(document).ready(function(){ } - set_sizeable($('#record_main .container, #record_compare .container')); + set_sizeable($('#record_main .lightbox_container, #record_compare .lightbox_container')); $('#navigation') .bind('change', @@ -347,7 +347,7 @@ function display_basket_element(compare, sselcont_id) text : true }).bind('click',function() { - if($('.container', container).hasClass('note_editing')) + if($('.lightbox_container', container).hasClass('note_editing')) { hide_notes(container); } @@ -393,7 +393,7 @@ function display_basket_element(compare, sselcont_id) get_next(); }); - $('.container', container).bind('dblclick',function(event){ + $('.lightbox_container', container).bind('dblclick',function(event){ display_record(); }); @@ -430,7 +430,7 @@ function display_basket_element(compare, sselcont_id) }); display_record(compare); $('#record_infos, #right_column').show(); - $('#record_compare .container').empty(); + $('#record_compare .lightbox_container').empty(); } } @@ -450,13 +450,13 @@ function set_container_status(status) function show_notes(container) { $('.notes_wrapper', container).animate({top:0}); - $('.container', container).addClass('note_editing'); + $('.lightbox_container', container).addClass('note_editing'); } function hide_notes(container) { $('.notes_wrapper', container).animate({top:'-100%'}); - $('.container', container).removeClass('note_editing'); + $('.lightbox_container', container).removeClass('note_editing'); } function activate_notes(container) @@ -516,8 +516,8 @@ function display_record(compare) var main_box = $('#record_main'); var compare_box = $('#record_compare'); - var main_record = $('.container .record', main_box); - var compare_record = $('.container .record', compare_box); + var main_record = $('.lightbox_container .record', main_box); + var compare_record = $('.lightbox_container .record', compare_box); var main_record_width = parseInt($('input[name=width]', main_box).val()); var main_record_height = parseInt($('input[name=height]', main_box).val()); @@ -867,7 +867,7 @@ function save_note(container, button) success: function(datas){ hide_notes(container); $('.notes_wrapper', container).remove(); - $('.container', container).append(datas.datas); + $('.lightbox_container', container).append(datas.datas); activate_notes(container); return; } @@ -975,7 +975,7 @@ function scid_click(event, el) { container = $('#record_main'); - $('#record_infos .container') + $('#record_infos .lightbox_container') .empty() .append(data.caption); @@ -998,7 +998,7 @@ function scid_click(event, el) .empty() .append(data.options_html); - $('.container', container).empty() + $('.lightbox_container', container).empty() .append(data.preview+data.selector_html+data.note_html); diff --git a/www/skins/lightbox/jquery.lightbox.js b/www/skins/lightbox/jquery.lightbox.js index 6cd38b36c4..2c655e4a11 100644 --- a/www/skins/lightbox/jquery.lightbox.js +++ b/www/skins/lightbox/jquery.lightbox.js @@ -11,7 +11,7 @@ $(document).ready(function(){ bodySize.y = $('#mainContainer').height(); bodySize.x = $('#mainContainer').width(); - + $(this).data('slideshow',false); $(this).data('slideshow_ctime', false); @@ -68,7 +68,7 @@ $(document).ready(function(){ } - set_sizeable($('#record_main .container, #record_compare .container')); + set_sizeable($('#record_main .lightbox_container, #record_compare .lightbox_container')); $('#navigation') .bind('change', @@ -350,7 +350,7 @@ function scid_click(event, el) { container = $('#record_main'); - $('#record_infos .container') + $('#record_infos .lightbox_container') .empty() .append(data.caption); @@ -373,7 +373,7 @@ function scid_click(event, el) .empty() .append(data.options_html); - $('.container', container).empty() + $('.lightbox_container', container).empty() .append(data.preview+data.selector_html+data.note_html); @@ -401,7 +401,7 @@ function save_note(container, button) success: function(datas){ hide_notes(container); $('.notes_wrapper', container).remove(); - $('.container', container).append(datas.datas); + $('.lightbox_container', container).append(datas.datas); activate_notes(container); return; } @@ -433,7 +433,7 @@ function display_basket_element(compare, sselcont_id) $('.comment_button', options_container).bind('click',function() { // $(this).blur(); - if($('.container', container).hasClass('note_editing')) + if($('.lightbox_container', container).hasClass('note_editing')) { hide_notes(container); } @@ -477,7 +477,7 @@ function display_basket_element(compare, sselcont_id) }); - $('.container', container).bind('dblclick',function(event){ + $('.lightbox_container', container).bind('dblclick',function(event){ display_record(); }); @@ -520,7 +520,7 @@ function display_basket_element(compare, sselcont_id) }); display_record(compare); $('#right_column').show(); - $('#record_compare .container').empty(); + $('#record_compare .lightbox_container').empty(); } } @@ -536,7 +536,7 @@ function show_notes(container) $('.notes_wrapper', container).animate({ top:0 }); - $('.container', container).addClass('note_editing'); + $('.lightbox_container', container).addClass('note_editing'); } function hide_notes(container) @@ -544,7 +544,7 @@ function hide_notes(container) $('.notes_wrapper', container).animate({ top:'-100%' }); - $('.container', container).removeClass('note_editing'); + $('.lightbox_container', container).removeClass('note_editing'); } function activate_notes(container) @@ -808,8 +808,8 @@ function display_record(compare) var main_box = $('#record_main'); var compare_box = $('#record_compare'); - var main_record = $('.container .record', main_box); - var compare_record = $('.container .record', compare_box); + var main_record = $('.lightbox_container .record', main_box); + var compare_record = $('.lightbox_container .record', compare_box); var main_record_width = parseInt($('input[name=width]', main_box).val()); var main_record_height = parseInt($('input[name=height]', main_box).val()); diff --git a/www/skins/lightbox/lightbox.css b/www/skins/lightbox/lightbox.css index 405125c27b..5cfbef592d 100644 --- a/www/skins/lightbox/lightbox.css +++ b/www/skins/lightbox/lightbox.css @@ -81,7 +81,7 @@ img { overflow: hidden; } -.record_display_box .container { +.record_display_box .lightbox_container { top: 30px; overflow: hidden; } @@ -299,11 +299,11 @@ img { left: auto; } -#record_compare .header, #record_compare .container { +#record_compare .header, #record_compare .lightbox_container { left: 5px; } -#record_wrapper.comparison #record_main .header, #record_wrapper.comparison #record_main .container { +#record_wrapper.comparison #record_main .header, #record_wrapper.comparison #record_main .lightbox_container { right: 5px; } diff --git a/www/skins/lightbox/lightboxie6.css b/www/skins/lightbox/lightboxie6.css index b210eb8294..5d5fa1236c 100644 --- a/www/skins/lightbox/lightboxie6.css +++ b/www/skins/lightbox/lightboxie6.css @@ -43,7 +43,7 @@ ul{ } -.record_display_box .container{ +.record_display_box .lightbox_container{ overflow:hidden; }