gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-07 05:39:21 +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-04-30 09:04:24 +02:00
commit fb44b524fd
1 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,12 +79,8 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
header($name . ": " . $value); header($name . ": " . $value);
} }
} }
$hookObjs = $this->getHookObjects('SeedDMS_View_Bootstrap'); if($this->hasHook('startPage'))
foreach($hookObjs as $hookObj) { $this->callHook('startPage');
if (method_exists($hookObj, 'startPage')) {
$hookObj->startPage($this);
}
}
echo "<!DOCTYPE html>\n"; echo "<!DOCTYPE html>\n";
echo "<html lang=\"en\">\n<head>\n"; echo "<html lang=\"en\">\n<head>\n";
echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n"; echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
@ -147,11 +143,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo "<div class=\"splash\" data-type=\"".$flashmsg['type']."\"".(!empty($flashmsg['timeout']) ? ' data-timeout="'.$flashmsg['timeout'].'"': '').">".$flashmsg['msg']."</div>\n"; echo "<div class=\"splash\" data-type=\"".$flashmsg['type']."\"".(!empty($flashmsg['timeout']) ? ' data-timeout="'.$flashmsg['timeout'].'"': '').">".$flashmsg['msg']."</div>\n";
} }
echo "<div class=\"statusbar-container\"><h1>".getMLText('recent_uploads')."</h1></div>\n"; echo "<div class=\"statusbar-container\"><h1>".getMLText('recent_uploads')."</h1></div>\n";
foreach($hookObjs as $hookObj) { if($this->hasHook('startBody'))
if (method_exists($hookObj, 'startBody')) { $this->callHook('startBody');
$hookObj->startBody($this);
}
}
} /* }}} */ } /* }}} */
function htmlAddHeader($head, $type='js') { /* {{{ */ function htmlAddHeader($head, $type='js') { /* {{{ */
@ -166,13 +159,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
function htmlEndPage($nofooter=false) { /* {{{ */ function htmlEndPage($nofooter=false) { /* {{{ */
if(!$nofooter) { if(!$nofooter) {
$hookObjs = $this->getHookObjects('SeedDMS_View_Bootstrap');
$html = $this->footNote(); $html = $this->footNote();
foreach($hookObjs as $hookObj) { if($this->hasHook('footNote'))
if (method_exists($hookObj, 'footNote')) { $html = $this->callHook('footNote', $html);
$html = $hookObj->footNote($this, $html);
}
}
echo $html; echo $html;
if($this->params['showmissingtranslations']) { if($this->params['showmissingtranslations']) {
$this->missingLanguageKeys(); $this->missingLanguageKeys();
@ -317,15 +306,11 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
} }
echo " </ul>\n"; echo " </ul>\n";
$hookObjs = $this->getHookObjects('SeedDMS_View_Bootstrap');
echo " <ul class=\"navbar-nav\">\n"; echo " <ul class=\"navbar-nav\">\n";
$menuitems = array(); $menuitems = array();
/* Check if hook exists because otherwise callHook() will override $menuitems */ /* Check if hook exists because otherwise callHook() will override $menuitems */
foreach($hookObjs as $hookObj) { if($this->hasHook('globalNavigationBar'))
if (method_exists($hookObj, 'globalNavigationBar')) { $menuitems = $this->callHook('globalNavigationBar', $menuitems);
$menuitems = $hookObj->globalNavigationBar($this, $menuitems);
}
}
foreach($menuitems as $menuitem) { foreach($menuitems as $menuitem) {
if(!empty($menuitem['children'])) { if(!empty($menuitem['children'])) {
echo " <li class=\"nav-item dropdown\">\n"; echo " <li class=\"nav-item dropdown\">\n";
@ -413,11 +398,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$menuitems['my_account'] = array('link'=>"../out/out.MyAccount.php", 'label'=>'my_account'); $menuitems['my_account'] = array('link'=>"../out/out.MyAccount.php", 'label'=>'my_account');
if ($accessobject->check_view_access('TransmittalMgr')) if ($accessobject->check_view_access('TransmittalMgr'))
$menuitems['my_transmittals'] = array('link'=>"../out/out.TransmittalMgr.php", 'label'=>'my_transmittals'); $menuitems['my_transmittals'] = array('link'=>"../out/out.TransmittalMgr.php", 'label'=>'my_transmittals');
foreach($hookObjs as $hookObj) { if($this->hasHook('userMenuItems'))
if (method_exists($hookObj, 'userMenuItems')) { $menuitems = $this->callHook('userMenuItems', $menuitems);
$menuitems = $hookObj->userMenuItems($this, $menuitems);
}
}
if($menuitems) { if($menuitems) {
foreach($menuitems as $menuitem) { foreach($menuitems as $menuitem) {
echo " <a class=\"dropdown-item\" href=\"".$menuitem['link']."\">".getMLText($menuitem['label'])."</a>\n"; echo " <a class=\"dropdown-item\" href=\"".$menuitem['link']."\">".getMLText($menuitem['label'])."</a>\n";
@ -2842,13 +2824,16 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
* @return string * @return string
*/ */
function getListRowPath($object) { /* {{{ */ function getListRowPath($object) { /* {{{ */
$belowtitle = "<br /><span style=\"font-size: 85%;\">".getMLText('in_folder').": /"; $belowtitle = '';
$folder = $object->getParent(); $folder = $object->getParent();
$path = $folder->getPath(); if($folder) {
for ($i = 1; $i < count($path); $i++) { $belowtitle .= "<br /><span style=\"font-size: 85%;\">".getMLText('in_folder').": /";
$belowtitle .= htmlspecialchars($path[$i]->getName())."/"; $path = $folder->getPath();
for ($i = 1; $i < count($path); $i++) {
$belowtitle .= htmlspecialchars($path[$i]->getName())."/";
}
$belowtitle .= "</span>";
} }
$belowtitle .= "</span>";
return $belowtitle; return $belowtitle;
} /* }}} */ } /* }}} */
@ -3156,10 +3141,12 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
if(!empty($extracontent['begin_action_list'])) if(!empty($extracontent['begin_action_list']))
$content .= $extracontent['begin_action_list']; $content .= $extracontent['begin_action_list'];
$subFolderAccessMode = $subFolder->getAccessMode($user); $subFolderAccessMode = $subFolder->getAccessMode($user);
if($subFolderAccessMode >= M_ALL) { if ($accessop->check_view_access('RemoveFolder')) {
$content .= $this->printDeleteFolderButton($subFolder, 'splash_rm_folder', true); if($subFolderAccessMode >= M_ALL) {
} else { $content .= $this->printDeleteFolderButton($subFolder, 'splash_rm_folder', true);
$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>'; } else {
$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
}
} }
if($subFolderAccessMode >= M_READWRITE) { if($subFolderAccessMode >= M_READWRITE) {
$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>'; $content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>';