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

Merge branch '3.7'

Browse Source
This commit is contained in:
Romain Neutron
2013-01-09 11:25:14 +01:00
parent 437ad37598 bd56ddf58e
commit dff686c87d
86 changed files with 1605 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,24 +414,12 @@ function display_basket_element(compare, sselcont_id)
var options_container = $('.options',container);
$('.download_button', options_container).button({
text : false
// ,
// icons : {
// primary: 'ui-icon-disk'
// }
}).bind('click',function(){
$('.download_button', options_container).bind('click',function(){
// $(this).blur();
download($(this).next('form[name=download_form]').find('input').val());
});
$('.comment_button', options_container).button({
text : true
// ,
// icons : {
// primary: 'ui-icon-comment'
// }
}).bind('click',function()
$('.comment_button', options_container).bind('click',function()
{
// $(this).blur();
if($('.container', container).hasClass('note_editing'))
@@ -447,35 +435,17 @@ function display_basket_element(compare, sselcont_id)
activate_notes(container);
$('.previous_button', options_container).button({
text : false
// ,
// icons : {
// primary: 'ui-icon-seek-prev'
// }
}).bind('click',function(){
$('.previous_button', options_container).bind('click',function(){
// $(this).blur();
get_prev();
});
$('.play_button', options_container).button({
text : false
// ,
// icons : {
// primary: 'ui-icon-play'
// }
}).bind('click',function(){
$('.play_button', options_container).bind('click',function(){
// $(this).blur();
slideshow(true);
});
$('.pause_button', options_container).button({
text : false
// ,
// icons : {
// primary: 'ui-icon-pause'
// }
}).bind('click',function(){
$('.pause_button', options_container).bind('click',function(){
// $(this).blur();
slideshow(false);
});
@@ -489,13 +459,7 @@ function display_basket_element(compare, sselcont_id)
$('.pause_button, .next_button.pause, .previous_button.pause', options_container).hide();
}
$('.next_button', options_container).button({
text : false
// ,
// icons : {
// primary: 'ui-icon-seek-next'
// }
}).bind('click',function(){
$('.next_button', options_container).bind('click',function(){
// $(this).blur();
slideshow(false);
get_next();
@@ -1078,20 +1042,12 @@ function download(value)
{
var dialog = p4.Dialog.Create({title: typeof(language) !== 'undefined' ? language['export']: ''});
dialog.getDomElement().bind("dialogbeforeclose", function(event, ui) {
tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message');
tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
});
$.post("/prod/export/multi-export/", "lst="+value, function(data) {
dialog.setContent(data);
$('.tabs', dialog.getDomElement()).tabs();
tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
tinyMCE.execCommand('mceAddControl',true,'order_usage');
$('.close_button', dialog.getDomElement()).bind('click',function(){
dialog.Close();
});