gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 00:45:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2020-03-05 08:05:38 +01:00
commit 3d5f321713
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
out/out.AttributeMgr.php
View File

@ -47,7 +47,7 @@ if(isset($_GET['attrdefid']) && $_GET['attrdefid']) {
if($view) {
$view->setParam('accessobject', $accessop);
$view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax
$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
$view->setParam('attrdefs', $attrdefs);
$view->setParam('selattrdef', $selattrdef);
$view->setParam('showtree', showtree());

2
out/out.Calendar.php
View File

@ -68,7 +68,7 @@ if(isset($_GET['eventtype']) && $_GET['eventtype']) {
if($view) {
$view->setParam('accessobject', $accessop);
$view->setParam('onepage', false); // do most navigation by reloading areas of pages with ajax
$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
$view->setParam('calendar', $calendar);
$view->setParam('start', $start);
$view->setParam('end', $end);

1
out/out.Categories.php
View File

@ -52,6 +52,7 @@ if($view) {
$view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
$view->setParam('xsendfile', $settings->_enableXsendfile);
$view($_GET);
}

2
styles/bootstrap/application.css
View File

@ -280,7 +280,7 @@ div.popupbox {
padding: 25px 15px 15px 15px;
display: none;
position: absolute;
min-width: 250px;
min-width: 230px;
}
div.popupbox dt {

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

@ -55,6 +55,7 @@ $(document).ready( function() {
$this->printDeleteFolderButtonJs();
$this->printDeleteDocumentButtonJs();
$this->printDeleteAttributeValueButtonJs();
$this->printClickDocumentJs();
} /* }}} */
function info() { /* {{{ */
@ -381,4 +382,3 @@ $(document).ready( function() {
$this->htmlEndPage();
} /* }}} */
}
?>

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

@ -2561,9 +2561,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
$content .= "</td>";
$content .= "<td>";
$content .= "<td".($onepage ? ' style="cursor: pointer;"' : '').">";
if($onepage)
$content .= "<b>".htmlspecialchars($document->getName()) . "</b>";
$content .= "<b".($onepage ? ' title="Id:'.$document->getId().'"' : '').">".htmlspecialchars($document->getName()) . "</b>";
else
$content .= "<a draggable=\"false\" href=\"../out/out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a>";
if(isset($extracontent['below_title']))
@ -2706,7 +2706,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$content .= $this->folderListRowStart($subFolder);
$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";
if($onepage)
$content .= "<td>" . "<b>".htmlspecialchars($subFolder->getName())."</b>";
$content .= "<td style=\"cursor: pointer;\">" . "<b title=\"Id:".$subFolder->getId()."\">".htmlspecialchars($subFolder->getName())."</b>";
else
$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>";
@ -3205,4 +3205,3 @@ $("body").on("click", "span.openpopupbox", function(e) {
<?php
} /* }}} */
}
?>

1
views/bootstrap/class.Calendar.php
View File

@ -374,6 +374,7 @@ $(document).ready(function() {
});
*/
<?php
$this->printClickDocumentJs();
} /* }}} */
function show() { /* {{{ */

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

@ -48,6 +48,7 @@ $(document).ready( function() {
<?php
$this->printDeleteFolderButtonJs();
$this->printDeleteDocumentButtonJs();
$this->printClickDocumentJs();
} /* }}} */
function info() { /* {{{ */
@ -178,4 +179,3 @@ $(document).ready( function() {
$this->htmlEndPage();
} /* }}} */
}
?>