Fix record title display in reorder grid for basket & story

This commit is contained in:
Nicolas Le Goff
2014-07-09 10:53:33 +02:00
parent e46f339c92
commit a04ed200b6
2 changed files with 158 additions and 164 deletions

View File

@@ -21,8 +21,9 @@
<div class="elements row-fluid">
{% for element in basket.getElements() %}
<div id="ORDER_{{ element.getId() }}" class="CHIM diapo" style="height:130px;overflow:hidden;">
<div class="title" title="{{ element.getRecord(app).get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:visible;text-align:center;">
<span>{{ element.getRecord(app).get_title() }}</span>
<div class="title" title="{{ element.getRecord(app).get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:hidden;text-align:center;text-overflow: ellipsis; line-height: 15px;">
{{ element.getRecord(app).get_title() }} {{ element.getRecord(app).get_title() }}{{ element.getRecord(app).get_title() }}
</div>
{{ thumbnail.format(element.getRecord(app).get_thumbnail(), 80, 80, '', false, false) }}
<form style="display:none;">
<input type="hidden" name="id" value="{{ element.getId() }}"/>
@@ -30,7 +31,6 @@
<input type="hidden" name="default" value="{{ element.getOrd() }}"/>
</form>
</div>
</div>
{% endfor %}
</div>
</div>

View File

@@ -1,5 +1,6 @@
{% import 'common/thumbnail.html.twig' as thumbnail %}
<div id="reorder_options" class="PNB" style="height:30px;bottom:auto;">
<div class="PNB" style="height:40px;bottom:auto">
<form id="reorder_options" class="form-inline" style="display:inline-block;">
<span>{% trans 'Reordonner automatiquement' %}</span>
<select id="auto_order">
<option value="">{% trans 'Choisir' %}</option>
@@ -8,13 +9,21 @@
</select>
<button type="button" class="autoorder">{% trans 'Re-ordonner' %}</button>
<button type="button" class="reverseorder">{% trans 'Inverser' %}</button>
</form>
<form style="display:inline-block;" class="form-inline" name="reorder" method="POST" action="{{ path('prod_stories_story_reorder', { 'sbas_id' : story.get_sbas_id(), 'record_id' : story.get_record_id() }) }}">
{% for element in story.get_children() %}
<input type="hidden" name="element[{{ element.get_record_id() }}]" value="{{ element.get_number() }}"/>
{% endfor %}
<button type="button">{% trans 'boutton::valider' %}</button>
</form>
</div>
<div style="top:30px;overflow:auto;" id="reorder_box" class="PNB">
<div style="top:45px;overflow:auto;" id="reorder_box" class="PNB">
<div class="elements">
{% for element in story.get_children() %}
<div id="ORDER_{{ element.get_record_id() }}" class="CHIM diapo" style="height:130px;overflow:hidden;">
<div class="title" title="{{ element.get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:visible;text-align:center;">
<span>{{ element.get_title() }}</span>
<div class="title" title="{{ element.get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:hidden;text-align:center;text-overflow: ellipsis; line-height: 15px;">
{{ element.get_title() }} {{ element.get_title() }} {{ element.get_title() }}
</div>
{{ thumbnail.format(element.get_thumbnail(), 80, 80, '', false, false) }}
<form style="display:none;">
<input type="hidden" name="id" value="{{ element.get_record_id() }}"/>
@@ -22,23 +31,14 @@
<input type="hidden" name="default" value="{{ element.get_number() }}"/>
</form>
</div>
</div>
{% endfor %}
</div>
<form name="reorder" method="POST" action="{{ path('prod_stories_story_reorder', { 'sbas_id' : story.get_sbas_id(), 'record_id' : story.get_record_id() }) }}">
{% for element in story.get_children() %}
<input type="hidden" name="element[{{ element.get_record_id() }}]" value="{{ element.get_number() }}"/>
{% endfor %}
<button>{% trans 'boutton::valider' %}</button>
</form>
</div>
<script type="text/javascript">
$(document).ready(function(){
var container = $('#reorder_box');//p4.Dialog.get(1).getDomElement();
$('button.autoorder', container).bind('click', function(){
autoorder();
@@ -188,16 +188,11 @@
});
$('form[name="reorder"]', container).bind('submit', function(event){
//$this.SetLoader(true);
var $form = $(this);
$('form[name="reorder"] button').bind('click', function(event){
var $form = $(this).closest("form");
$('.elements form', container).each(function(i, el){
var id = $('input[name="id"]', $(el)).val();
$('input[name="element[' + id + ']"]', $form).val(i+1);
});
@@ -210,8 +205,7 @@
},
success: function(data){
if(!data.success)
{
if(!data.success) {
alert(data.message);
}
p4.WorkZone.refresh('current', null, false, 'story');