mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-16 22:51:32 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
84b709c8cd
|
@ -973,10 +973,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
||||||
|
|
||||||
if($accessobject->check_view_access(array('BackupTools', 'LogManagement'))) {
|
if($accessobject->check_view_access(array('BackupTools', 'LogManagement'))) {
|
||||||
$menuitems['backup_log_management'] = array('link'=>"#", 'label'=>getMLText('backup_log_management'));
|
$menuitems['backup_log_management'] = array('link'=>"#", 'label'=>getMLText('backup_log_management'));
|
||||||
}
|
|
||||||
if ($accessobject->check_view_access('BackupTools'))
|
if ($accessobject->check_view_access('BackupTools'))
|
||||||
$menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.BackupTools.php", 'label'=>getMLText('backup_tools'));
|
$menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.BackupTools.php", 'label'=>getMLText('backup_tools'));
|
||||||
if ($this->params['logfileenable']) {
|
if ($this->params['logfileenable'])
|
||||||
if ($accessobject->check_view_access('LogManagement'))
|
if ($accessobject->check_view_access('LogManagement'))
|
||||||
$menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.LogManagement.php", 'label'=>getMLText('log_management'));
|
$menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.LogManagement.php", 'label'=>getMLText('log_management'));
|
||||||
}
|
}
|
||||||
|
@ -2942,7 +2941,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
|
||||||
} else {
|
} else {
|
||||||
$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" ".($previewwidth ? "width=\"".$previewwidth."\"" : "")."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
|
$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" ".($previewwidth ? "width=\"".$previewwidth."\"" : "")."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
|
||||||
}
|
}
|
||||||
if($accessop->check_controller_access('Download', array('action'=>'run')))
|
if($accessop->check_controller_access('Download', array('action'=>'version')))
|
||||||
$content .= "</a>";
|
$content .= "</a>";
|
||||||
} else
|
} else
|
||||||
$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
|
$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user