Changeset 3436
- Timestamp:
- 10/29/10 10:11:24 (13 years ago)
- Location:
- branches/2.2/filemanager
- Files:
-
- 61 added
- 2 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/filemanager/inc/class.uifilemanager.inc.php
r3367 r3436 332 332 echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/drag_area.js'></script>"; 333 333 echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/handler.js'></script>"; 334 335 /*Expresso Window*/ 336 echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/xtools.js'></script>"; 337 echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/jsloader.js'></script>"; 338 echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/makeW.js'></script>"; 339 echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/dragdrop.js'></script>"; 340 334 341 echo "<script src='./phpgwapi/js/dftree/dftree.js'></script>"; 335 342 -
branches/2.2/filemanager/js/common_functions.js
r3415 r3436 89 89 for (i=0; i < navigator.plugins.length; i++) 90 90 if (navigator.plugins[i].name.match('Java')){ 91 draw_window("<iframe width=\"515\" height=\"320\" src='/filemanager/inc/uploadApp.php?id="+parseInt(Math.random()*Math.pow(10,15))+"'></iframe>"); 92 document.getElementById('dwindow').style.width = "auto"; 93 document.getElementById('dwindow').style.height = "auto"; 91 close_window(); 92 draw_window("<iframe width=\"515\" height=\"320\" src='/filemanager/inc/uploadApp.php?id="+parseInt(Math.random()*Math.pow(10,15))+"'></iframe>",530,345); 94 93 return; 95 94 } -
branches/2.2/filemanager/js/drag_area.js
r3019 r3436 14 14 if (_dragArea.operation == 'drag') 15 15 _dragArea.dragObj(event); 16 else17 _dragArea.moveWindow(event);18 16 } 19 17 document.onmousedown = function(event) {_dragArea.pressed = 1; }; … … 21 19 22 20 counter = 0; 23 DragArea.prototype.moveWindow = function(e) {24 if (this.pressed){25 var elem = document.getElementById('dwindow'); // FIXME do not use getElement here26 if (elem != null){27 var _event = is_ie ? window.event : e;28 elem.style.left = _event.clientX - 80 + "px";29 elem.style.top = _event.clientY + "px";30 }31 }32 }33 34 21 DragArea.prototype.dragObj = function(e){ 35 22 var _event = is_ie ? window.event : e; -
branches/2.2/filemanager/js/draw_api.js
r3340 r3436 31 31 } 32 32 function close_window(){ 33 var menu = document.getElementById('dwindow'); 34 if (menu != null) 35 menu.style.visibility = 'hidden' 36 } 37 function draw_window(htmlData){ 38 var menu = document.getElementById('dwindow'); 33 _winBuild('dwindow'+(zIndex-1), 'hidden') 34 } 35 36 var zIndex=0; 37 function draw_window(htmlData, sizeW, sizeH){ 38 if (sizeW == undefined) 39 var sizeW = 420; 40 if (sizeH == undefined) 41 var sizeH = 200; 42 var _janela = { 43 id_window : "dwindow"+zIndex, 44 width : sizeW, 45 height : sizeH, 46 top : 30, 47 left : 200, 48 draggable : true, 49 visible : "display", 50 resizable : true, 51 zindex : ++zIndex, 52 title : get_lang("filemanager"), 53 closeAction : "hidden", 54 content : htmlData 55 }; 56 57 _winBuild( _janela ); 58 59 /* var menu = document.getElementById('dwindow'); 39 60 headerWin = '<div class="message_header" style="width: 100%; heigth: 22px;"'+ 40 61 ' onselectstart="return false">'+ … … 56 77 menu.innerHTML = headerWin+htmlData; 57 78 menu.style.visibility = 'visible'; 58 } 79 }*/ 59 80 60 81 } -
branches/2.2/filemanager/templates/default/upload.tpl
r3415 r3436 1 1 <!-- BEGIN upload_header --> 2 2 <form id="form_up" method="post" action="{form_action}" enctype="multipart/form-data"> 3 <div >3 <div style="overflow-y: auto; overflow-x:hidden; height: 165px;"> 4 4 <table cellspacing="0" cellpadding="2"> 5 5 <tbody>
Note: See TracChangeset
for help on using the changeset viewer.