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

Merge branch 'seeddms-4.3.9' into develop

Browse Source 
Conflicts:
	views/bootstrap/class.Bootstrap.php
This commit is contained in:
Uwe Steinmann 2014-06-06 15:13:15 +02:00
commit f1a9923f57
2 changed files with 93 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
styles/bootstrap/application.js
View File

@ -201,7 +201,7 @@ $(document).ready( function() {
);
});
$('a.addtoclipboard').click(function(ev){
$('body').on('click', 'a.addtoclipboard', function(ev){
ev.preventDefault();
attr_rel = $(ev.currentTarget).attr('rel');
attr_msg = $(ev.currentTarget).attr('msg');
@ -467,7 +467,35 @@ function onAddClipboard(ev) {
source_type = ev.dataTransfer.getData("type");
source_id = ev.dataTransfer.getData("id");
if(source_type == 'document' || source_type == 'folder') {
url = "../op/op.AddToClipboard.php?id="+source_id+"&type="+source_type;
document.location = url;
$.get('../op/op.Ajax.php',
{ command: 'addtoclipboard', type: source_type, id: source_id },
function(data) {
console.log(data);
if(data.success) {
$("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard')
$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard')
noty({
text: attr_msg,
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'
);
//url = "../op/op.AddToClipboard.php?id="+source_id+"&type="+source_type;
//document.location = url;
}
}

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

@ -1262,12 +1262,10 @@ $(function() {
function mainClipboard($clipboard){ /* {{{ */
$dms = $this->params['dms'];
$content = '';
if(!$clipboard['docs'] && !$clipboard['folders']) {
$content .= "<div class=\"alert\">".getMLText("drag_icon_here")."</div>";
} else {
$content .= "<table class=\"table\">";
$foldercount = $doccount = 0;
if($clipboard['folders']) {
foreach($clipboard['folders'] as $folderid) {
/* FIXME: check for access rights, which could have changed after adding the folder to the clipboard */
if($folder = $dms->getFolder($folderid)) {
$comment = $folder->getComment();
if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
@ -1282,17 +1280,15 @@ $(function() {
$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
$content .= "</td>\n";
$content .= "</tr>\n";
$foldercount++;
}
}
}
$previewer = new SeedDMS_Preview_Previewer($this->params['cachedir'], 40);
if($clipboard['docs']) {
foreach($clipboard['docs'] as $docid) {
/* FIXME: check for access rights, which could have changed after adding the document to the clipboard */
if($document = $dms->getDocument($docid)) {
$txt = $this->callHook('documentClipboardItem', $document, $previewer);
if(is_string($txt))
echo $txt;
else {
$comment = $document->getComment();
if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
if($latestContent = $document->getLatestContent()) {
@ -1322,13 +1318,21 @@ $(function() {
$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$docid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
$content .= "</td>\n";
$content .= "</tr>";
$doccount++;
}
}
}
}
}
/* $foldercount or $doccount will only count objects which are
* actually available
*/
if($foldercount || $doccount) {
$content = "<table class=\"table\">".$content;
$content .= "</table>";
} else {
}
$content .= "<div class=\"alert\">".getMLText("drag_icon_here")."</div>";
return $content;
} /* }}} */
@ -1339,7 +1343,7 @@ $(function() {
*/
function printClipboard($clipboard){ /* {{{ */
$this->contentHeading(getMLText("clipboard"), true);
echo "<div id=\"main-clipboard\" class=\"well\" ondragover=\"allowDrop(event)\" ondrop=\"onAddClipboard(event)\">\n";
echo "<div id=\"main-clipboard\" _class=\"well\" ondragover=\"allowDrop(event)\" ondrop=\"onAddClipboard(event)\">\n";
echo $this->mainClipboard($clipboard);
echo "</div>\n";
} /* }}} */