gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-28 04:27:32 +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 2021-05-07 17:51:17 +02:00
commit 3cee482b1c
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -209,6 +209,7 @@
RemoveFolder::run was called more than once
- fix php error setting mandatory workflow when uploading documents via webdav
- typeahead search for folders can search in subfolders
- new theme based on bootstrap 4, including many improvements on small displays
--------------------------------------------------------------------------------
Changes in version 5.1.22

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

@ -669,7 +669,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$content = '';
$content .= "<ul".(isset($options['id']) ? ' id="'.$options['id'].'"' : '')." class=\"nav nav-list sidenav bs-docs-sidenav\">\n";
foreach($menuitems as $menuitem) {
$content .= " <li class=\"\">\n";
$content .= " <li class=\"".(!empty($menuitem['active']) ? ' active' : '')."\">\n";
$content .= ' <a';
$content .= !empty($menuitem['link']) ? 'href="'.$menuitem['link'].'"' : '';
if(!empty($menuitem['attributes']))

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

@ -119,9 +119,12 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
$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()."\">" . htmlspecialchars($folder->getName()) . "</a>";
/*
if($comment) {
$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
}
*/
$content .= $this->getListRowPath($folder);
$content .= "</td>\n";
$content .= "<td>\n";
$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folder->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";
@ -165,9 +168,12 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
$content .= "<td><a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$document->getID()."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
/*
if($comment) {
$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
}
*/
$content .= $this->getListRowPath($document);
$content .= "</td>\n";
$content .= "<td>\n";
$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$document->getID()."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$document->getID()."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"fa fa-remove\"></i></a></div>";

2
views/bootstrap4/class.Bootstrap4.php
View File

@ -593,7 +593,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$content = '';
$content .= "<ul".(isset($options['id']) ? ' id="'.$options['id'].'"' : '')." class=\"list-group sidenav\">\n";
foreach($menuitems as $menuitem) {
$content .= " <li class=\"list-group-item d-flex justify-content-between align-items-center\">\n";
$content .= " <li class=\"list-group-item d-flex justify-content-between align-items-center".(!empty($menuitem['active']) ? ' active' : '')."\">\n";
$content .= ' <a';
$content .= !empty($menuitem['link']) ? 'href="'.$menuitem['link'].'"' : '';
if(!empty($menuitem['attributes']))