hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1409 Css issue for record caption in lightbox

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-08-07 18:47:34 +02:00
parent a62de34416
commit a7690d3cac
8 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/web/lightbox/IE6/feed.html.twig
View File

@@ -32,7 +32,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="container left"> <div class="lightbox_container left">
{% if first_item %} {% if first_item %}
{% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.get_record(), 'preview') %} {% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.get_record(), 'preview') %}
{% set preview = first_item.get_record().get_preview() %} {% set preview = first_item.get_record().get_preview() %}
@@ -62,7 +62,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="container left"> <div class="lightbox_container left">
</div> </div>
</div> </div>
</div> </div>
@@ -80,7 +80,7 @@
<div class="right_column_wrapper right_column_wrapper_caption left unselectable" style="width:230px;height:auto;"> <div class="right_column_wrapper right_column_wrapper_caption left unselectable" style="width:230px;height:auto;">
<div id="record_infos"> <div id="record_infos">
<div class="container"> <div class="lightbox_container">
{% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %} {% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %}
{% if first_item %} {% if first_item %}
{{caption.format_caption(first_item.get_record(), '', null, business)}} {{caption.format_caption(first_item.get_record(), '', null, business)}}

6
templates/web/lightbox/IE6/validate.html.twig
View File

@@ -34,7 +34,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="container left"> <div class="lightbox_container left">
{% if basket_element %} {% if basket_element %}
{% set bask_prev = basket_element.getRecord(app).get_preview() %} {% set bask_prev = basket_element.getRecord(app).get_preview() %}
@@ -68,7 +68,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="container left"> <div class="lightbox_container left">
</div> </div>
</div> </div>
</div> </div>
@@ -92,7 +92,7 @@
<div class="right_column_wrapper right_column_wrapper_caption left unselectable" style="width:230px;height:auto;{% if basket.getValidation() %}display:none;{% endif %}"> <div class="right_column_wrapper right_column_wrapper_caption left unselectable" style="width:230px;height:auto;{% if basket.getValidation() %}display:none;{% endif %}">
<div id="record_infos"> <div id="record_infos">
<div class="container"> <div class="lightbox_container">
{% if basket_element %} {% if basket_element %}
{% set business = app['authentication'].getUser().ACL().has_right_on_base(basket_element.getRecord(app).get_base_id(), 'canmodifrecord') %} {% 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)}} {{caption.format_caption(basket_element.getRecord(app), '', null, business)}}

6
templates/web/lightbox/feed.html.twig
View File

@@ -40,7 +40,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="container PNB record_display_box"> <div class="lightbox_container PNB record_display_box">
{% if first_item %} {% if first_item %}
{% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.get_record(), 'preview') %} {% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.get_record(), 'preview') %}
{% set bask_prev = first_item.get_record().get_preview() %} {% set bask_prev = first_item.get_record().get_preview() %}
@@ -70,7 +70,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="container PNB record_display_box"> <div class="lightbox_container PNB record_display_box">
</div> </div>
</div> </div>
</div> </div>
@@ -80,7 +80,7 @@
</div> </div>
<div class="right_column_wrapper caption right_column_wrapper_caption PNB"> <div class="right_column_wrapper caption right_column_wrapper_caption PNB">
<div id="record_infos" class="PNB"> <div id="record_infos" class="PNB">
<div class="container PNB"> <div class="lightbox_container PNB">
{% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %} {% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %}
{% if first_item %} {% if first_item %}
{{caption.format_caption(first_item.get_record(), '', null, business)}} {{caption.format_caption(first_item.get_record(), '', null, business)}}

6
templates/web/lightbox/validate.html.twig
View File

@@ -47,7 +47,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="container PNB record_display_box"> <div class="lightbox_container PNB record_display_box">
{% if basket_element %} {% if basket_element %}
{% set bask_prev = basket_element.getRecord(app).get_preview() %} {% set bask_prev = basket_element.getRecord(app).get_preview() %}
@@ -81,7 +81,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="container PNB record_display_box"> <div class="lightbox_container PNB record_display_box">
</div> </div>
</div> </div>
</div> </div>
@@ -95,7 +95,7 @@
</div> </div>
<div class="right_column_wrapper caption right_column_wrapper_caption PNB" style="{% if basket.getValidation() %}display:none;{% endif %}"> <div class="right_column_wrapper caption right_column_wrapper_caption PNB" style="{% if basket.getValidation() %}display:none;{% endif %}">
<div id="record_infos" class="PNB"> <div id="record_infos" class="PNB">
<div class="container PNB"> <div class="lightbox_container PNB">
{% if basket_element %} {% if basket_element %}
{% set business = app['authentication'].getUser().ACL().has_right_on_base(basket_element.getRecord(app).get_base_id(), 'canmodifrecord') %} {% 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)}} {{caption.format_caption(basket_element.getRecord(app), '', null, business)}}

24
www/skins/lightbox/jquery.lightbox.ie6.js
View File

@@ -42,7 +42,7 @@ $(document).ready(function(){
// $('.right_column_wrapper').height(right_column_wrapper_height); // $('.right_column_wrapper').height(right_column_wrapper_height);
$('.record_display_box').each(function(i,n){ $('.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'); 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') $('#navigation')
.bind('change', .bind('change',
@@ -347,7 +347,7 @@ function display_basket_element(compare, sselcont_id)
text : true text : true
}).bind('click',function() }).bind('click',function()
{ {
if($('.container', container).hasClass('note_editing')) if($('.lightbox_container', container).hasClass('note_editing'))
{ {
hide_notes(container); hide_notes(container);
} }
@@ -393,7 +393,7 @@ function display_basket_element(compare, sselcont_id)
get_next(); get_next();
}); });
$('.container', container).bind('dblclick',function(event){ $('.lightbox_container', container).bind('dblclick',function(event){
display_record(); display_record();
}); });
@@ -430,7 +430,7 @@ function display_basket_element(compare, sselcont_id)
}); });
display_record(compare); display_record(compare);
$('#record_infos, #right_column').show(); $('#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) function show_notes(container)
{ {
$('.notes_wrapper', container).animate({top:0}); $('.notes_wrapper', container).animate({top:0});
$('.container', container).addClass('note_editing'); $('.lightbox_container', container).addClass('note_editing');
} }
function hide_notes(container) function hide_notes(container)
{ {
$('.notes_wrapper', container).animate({top:'-100%'}); $('.notes_wrapper', container).animate({top:'-100%'});
$('.container', container).removeClass('note_editing'); $('.lightbox_container', container).removeClass('note_editing');
} }
function activate_notes(container) function activate_notes(container)
@@ -516,8 +516,8 @@ function display_record(compare)
var main_box = $('#record_main'); var main_box = $('#record_main');
var compare_box = $('#record_compare'); var compare_box = $('#record_compare');
var main_record = $('.container .record', main_box); var main_record = $('.lightbox_container .record', main_box);
var compare_record = $('.container .record', compare_box); var compare_record = $('.lightbox_container .record', compare_box);
var main_record_width = parseInt($('input[name=width]', main_box).val()); var main_record_width = parseInt($('input[name=width]', main_box).val());
var main_record_height = parseInt($('input[name=height]', 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){ success: function(datas){
hide_notes(container); hide_notes(container);
$('.notes_wrapper', container).remove(); $('.notes_wrapper', container).remove();
$('.container', container).append(datas.datas); $('.lightbox_container', container).append(datas.datas);
activate_notes(container); activate_notes(container);
return; return;
} }
@@ -975,7 +975,7 @@ function scid_click(event, el)
{ {
container = $('#record_main'); container = $('#record_main');
$('#record_infos .container') $('#record_infos .lightbox_container')
.empty() .empty()
.append(data.caption); .append(data.caption);
@@ -998,7 +998,7 @@ function scid_click(event, el)
.empty() .empty()
.append(data.options_html); .append(data.options_html);
$('.container', container).empty() $('.lightbox_container', container).empty()
.append(data.preview+data.selector_html+data.note_html); .append(data.preview+data.selector_html+data.note_html);

24
www/skins/lightbox/jquery.lightbox.js
View File

@@ -11,7 +11,7 @@ $(document).ready(function(){
bodySize.y = $('#mainContainer').height(); bodySize.y = $('#mainContainer').height();
bodySize.x = $('#mainContainer').width(); bodySize.x = $('#mainContainer').width();
$(this).data('slideshow',false); $(this).data('slideshow',false);
$(this).data('slideshow_ctime', 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') $('#navigation')
.bind('change', .bind('change',
@@ -350,7 +350,7 @@ function scid_click(event, el)
{ {
container = $('#record_main'); container = $('#record_main');
$('#record_infos .container') $('#record_infos .lightbox_container')
.empty() .empty()
.append(data.caption); .append(data.caption);
@@ -373,7 +373,7 @@ function scid_click(event, el)
.empty() .empty()
.append(data.options_html); .append(data.options_html);
$('.container', container).empty() $('.lightbox_container', container).empty()
.append(data.preview+data.selector_html+data.note_html); .append(data.preview+data.selector_html+data.note_html);
@@ -401,7 +401,7 @@ function save_note(container, button)
success: function(datas){ success: function(datas){
hide_notes(container); hide_notes(container);
$('.notes_wrapper', container).remove(); $('.notes_wrapper', container).remove();
$('.container', container).append(datas.datas); $('.lightbox_container', container).append(datas.datas);
activate_notes(container); activate_notes(container);
return; return;
} }
@@ -433,7 +433,7 @@ function display_basket_element(compare, sselcont_id)
$('.comment_button', options_container).bind('click',function() $('.comment_button', options_container).bind('click',function()
{ {
// $(this).blur(); // $(this).blur();
if($('.container', container).hasClass('note_editing')) if($('.lightbox_container', container).hasClass('note_editing'))
{ {
hide_notes(container); 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(); display_record();
}); });
@@ -520,7 +520,7 @@ function display_basket_element(compare, sselcont_id)
}); });
display_record(compare); display_record(compare);
$('#right_column').show(); $('#right_column').show();
$('#record_compare .container').empty(); $('#record_compare .lightbox_container').empty();
} }
} }
@@ -536,7 +536,7 @@ function show_notes(container)
$('.notes_wrapper', container).animate({ $('.notes_wrapper', container).animate({
top:0 top:0
}); });
$('.container', container).addClass('note_editing'); $('.lightbox_container', container).addClass('note_editing');
} }
function hide_notes(container) function hide_notes(container)
@@ -544,7 +544,7 @@ function hide_notes(container)
$('.notes_wrapper', container).animate({ $('.notes_wrapper', container).animate({
top:'-100%' top:'-100%'
}); });
$('.container', container).removeClass('note_editing'); $('.lightbox_container', container).removeClass('note_editing');
} }
function activate_notes(container) function activate_notes(container)
@@ -808,8 +808,8 @@ function display_record(compare)
var main_box = $('#record_main'); var main_box = $('#record_main');
var compare_box = $('#record_compare'); var compare_box = $('#record_compare');
var main_record = $('.container .record', main_box); var main_record = $('.lightbox_container .record', main_box);
var compare_record = $('.container .record', compare_box); var compare_record = $('.lightbox_container .record', compare_box);
var main_record_width = parseInt($('input[name=width]', main_box).val()); var main_record_width = parseInt($('input[name=width]', main_box).val());
var main_record_height = parseInt($('input[name=height]', main_box).val()); var main_record_height = parseInt($('input[name=height]', main_box).val());

6
www/skins/lightbox/lightbox.css
View File

@@ -81,7 +81,7 @@ img {
overflow: hidden; overflow: hidden;
} }
.record_display_box .container { .record_display_box .lightbox_container {
top: 30px; top: 30px;
overflow: hidden; overflow: hidden;
} }
@@ -299,11 +299,11 @@ img {
left: auto; left: auto;
} }
#record_compare .header, #record_compare .container { #record_compare .header, #record_compare .lightbox_container {
left: 5px; 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; right: 5px;
} }

2
www/skins/lightbox/lightboxie6.css
View File

@@ -43,7 +43,7 @@ ul{
} }
.record_display_box .container{ .record_display_box .lightbox_container{
overflow:hidden; overflow:hidden;
} }