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

Merge pull request #515 from romainneutron/fix-1338

Browse Source 
Fix 1338
This commit is contained in:
Romain Neutron
2013-07-17 08:30:11 -07:00
parent c6dabf54af a6e7d3e762
commit bb45954bd1
6 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Alchemy/Phrasea/Controller/Admin/Databox.php
View File

@@ -985,7 +985,8 @@ class Databox implements ControllerProviderInterface
$success = false;
try {
foreach ($request->request->get('order', array()) as $order => $baseId) {
foreach ($request->request->get('order', array()) as $order => $data) {
$baseId = $data['id'];
$collection = \collection::get_from_base_id($app, $baseId);
$app['phraseanet.appbox']->set_collection_order($collection, $order);
unset($collection);

14
templates/web/admin/collection/reorder.html.twig
View File

@@ -19,7 +19,13 @@
<td colspan="2" style="height:20px;" />
</tr>
<tr>
<td colspan="2" valign="center" align="left"><div class="form-actions"><button class="btn btn-primary" id="apply">{% trans 'boutton::valider' %}</button></div></td>
<td colspan="2" valign="center" align="left">
<div class="form-actions">
<button class="btn btn-primary" id="apply">
{% trans 'boutton::valider' %}
</button>
</div>
</td>
</tr>
</table>
@@ -70,7 +76,7 @@
var html = _.template($("#alert_"+ (datas.success ? "success" : "error") +"_tpl").html(), {
content:datas.msg
});
$('#table-order').insertBefore(html);
$('#table-order').before(html);
},
complete : function() {
$this.attr('disabled', false);
@@ -81,13 +87,13 @@
function moveUpItem(select){
select.find('option:selected').each(function(){
$(this).insertBefore($(this).prev());
$(this).before($(this).prev());
});
}
function moveDownItem(select){
select.find('option:selected').each(function(){
$(this).insertAfter($(this).next());
$(this).after($(this).next());
});
}

2
templates/web/admin/collection/suggested_value.html.twig
View File

@@ -655,7 +655,7 @@ function valid()
if(data.success) {
$('#tree li.selected a').trigger('click');
} else {
$(".page-header").insertAfter(
$(".page-header").after(
'<div class="alert alert-error">'
+'<button class="close" data-dismiss="alert">×</button>'
+ data.msg

2
templates/web/common/templates.html.twig
View File

@@ -6,7 +6,7 @@
</script>
<script type="text/template" id="alert_error_tpl">
<div class="alert alert-success">
<div class="alert alert-error">
<button class="close" data-dismiss="alert">×</button>
<%= content %>
</div>

12
templates/web/prod/Baskets/Reorder.html.twig
View File

@@ -91,7 +91,7 @@
{
var elem = $('#ORDER_'+i);
if(last_moved) {
elem.insertAfter(last_moved);
elem.after(last_moved);
} else {
$('#reorder_box .elements').prepend(elem);
}
@@ -143,7 +143,7 @@
elems.each(function(i,n){
var elem = $(n);
if(last_moved) {
elem.insertBefore(last_moved);
elem.before(last_moved);
} else {
$('#reorder_box .elements').append(elem);
}
@@ -175,7 +175,7 @@
$('.selected:visible', container).hide();
while(n > 0){
$('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').insertAfter($('.diapo.ui-sortable-placeholder', container));
$('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').after($('.diapo.ui-sortable-placeholder', container));
n--;
}
},
@@ -212,9 +212,9 @@
before = false;
} else {
if(before){
$(n).insertBefore($(ui.item[0]));
$(n).before($(ui.item[0]));
} else{
$(n).insertAfter($(last_moved));
$(n).after($(last_moved));
}
}
@@ -227,7 +227,7 @@
var n = OrderSelection.length() - 1 ;
while(n > 0) {
$('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').insertAfter($('.diapo.ui-sortable-placeholder', container));
$('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').after($('.diapo.ui-sortable-placeholder', container));
n--;
}
}

12
templates/web/prod/Story/Reorder.html.twig
View File

@@ -92,7 +92,7 @@
var elem = $('#ORDER_'+i);
if(last_moved)
{
elem.insertAfter(last_moved);
elem.after(last_moved);
}
else
{
@@ -146,7 +146,7 @@
var elem = $(n);
if(last_moved)
{
elem.insertBefore(last_moved);
elem.before(last_moved);
}
else
{
@@ -181,7 +181,7 @@
while(n > 0)
{
$('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').insertAfter($('.diapo.ui-sortable-placeholder', container));
$('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').after($('.diapo.ui-sortable-placeholder', container));
n--;
}
},
@@ -223,9 +223,9 @@
else
{
if(before)
$(n).insertBefore($(ui.item[0]));
$(n).before($(ui.item[0]));
else
$(n).insertAfter($(last_moved));
$(n).after($(last_moved));
}
last_moved = sorter[i];
@@ -238,7 +238,7 @@
var n = OrderSelection.length() - 1 ;
while(n > 0)
{
$('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').insertAfter($('.diapo.ui-sortable-placeholder', container));
$('<div style="height:130px;" class="diapo ui-sortable-placeholderfollow"></div>').after($('.diapo.ui-sortable-placeholder', container));
n--;
}
}