enableClipboard takes out all clipboard functions

This commit is contained in:
Uwe Steinmann 2015-02-24 17:47:58 +01:00
parent 018979f254
commit cb0d7d8d92
3 changed files with 20 additions and 9 deletions

View File

@ -506,7 +506,10 @@ class Settings { /* {{{ */
$this->_converters = array(); $this->_converters = array();
foreach($converters as $converter) { foreach($converters as $converter) {
$tab = $converter->attributes(); $tab = $converter->attributes();
$this->_converters[trim(strval($tab['mimeType']))] = trim(strval($converter)); if(empty(trim(strval($tab['target']))))
$this->_converters['fulltext'][trim(strval($tab['mimeType']))] = trim(strval($converter));
else
$this->_converters[trim(strval($tab['target']))][trim(strval($tab['mimeType']))] = trim(strval($converter));
} }
return true; return true;
} /* }}} */ } /* }}} */
@ -747,7 +750,7 @@ class Settings { /* {{{ */
$this->setXMLAttributValue($node, "maxExecutionTime", $this->_maxExecutionTime); $this->setXMLAttributValue($node, "maxExecutionTime", $this->_maxExecutionTime);
// XML Path: /configuration/advanced/converters // XML Path: /configuration/advanced/converters
foreach($this->_converters as $mimeType => $cmd) foreach($this->_converters['fulltext'] as $mimeType => $cmd)
{ {
// search XML node // search XML node
$node = $xml->xpath('/configuration/advanced/converters/converter[@mimeType="'. $mimeType .'"]'); $node = $xml->xpath('/configuration/advanced/converters/converter[@mimeType="'. $mimeType .'"]');
@ -761,7 +764,7 @@ class Settings { /* {{{ */
else else
{ {
$nodeParent = $xml->xpath('/configuration/advanced/converters'); $nodeParent = $xml->xpath('/configuration/advanced/converters');
$node = $nodeParent[0]->addChild("converters"); $node = $nodeParent[0]->addChild("converter");
} }
$node[0] = $cmd; $node[0] = $cmd;

View File

@ -73,6 +73,7 @@ class UI extends UI_Default {
$view->setParam('expandfoldertree', $settings->_expandFolderTree); $view->setParam('expandfoldertree', $settings->_expandFolderTree);
$view->setParam('enablefoldertree', $settings->_enableFolderTree); $view->setParam('enablefoldertree', $settings->_enableFolderTree);
$view->setParam('enablelanguageselector', $settings->_enableLanguageSelector); $view->setParam('enablelanguageselector', $settings->_enableLanguageSelector);
$view->setParam('enableclipboard', $settings->_enableClipboard);
$view->setParam('workflowmode', $settings->_workflowMode); $view->setParam('workflowmode', $settings->_workflowMode);
$view->setParam('partitionsize', $settings->_partitionSize); $view->setParam('partitionsize', $settings->_partitionSize);
$view->setParam('showmissingtranslations', $settings->_showMissingTranslations); $view->setParam('showmissingtranslations', $settings->_showMissingTranslations);

View File

@ -285,10 +285,11 @@ $(document).ready(function () {
echo " </li>\n"; echo " </li>\n";
echo " </ul>\n"; echo " </ul>\n";
echo " <div id=\"menu-clipboard\">"; if($this->params['enableclipboard']) {
echo $this->menuClipboard($this->params['session']->getClipboard()); echo " <div id=\"menu-clipboard\">";
echo " </div>"; echo $this->menuClipboard($this->params['session']->getClipboard());
echo " </div>";
}
echo " <ul class=\"nav\">\n"; echo " <ul class=\"nav\">\n";
// echo " <li id=\"first\"><a href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".getMLText("content")."</a></li>\n"; // echo " <li id=\"first\"><a href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".getMLText("content")."</a></li>\n";
@ -1423,6 +1424,7 @@ $('#delete-folder-btn-".$folderid."').popover({
$showtree = $this->params['showtree']; $showtree = $this->params['showtree'];
$workflowmode = $this->params['workflowmode']; $workflowmode = $this->params['workflowmode'];
$previewwidth = $this->params['previewWidthList']; $previewwidth = $this->params['previewWidthList'];
$enableClipboard = $this->params['enableClipboard'];
$content = ''; $content = '';
@ -1503,7 +1505,9 @@ $('#delete-folder-btn-".$folderid."').popover({
if($document->getAccessMode($user) >= M_READWRITE) { if($document->getAccessMode($user) >= M_READWRITE) {
$content .= $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true); $content .= $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true);
} }
$content .= '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="icon-copy"></i></a>'; if($enableClipboard) {
$content .= '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="icon-copy"></i></a>';
}
$content .= "</div>"; $content .= "</div>";
$content .= "</td>"; $content .= "</td>";
} }
@ -1519,6 +1523,7 @@ $('#delete-folder-btn-".$folderid."').popover({
$showtree = $this->params['showtree']; $showtree = $this->params['showtree'];
$enableRecursiveCount = $this->params['enableRecursiveCount']; $enableRecursiveCount = $this->params['enableRecursiveCount'];
$maxRecursiveCount = $this->params['maxRecursiveCount']; $maxRecursiveCount = $this->params['maxRecursiveCount'];
$enableClipboard = $this->params['enableClipboard'];
$owner = $subFolder->getOwner(); $owner = $subFolder->getOwner();
$comment = $subFolder->getComment(); $comment = $subFolder->getComment();
@ -1572,7 +1577,9 @@ $('#delete-folder-btn-".$folderid."').popover({
} else { } else {
$content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>'; $content .= '<span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>';
} }
$content .= '<a class="addtoclipboard" rel="F'.$subFolder->getID().'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="icon-copy"></i></a>'; if($enableClipboard) {
$content .= '<a class="addtoclipboard" rel="F'.$subFolder->getID().'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="icon-copy"></i></a>';
}
$content .= "</div>"; $content .= "</div>";
$content .= "</td>"; $content .= "</td>";
$content .= "</tr>\n"; $content .= "</tr>\n";