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

Merge with master

Browse Source
This commit is contained in:
Romain Neutron
2012-02-28 16:54:25 +01:00
parent ced93eec7b a1797ece76
commit fa1b30e6e5
2 changed files with 1032 additions and 1034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/client/index.php
View File

@@ -587,7 +587,7 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
<!--<iframe style="display:none;" id="download" name="download"></iframe>-->
<form style="display:none;" action="./index.php" target="_self" id="mainForm">
</form>
<div id="dialog_dwnl" title="<?php echo _('action : exporter') ?>" style="display:none;z-index:8000;"></div>
<div id="dialog_dwnl" title="<?php echo _('action : exporter') ?>" style="display:none;z-index:12000;"></div>
<form name="formChu" id="formChu" action="./baskets.php" method="post" style="visibility:hidden; display:none" >
<input type="hidden" name="bas" id="formChubas" value="">
<input type="hidden" name="act" id="formChuact" value="">

2
www/client/jquery.p4client.1.0.js
View File

@@ -780,8 +780,6 @@ function evt_dwnl(lst)
{
var dialog_box = $('#dialog_dwnl');
dialog_box = $('#dialog_dwnl');
dialog_box.empty().addClass('loading').dialog({
width:800,
height:600,