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

This commit is contained in:
Uwe Steinmann 2020-11-11 17:42:21 +01:00
commit f47ad55223

View File

@ -378,9 +378,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo " <div class=\"navbar-inner\">\n";
echo " <div class=\"container-fluid\">\n";
echo " <a class=\"btn btn-navbar\" data-toggle=\"collapse\" data-target=\".nav-col1\">\n";
echo " <span class=\"fa fa-bar\"></span>\n";
echo " <span class=\"fa fa-bar\"></span>\n";
echo " <span class=\"fa fa-bar\"></span>\n";
echo " <span class=\"fa fa-bars\"></span>\n";
echo " </a>\n";
echo " <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
if(isset($this->params['user']) && $this->params['user']) {
@ -561,9 +559,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo " <div class=\"navbar-inner\">\n";
echo " <div class=\"container\">\n";
echo " <a class=\"btn btn-navbar\" data-toggle=\"collapse\" data-target=\".col2\">\n";
echo " <span class=\"fa fa-bar\"></span>\n";
echo " <span class=\"fa fa-bar\"></span>\n";
echo " <span class=\"fa fa-bar\"></span>\n";
echo " <span class=\"fa fa-bars\"></span>\n";
echo " </a>\n";
switch ($pageType) {
case "view_folder":