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 branch '3.8'

Browse Source
This commit is contained in:
Romain Neutron
2014-01-23 08:28:14 +01:00
parent 9c838e71e5 67b0f4120e
commit c0919fbdc9
2 changed files with 59 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,16 +37,13 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
var container = $('#reorder_box');//p4.Dialog.get(1).getDomElement(); var container = $('#reorder_box');//p4.Dialog.get(1).getDomElement();
$('button.autoorder', container).bind('click', function(){ $('button.autoorder', container).bind('click', function(){
console.log("click autoorder");
autoorder(); autoorder();
return false; return false;
}); });
$('button.reverseorder', container).bind('click', function(){ $('button.reverseorder', container).bind('click', function(){
console.log("click reverse order");
reverse_order(); reverse_order();
return false; return false;
}); });
@@ -54,102 +51,43 @@
function autoorder() function autoorder()
{ {
var val = $.trim($('#auto_order').val()); var val = $.trim($('#auto_order').val());
if(val == '') { if(val == '') {
return; return;
} }
var sorter = {}; var diapos = [];
$('#reorder_box .diapo form').each(function(i,n){ $('#reorder_box .diapo form').each(function(i,n){
var id = $('input[name=id]',n).val(); diapos.push({
"title": $('input[name=title]',n).val(),
switch(val) "order" : parseInt($('input[name=default]',n).val()),
{ "id" : $('input[name=id]',n).val()
case 'title': });
default:
var data = $('input[name=title]',n).val();
break;
case 'default':
var data = $('input[name=default]',n).val();
break;
}
sorter[id] = data;
}); });
var data_type = 'string'; var sorterCallback;
switch(val) if (val === "default") {
{ sorterCallback = function(diapo) {return diapo.order;};
case 'default': } else {
var data_type = 'integer'; sorterCallback = function(diapo) {return diapo.title;};
break;
} }
sorter = arraySortByValue(sorter, data_type); var elements = [];
var last_moved = false; _.chain(diapos)
.sortBy(sorterCallback)
for(i in sorter) .each(function(diapo) {
{ elements.push($('#ORDER_'+ diapo.id));
var elem = $('#ORDER_'+i); });
if(last_moved) {
elem.after(last_moved);
} else {
$('#reorder_box .elements').prepend(elem);
}
last_moved = elem;
}
$('#reorder_box .elements').append(elements);
} }
function arraySortByValue(datas, data_type) {
var tmp = new Array();
for (i in datas) {
tmp.push({
v: i,
c: datas[i].toUpperCase(),
o: datas[i]
});
}
switch(data_type)
{
case 'string':
tmp.sort(function (x, y) {
return y.c < x.c;
});
break;
case 'integer':
tmp.sort(function (x, y) {
return parseInt(y.c) < parseInt(x.c);
});
break;
}
var out = {};
for (i in tmp) {
out[tmp[i].v] = tmp[i].o;
}
return out;
}
function reverse_order() { function reverse_order() {
var elems = $('#reorder_box .diapo'); var $container = $('#reorder_box .elements');
$('#reorder_box .diapo').each(function() {
var last_moved = false; $(this).prependTo($container);
elems.each(function(i,n){
var elem = $(n);
if(last_moved) {
elem.before(last_moved);
} else {
$('#reorder_box .elements').append(elem);
}
last_moved = elem;
}); });
} }

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

@@ -44,118 +44,56 @@
return false; return false;
}); });
$('button.reverseorder', container).bind('click', function(){ $('button.reverseorder', container).bind('click', function(){
reverse_order(); reverse_order();
return false; return false;
}); });
function autoorder()
{
var val = $.trim($('#auto_order').val());
if(val == '')
return; function autoorder()
var sorter = {};
$('#reorder_box .diapo form').each(function(i,n){
var id = $('input[name=id]',n).val();
switch(val)
{
case 'title':
default:
var data = $('input[name=title]',n).val();
break;
case 'default':
var data = $('input[name=default]',n).val();
break;
}
sorter[id] = data;
});
var data_type = 'string';
switch(val)
{ {
case 'default': var val = $.trim($('#auto_order').val());
var data_type = 'integer';
break;
}
sorter = arraySortByValue(sorter, data_type); if(val == '') {
return;
}
var last_moved = false; var diapos = [];
$('#reorder_box .diapo form').each(function(i,n){
for(i in sorter) diapos.push({
{ "title": $('input[name=title]',n).val(),
var elem = $('#ORDER_'+i); "order" : parseInt($('input[name=default]',n).val()),
if(last_moved) "id" : $('input[name=id]',n).val()
{ });
elem.after(last_moved);
}
else
{
$('#reorder_box .elements').prepend(elem);
}
last_moved = elem;
}
}
function arraySortByValue(datas, data_type) {
var tmp = new Array();
for (i in datas) {
tmp.push({
v: i,
c: datas[i].toUpperCase(),
o: datas[i]
});
}
switch(data_type)
{
case 'string':
tmp.sort(function (x, y) {
return y.c < x.c;
}); });
break;
case 'integer': var sorterCallback;
tmp.sort(function (x, y) {
return parseInt(y.c) < parseInt(x.c); if (val === "default") {
sorterCallback = function(diapo) {return diapo.order;};
} else {
sorterCallback = function(diapo) {return diapo.title;};
}
var elements = [];
_.chain(diapos)
.sortBy(sorterCallback)
.each(function(diapo) {
elements.push($('#ORDER_'+ diapo.id));
});
$('#reorder_box .elements').append(elements);
}
function reverse_order() {
var $container = $('#reorder_box .elements');
$('#reorder_box .diapo').each(function() {
$(this).prependTo($container);
}); });
break;
} }
var out = {};
for (i in tmp) {
out[tmp[i].v] = tmp[i].o;
}
return out;
}
function reverse_order()
{
var elems = $('#reorder_box .diapo');
var last_moved = false;
elems.each(function(i,n){
var elem = $(n);
if(last_moved)
{
elem.before(last_moved);
}
else
{
$('#reorder_box .elements').append(elem);
}
last_moved = elem;
});
}
$('.elements', container).sortable({ $('.elements', container).sortable({
appendTo : container, appendTo : container,
placeholder: 'diapo ui-sortable-placeholder', placeholder: 'diapo ui-sortable-placeholder',