gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 04:31: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-07-13 12:45:40 +02:00
commit 59d9786a4c
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -466,13 +466,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
if($accessobject->check_view_access('Tasks', array('action'=>'menuTasks'))) {
echo " <div id=\"menu-tasks\">";
echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Tasks\" data-action=\"menuTasks\"></div>";
// echo " <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
// echo " <li class=\"dropdown\">\n";
// echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array()));
// echo " </li>\n";
// echo " </ul>\n";
echo " </div>";
//$this->addFooterJS('checkTasks();');
}
}
/* }}} End of menu tasks */
@ -611,7 +605,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
return;
} /* }}} */
protected function showNavigationBar($menuitems, $options = array()) { /* {{{ */
protected function showNavigationBar($menuitems, $options=array()) { /* {{{ */
$content = '';
$content .= "<ul".(isset($options['id']) ? ' id="'.$options['id'].'"' : '')." class=\"nav".(isset($options['right']) ? ' pull-right' : '')."\">\n";
foreach($menuitems as $menuitem) {

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

@ -327,12 +327,15 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo " <div class=\"collapse navbar-collapse\" id=\"navbarMain\">\n";
echo " <ul class=\"navbar-nav\">\n";
$menuitems = array();
/* calendar {{{ */
if ($this->params['enablecalendar'] && $accessobject->check_view_access('Calendar')) $menuitems['calendar'] = array('link'=>$this->params['settings']->_httpRoot.'out/out.Calendar.php?mode='.$this->params['calendardefaultview'], 'label'=>"calendar");
if ($this->params['user']->isAdmin()) $menuitems['admintools'] = array('link'=>$this->params['settings']->_httpRoot.'out/out.AdminTools.php', 'label'=>"admin_tools");
if($this->params['enablehelp']) {
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$menuitems['help'] = array('link'=>$this->params['settings']->_httpRoot.'out/out.Help.php?context='.$tmp[1], 'label'=>"help");
}
/* }}} End of calendar */
/* Check if hook exists because otherwise callHook() will override $menuitems */
if($this->hasHook('globalNavigationBar'))
$menuitems = $this->callHook('globalNavigationBar', $menuitems);
@ -356,13 +359,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
if($accessobject->check_view_access('Tasks', array('action'=>'menuTasks'))) {
echo " <div id=\"menu-tasks\" class=\"ml-auto\">";
echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Tasks\" data-action=\"menuTasks\"></div>";
// echo " <ul id=\"main-menu-tasks\" class=\"navbar-nav ml-auto\">\n";
// echo " <li class=\"nav-item dropdown\">\n";
// echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array()));
// echo " </li>\n";
// echo " </ul>\n";
echo " </div>";
//$this->addFooterJS('checkTasks();');
}
}
/* }}} End of menu tasks */