hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1304 : Workzone elastic behavior is not working

Browse Source
This commit is contained in:
Romain Neutron
2013-07-12 11:01:01 +02:00
parent 301317287a
commit ac5ac09ae7
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/lightbox/basket_content_report.html.twig
View File

@@ -4,7 +4,7 @@
<div style="margin:0 7px;overflow:hidden;"> <div style="margin:0 7px;overflow:hidden;">
{% for basket_element in basket.getElements() %} {% for basket_element in basket.getElements() %}
{% set record = basket_element.getRecord(app) %} {% set record = basket_element.getRecord(app) %}
<span class="wrapCHIM_{{basket_element.getId()}} valid"> <div class="chim-wrapper wrapCHIM_{{basket_element.getId()}} valid">
<div style="margin:20px;"> <div style="margin:20px;">
<table style="width: 100%; min-width: 330px;"> <table style="width: 100%; min-width: 330px;">
<tr valign="top"> <tr valign="top">
@@ -44,7 +44,7 @@
</tr> </tr>
</table> </table>
</div> </div>
</span> </div>
<div><hr/></div> <div><hr/></div>
{% endfor %} {% endfor %}
</div> </div>

6
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -326,9 +326,9 @@
{% macro display_basket(app, basket) %} {% macro display_basket(app, basket) %}
{% for basket_element in basket.getElements() %} {% for basket_element in basket.getElements() %}
<span class="wrapCHIM_{{ basket_element.getRecord(app).get_serialize_key() }}"> <div class="chim-wrapper wrapCHIM_{{ basket_element.getRecord(app).get_serialize_key() }}">
{{ _self.element('basket', basket, basket_element, basket_element.getRecord(app), basket_element.getOrd()) }} {{ _self.element('basket', basket, basket_element, basket_element.getRecord(app), basket_element.getOrd()) }}
</span> </div>
{% endfor %} {% endfor %}
{% endmacro %} {% endmacro %}
@@ -344,7 +344,7 @@
</div> </div>
{% for basket_element in basket.getElementsByOrder(ordre) %} {% for basket_element in basket.getElementsByOrder(ordre) %}
<span class="wrapCHIM_{{ basket_element.getRecord(app).get_serialize_key() }} valid"> <span class="chim-wrapper wrapCHIM_{{ basket_element.getRecord(app).get_serialize_key() }} valid">
<table style="width: 100%; min-width: 330px; display: inline-block;"> <table style="width: 100%; min-width: 330px; display: inline-block;">
<tr> <tr>
<td style="width:80px;"> <td style="width:80px;">

5
www/skins/prod/000000/prodcolor.css
View File

@@ -4245,3 +4245,8 @@ dans l'onglet thesaurus : arbres, menus contextuels
ui-dialog-titlebar { ui-dialog-titlebar {
min-height: 20px; min-height: 20px;
} }
.chim-wrapper {
position: relative;
float: left;
}

5
www/skins/prod/959595/prodcolor.css
View File

@@ -4386,3 +4386,8 @@ dans l'onglet thesaurus : arbres, menus contextuels
ui-dialog-titlebar { ui-dialog-titlebar {
min-height: 20px; min-height: 20px;
} }
.chim-wrapper {
position: relative;
float: left;
}

4
www/skins/prod/jquery.main-prod.js
View File

@@ -1064,7 +1064,7 @@ $(document).ready(function(){
stop:function(){ stop:function(){
var el = $('.SSTT.active').next().find('div:first'); var el = $('.SSTT.active').next().find('div:first');
var w = el.find('span:first').outerWidth(); var w = el.find('div.chim-wrapper:first').outerWidth();
var iw = el.innerWidth(); var iw = el.innerWidth();
var diff = $('#idFrameC').width() - el.outerWidth(); var diff = $('#idFrameC').width() - el.outerWidth();
var n = Math.floor(iw/w); var n = Math.floor(iw/w);
@@ -1079,7 +1079,7 @@ $(document).ready(function(){
} }
if(nwidth<265) if(nwidth<265)
nwidth = 265; nwidth = 265;
if(el.find('span:first').hasClass('valid') && nwidth<410) if(el.find('div.chim-wrapper:first').hasClass('valid') && nwidth<410)
nwidth = 410; nwidth = 410;