diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index fca389356..5fa0642b8 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -49,11 +49,13 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common { $this->footerjs[] = $script; } /* }}} */ - function htmlStartPage($title="", $bodyClass="") { /* {{{ */ + function htmlStartPage($title="", $bodyClass="", $base="") { /* {{{ */ echo "\n"; echo "\n\n"; echo "\n"; echo ''."\n"; + if($base) + echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -577,8 +579,21 @@ $(document).ready(function () { $menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>'edit_existing_notify'); } - $this->hasHook('documentNavigationBar'); - $this->callHook('documentNavigationBar', $document, $menuitems); + /* Check if hook exists because otherwise callHook() will override $menuitems */ + if($this->hasHook('documentNavigationBar')) + $menuitems = $this->callHook('documentNavigationBar', $document, $menuitems); + + /* Do not use $this->callHook() because $menuitems must be returned by the hook + * or left unchanged + */ + /* + $hookObjs = $this->getHookObjects(); + foreach($hookObjs as $hookObj) { + if (method_exists($hookObj, 'documentNavigationBar')) { + $menuitems = $hookObj->documentNavigationBar($this, $document, $menuitems); + } + } + */ foreach($menuitems as $menuitem) { echo "
  • ".getMLText($menuitem['label'])."
  • ";