gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-01 14:37:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

overhaul drag&drop code

Browse Source 
documents can be dropped on other documents, files can be dropped
on folders
This commit is contained in:
Uwe Steinmann 2019-07-11 17:18:03 +02:00
parent 16e9d3748c
commit e1ae62ec7e
5 changed files with 260 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

332
styles/bootstrap/application.js
View File

@ -545,7 +545,6 @@ function onAddClipboard(ev) { /* {{{ */
} }
function sendFileToServer(formData,status) { function sendFileToServer(formData,status) {
formData.append('command', 'uploaddocument');
var uploadURL = ajaxurl; //Upload URL var uploadURL = ajaxurl; //Upload URL
var extraData ={}; //Extra Data. var extraData ={}; //Extra Data.
var jqXHR=$.ajax({ var jqXHR=$.ajax({
@ -641,18 +640,28 @@ function onAddClipboard(ev) { /* {{{ */
} }
} }
SeedDMSUpload.handleFileUpload = function(files,obj) { SeedDMSUpload.handleFileUpload = function(files,obj,statusbar) {
var target = obj.data('target'); /* target is set for the quick upload area */
if(target) { var target_id = obj.data('target');
var target_type = 'folder';
/* droptarget is set for folders and documents in lists */
var droptarget = obj.data('droptarget');
if(droptarget) {
target_type = droptarget.split("_")[0];
target_id = droptarget.split("_")[1];
}
if(target_type == 'folder' && target_id) {
for (var i = 0; i < files.length; i++) { for (var i = 0; i < files.length; i++) {
if(files[i].size <= maxFileSize) { if(files[i].size <= maxFileSize) {
var fd = new FormData(); var fd = new FormData();
fd.append('folderid', target); fd.append('targettype', target_type);
fd.append('formtoken', obj.data('formtoken')); fd.append('folderid', target_id);
fd.append('formtoken', obj.data('uploadformtoken'));
fd.append('userfile', files[i]); fd.append('userfile', files[i]);
fd.append('command', 'uploaddocument');
// fd.append('path', files[i].webkitRelativePath); // fd.append('path', files[i].webkitRelativePath);
var status = new createStatusbar(obj); var status = new createStatusbar(statusbar);
status.setFileNameSize(files[i].name,files[i].size); status.setFileNameSize(files[i].name,files[i].size);
sendFileToServer(fd,status); sendFileToServer(fd,status);
} else { } else {
@ -666,6 +675,32 @@ function onAddClipboard(ev) { /* {{{ */
}); });
} }
} }
} else if(target_type == 'document' && target_id) {
/*
for (var i = 0; i < files.length; i++) {
if(files[i].size <= maxFileSize) {
var fd = new FormData();
fd.append('targettype', target_type);
fd.append('documentid', target_id);
fd.append('formtoken', obj.data('uploadformtoken'));
fd.append('userfile', files[i]);
fd.append('command', 'uploaddocument');
var status = new createStatusbar(statusbar);
status.setFileNameSize(files[i].name,files[i].size);
sendFileToServer(fd,status);
} else {
noty({
text: maxFileSizeMsg + '<br /><em>' + files[i].name + ' (' + files[i].size + ' Bytes)</em>',
type: 'error',
dismissQueue: true,
layout: 'topRight',
theme: 'defaultTheme',
timeout: 5000,
});
}
}
*/
} }
} }
}( window.SeedDMSUpload = window.SeedDMSUpload || {}, jQuery )); /* }}} */ }( window.SeedDMSUpload = window.SeedDMSUpload || {}, jQuery )); /* }}} */
@ -690,120 +725,209 @@ $(document).ready(function() { /* {{{ */
var files = e.originalEvent.dataTransfer.files; var files = e.originalEvent.dataTransfer.files;
//We need to send dropped files to Server //We need to send dropped files to Server
SeedDMSUpload.handleFileUpload(files,obj); SeedDMSUpload.handleFileUpload(files,obj,obj);
}); });
$(document).on('dragenter', '.table-row-folder', function (e) { $(document).on('dragenter', '.droptarget', function (e) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
$(e.currentTarget).css('border', '2px dashed #0B85A1'); $(e.currentTarget).css('border', '2px dashed #0B85A1');
}); });
$(document).on('dragleave', '.table-row-folder', function (e) { $(document).on('dragleave', '.droptarget', function (e) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
$(e.currentTarget).css('border', '0px solid white'); $(e.currentTarget).css('border', '0px solid white');
}); });
$(document).on('dragover', '.table-row-folder', function (e) { $(document).on('dragover', '.droptarget', function (e) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
}); });
$(document).on('drop', '.table-row-folder', function (e) { $(document).on('drop', '.droptarget', function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
$(e.currentTarget).css('border', '0px solid white'); $(e.currentTarget).css('border', '0px solid white');
attr_rel = $(e.currentTarget).attr('rel'); attr_rel = $(e.currentTarget).data('droptarget');
target_type = attr_rel.split("_")[0]; target_type = attr_rel.split("_")[0];
target_id = attr_rel.split("_")[1]; target_id = attr_rel.split("_")[1];
console.log(e.originalEvent.dataTransfer.getData("text")); if(target_type == 'folder') {
var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text")); var files = e.originalEvent.dataTransfer.files;
source_type = source_info.type; if(files.length > 0) {
source_id = source_info.id; console.log('Drop '+files.length+' files on '+target_type+' '+target_id);
formtoken = source_info.formtoken; SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$(e.currentTarget).find("span"));
// source_type = e.originalEvent.dataTransfer.getData("type"); } else {
// source_id = e.originalEvent.dataTransfer.getData("id"); var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
// formtoken = e.originalEvent.dataTransfer.getData("formtoken"); source_type = source_info.type;
if(source_type == 'document') { source_id = source_info.id;
bootbox.dialog(trans.confirm_move_document, [{ formtoken = source_info.formtoken;
"label" : "<i class='icon-remove'></i> "+trans.move_document, console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id);
"class" : "btn-danger", if(source_type == 'document') {
"callback": function() { bootbox.dialog(trans.confirm_move_document, [{
$.get('../op/op.Ajax.php', "label" : "<i class='icon-remove'></i> "+trans.move_document,
{ command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken }, "class" : "btn-danger",
function(data) { "callback": function() {
if(data.success) { $.get('../op/op.Ajax.php',
$('#table-row-document-'+source_id).hide('slow'); { command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken },
noty({ function(data) {
text: data.message, if(data.success) {
type: 'success', $('#table-row-document-'+source_id).hide('slow');
dismissQueue: true, noty({
layout: 'topRight', text: data.message,
theme: 'defaultTheme', type: 'success',
timeout: 1500, dismissQueue: true,
}); layout: 'topRight',
} else { theme: 'defaultTheme',
noty({ timeout: 1500,
text: data.message, });
type: 'error', } else {
dismissQueue: true, noty({
layout: 'topRight', text: data.message,
theme: 'defaultTheme', type: 'error',
timeout: 3500, dismissQueue: true,
}); layout: 'topRight',
} theme: 'defaultTheme',
}, timeout: 3500,
'json' });
); }
} },
}, { 'json'
"label" : trans.cancel, );
"class" : "btn-cancel", }
"callback": function() { }, {
} "label" : trans.cancel,
}]); "class" : "btn-cancel",
"callback": function() {
}
}]);
url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id; url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
// document.location = url; // document.location = url;
} else if(source_type == 'folder' && source_id != target_id) { } else if(source_type == 'folder' && source_id != target_id) {
bootbox.dialog(trans.confirm_move_folder, [{ bootbox.dialog(trans.confirm_move_folder, [{
"label" : "<i class='icon-remove'></i> "+trans.move_folder, "label" : "<i class='icon-remove'></i> "+trans.move_folder,
"class" : "btn-danger", "class" : "btn-danger",
"callback": function() { "callback": function() {
$.get('../op/op.Ajax.php', $.get('../op/op.Ajax.php',
{ command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken }, { command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken },
function(data) { function(data) {
if(data.success) { if(data.success) {
$('#table-row-folder-'+source_id).hide('slow'); $('#table-row-folder-'+source_id).hide('slow');
noty({ noty({
text: data.message, text: data.message,
type: 'success', type: 'success',
dismissQueue: true, dismissQueue: true,
layout: 'topRight', layout: 'topRight',
theme: 'defaultTheme', theme: 'defaultTheme',
timeout: 1500, timeout: 1500,
}); });
} else { } else {
noty({ noty({
text: data.message, text: data.message,
type: 'error', type: 'error',
dismissQueue: true, dismissQueue: true,
layout: 'topRight', layout: 'topRight',
theme: 'defaultTheme', theme: 'defaultTheme',
timeout: 3500, timeout: 3500,
}); });
} }
}, },
'json' 'json'
); );
} }
}, { }, {
"label" : trans.cancel, "label" : trans.cancel,
"class" : "btn-cancel", "class" : "btn-cancel",
"callback": function() { "callback": function() {
} }
}]); }]);
url = "../out/out.MoveFolder.php?folderid="+source_id+"&targetid="+target_id; url = "../out/out.MoveFolder.php?folderid="+source_id+"&targetid="+target_id;
// document.location = url; // document.location = url;
}
}
} else if(target_type == 'document') {
var files = e.originalEvent.dataTransfer.files;
if(files.length > 0) {
console.log('Drop '+files.length+' files on '+target_type+' '+target_id);
SeedDMSUpload.handleFileUpload(files,$(e.currentTarget),$(e.currentTarget).find("span"));
} else {
var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
source_type = source_info.type;
source_id = source_info.id;
formtoken = source_info.formtoken;
console.log('Drop '+source_type+' '+source_id+' on '+target_type+' '+target_id);
if(source_type == 'document') {
bootbox.dialog(trans.confirm_transfer_link_document, [{
"label" : "<i class='icon-remove'></i> "+trans.transfer_content,
"class" : "btn-danger",
"callback": function() {
$.get('../op/op.Ajax.php',
{ command: 'transfercontent', docid: source_id, targetdocumentid: target_id, formtoken: formtoken },
function(data) {
if(data.success) {
$('#table-row-document-'+source_id).hide('slow');
noty({
text: data.message,
type: 'success',
dismissQueue: true,
layout: 'topRight',
theme: 'defaultTheme',
timeout: 1500,
});
} else {
noty({
text: data.message,
type: 'error',
dismissQueue: true,
layout: 'topRight',
theme: 'defaultTheme',
timeout: 3500,
});
}
},
'json'
);
}
}, {
"label" : trans.link_document,
"class" : "btn-danger",
"callback": function() {
$.get('../op/op.Ajax.php',
{ command: 'linkdocument', docid: source_id, targetdocumentid: target_id, formtoken: formtoken },
function(data) {
if(data.success) {
noty({
text: data.message,
type: 'success',
dismissQueue: true,
layout: 'topRight',
theme: 'defaultTheme',
timeout: 1500,
});
} else {
noty({
text: data.message,
type: 'error',
dismissQueue: true,
layout: 'topRight',
theme: 'defaultTheme',
timeout: 3500,
});
}
},
'json'
);
}
}, {
"label" : trans.cancel,
"class" : "btn-cancel",
"callback": function() {
}
}]);
url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
// document.location = url;
}
}
} }
}); });
$(document).on('dragstart', '.table-row-folder', function (e) { $(document).on('dragstart', '.table-row-folder', function (e) {
@ -816,9 +940,6 @@ $(document).ready(function() { /* {{{ */
formtoken : $(e.target).attr('formtoken') formtoken : $(e.target).attr('formtoken')
}; };
e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo)); e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo));
// e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]);
// e.originalEvent.dataTransfer.setData("type","folder");
// e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken'));
}); });
$(document).on('dragstart', '.table-row-document', function (e) { $(document).on('dragstart', '.table-row-document', function (e) {
@ -831,9 +952,6 @@ $(document).ready(function() { /* {{{ */
formtoken : $(e.target).attr('formtoken') formtoken : $(e.target).attr('formtoken')
}; };
e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo)); e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo));
// e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]);
// e.originalEvent.dataTransfer.setData("type","document");
// e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken'));
}); });
/* Dropping item on alert below clipboard */ /* Dropping item on alert below clipboard */

41
views/bootstrap/class.Bootstrap.php
View File

@ -398,7 +398,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
for ($i = 0; $i < count($path); $i++) { for ($i = 0; $i < count($path); $i++) {
$txtpath .= "<li>"; $txtpath .= "<li>";
if ($i +1 < count($path)) { if ($i +1 < count($path)) {
$txtpath .= "<a href=\"../out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">". $txtpath .= "<a href=\"../out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder droptarget\" formtoken=\"".createFormKey('movefolder')."\">".
htmlspecialchars($path[$i]->getName())."</a>"; htmlspecialchars($path[$i]->getName())."</a>";
} }
else { else {
@ -1589,7 +1589,7 @@ $(document).ready(function() {
if($path || $expandtree>=$level) { if($path || $expandtree>=$level) {
if($path) if($path)
$pathfolder = array_shift($path); $pathfolder = array_shift($path);
$subfolders = $folder->getSubFolders($orderby[0], $orderdir); $subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode);
$children = array(); $children = array();
foreach($subfolders as $subfolder) { foreach($subfolders as $subfolder) {
@ -1597,7 +1597,7 @@ $(document).ready(function() {
if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) { if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) {
$node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1);
if($showdocs) { if($showdocs) {
$documents = $subfolder->getDocuments($orderby[0], $orderdir); $documents = $subfolder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode); $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode);
foreach($documents as $document) { foreach($documents as $document) {
$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false); $node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
@ -1609,7 +1609,7 @@ $(document).ready(function() {
} }
return $children; return $children;
} else { } else {
$subfolders = $folder->getSubFolders($orderby[0], $orderdir); $subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode);
$children = array(); $children = array();
foreach($subfolders as $subfolder) { foreach($subfolders as $subfolder) {
@ -1634,7 +1634,7 @@ $(document).ready(function() {
} else { } else {
$node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0); $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0);
if($showdocs) { if($showdocs) {
$documents = $folder->getDocuments($orderby[0], $orderdir); $documents = $folder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
$documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode); $documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);
foreach($documents as $document) { foreach($documents as $document) {
$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false); $node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
@ -1675,7 +1675,7 @@ $(function() {
onCreateLi: function(node, $li) { onCreateLi: function(node, $li) {
// Add 'icon' span before title // Add 'icon' span before title
if(node.is_folder) if(node.is_folder)
$li.find('.jqtree-title').before('<i class="icon-folder-close-alt table-row-folder" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey('movefolder'); ?>'); $li.find('.jqtree-title').before('<i class="icon-folder-close-alt table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey('movefolder'); ?>').attr('data-uploadformtoken', '<?php echo createFormKey('adddocument'); ?>');
else else
$li.find('.jqtree-title').before('<i class="icon-file"></i> '); $li.find('.jqtree-title').before('<i class="icon-file"></i> ');
} }
@ -2174,6 +2174,15 @@ $(document).ready( function() {
"; ";
} /* }}} */ } /* }}} */
function documentListRowStart($document) { /* {{{ */
$docID = $document->getID();
return "<tr id=\"table-row-document-".$docID."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$docID."\" rel=\"document_".$docID."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
} /* }}} */
function documentListRowEnd($document) { /* {{{ */
return "</tr>\n";
} /* }}} */
/** /**
* Return HTML of a single row in the document list table * Return HTML of a single row in the document list table
* *
@ -2197,7 +2206,7 @@ $(document).ready( function() {
$docID = $document->getID(); $docID = $document->getID();
if(!$skipcont) if(!$skipcont)
$content .= "<tr id=\"table-row-document-".$docID."\" class=\"table-row-document\" rel=\"document_".$docID."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">"; $content .= $this->documentListRowStart($document);
if($version) { if($version) {
$latestContent = $this->callHook('documentContent', $document, $version); $latestContent = $this->callHook('documentContent', $document, $version);
@ -2303,10 +2312,18 @@ $(document).ready( function() {
$content .= "</td>"; $content .= "</td>";
} }
if(!$skipcont) if(!$skipcont)
$content .= "</tr>\n"; $content .= $this->documentListRowEnd($document);
return $content; return $content;
} /* }}} */ } /* }}} */
function folderListRowStart($folder) { /* {{{ */
return "<tr id=\"table-row-folder-".$folder->getID()."\" draggable=\"true\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('adddocument')."\" formtoken=\"".createFormKey('movefolder')."\">";
} /* }}} */
function folderListRowEnd($folder) { /* {{{ */
return "</tr>\n";
} /* }}} */
function folderListRow($subFolder, $extracontent=array()) { /* {{{ */ function folderListRow($subFolder, $extracontent=array()) { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$user = $this->params['user']; $user = $this->params['user'];
@ -2321,9 +2338,9 @@ $(document).ready( function() {
if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
$content = ''; $content = '';
$content .= "<tr id=\"table-row-folder-".$subFolder->getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; $content .= $this->folderListRowStart($subFolder);
$content .= "<td><a _rel=\"folder_".$subFolder->getID()."\" draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\"><img draggable=\"false\" src=\"".$this->getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0></a></td>\n"; $content .= "<td><a draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\"><img draggable=\"false\" src=\"".$this->getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0></a></td>\n";
$content .= "<td><a draggable=\"false\" _rel=\"folder_".$subFolder->getID()."\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>"; $content .= "<td><a draggable=\"false\" href=\"../out/out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>";
$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $subFolder->getDate())."</b></span>"; $content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $subFolder->getDate())."</b></span>";
if($comment) { if($comment) {
$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>"; $content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
@ -2378,7 +2395,7 @@ $(document).ready( function() {
} }
$content .= "</div>"; $content .= "</div>";
$content .= "</td>"; $content .= "</td>";
$content .= "</tr>\n"; $content .= $this->folderListRowEnd($subFolder);
return $content; return $content;
} /* }}} */ } /* }}} */

5
views/bootstrap/class.Clipboard.php
View File

@ -103,7 +103,8 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
$content = ''; $content = '';
$comment = $folder->getComment(); $comment = $folder->getComment();
if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; // $content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
$content .= $this->folderListRowStart($folder);
$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0></a></td>\n"; $content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->getMimeIcon(".folder")."\" width=\"24\" height=\"24\" border=0></a></td>\n";
$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>"; $content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
if($comment) { if($comment) {
@ -138,7 +139,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
$version = $latestContent->getVersion(); $version = $latestContent->getVersion();
$status = $latestContent->getStatus(); $status = $latestContent->getStatus();
$content .= "<tr draggable=\"true\" rel=\"document_".$document->getID()."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">"; $content .= $this->documentListRowStart($document);
if (file_exists($dms->contentDir . $latestContent->getPath())) { if (file_exists($dms->contentDir . $latestContent->getPath())) {
$content .= "<td><a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version."\">"; $content .= "<td><a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version."\">";

2
views/bootstrap/class.Search.php
View File

@ -55,7 +55,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
function js() { /* {{{ */ function js() { /* {{{ */
header('Content-Type: application/javascript; charset=UTF-8'); header('Content-Type: application/javascript; charset=UTF-8');
parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder')); parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
$this->printFolderChooserJs("form1"); $this->printFolderChooserJs("form1");
$this->printDeleteFolderButtonJs(); $this->printDeleteFolderButtonJs();

4
views/bootstrap/class.ViewFolder.php
View File

@ -94,7 +94,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
$showtree = $this->params['showtree']; $showtree = $this->params['showtree'];
header('Content-Type: application/javascript; charset=UTF-8'); header('Content-Type: application/javascript; charset=UTF-8');
parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder')); parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
?> ?>
function folderSelected(id, name) { function folderSelected(id, name) {
window.location = '../out/out.ViewFolder.php?folderid=' + id; window.location = '../out/out.ViewFolder.php?folderid=' + id;
@ -390,7 +390,7 @@ $('#loadmore').click(function(e) {
// $this->addFooterJS("SeedDMSUpload.setMaxFileSize(".SeedDMS_Core_File::parse_filesize(ini_get("upload_max_filesize")).");"); // $this->addFooterJS("SeedDMSUpload.setMaxFileSize(".SeedDMS_Core_File::parse_filesize(ini_get("upload_max_filesize")).");");
// $this->addFooterJS("SeedDMSUpload.setMaxFileSizeMsg('".getMLText("uploading_maxsize")."');"); // $this->addFooterJS("SeedDMSUpload.setMaxFileSizeMsg('".getMLText("uploading_maxsize")."');");
?> ?>
<div id="dragandrophandler" class="well alert" data-target="<?php echo $folder->getID(); ?>" data-formtoken="<?php echo createFormKey('adddocument'); ?>"><?php printMLText('drop_files_here'); ?></div> <div id="dragandrophandler" class="well alert" data-droptarget="folder_<?php echo $folder->getID(); ?>" data-target="<?php echo $folder->getID(); ?>" data-uploadformtoken="<?php echo createFormKey('adddocument'); ?>"><?php printMLText('drop_files_here'); ?></div>
<?php <?php
echo "</div>"; echo "</div>";
echo "</div>"; echo "</div>";