diff --git a/module/Application/src/View/Helper/Sidebar.php b/module/Application/src/View/Helper/Sidebar.php index f8f28ca..f9b4a2e 100644 --- a/module/Application/src/View/Helper/Sidebar.php +++ b/module/Application/src/View/Helper/Sidebar.php @@ -36,28 +36,27 @@ public function render() if (count($this->items)==0) return ''; // Do nothing if there are no items. - $result = ''; + $result .= ''; + return $result; } diff --git a/module/Application/view/application/index/dashboard.phtml b/module/Application/view/application/index/dashboard.phtml index a066e29..7e79db6 100755 --- a/module/Application/view/application/index/dashboard.phtml +++ b/module/Application/view/application/index/dashboard.phtml @@ -86,21 +86,21 @@ inlineScript()->captureStart(); echo $this->headScript() -//// ->appendFile($this->basePath('vendors/Chart.js/dist/Chart.min.js')) -//// ->appendFile($this->basePath('vendors/gauge.js/dista/gauge.min.js')) -//// ->appendFile($this->basePath('vendors/bootstrap-progressbar/bootstrap-progressbar.min.js')) -//// ->appendFile($this->basePath('vendors/iCheck/icheck.min.js')) -//// ->appendFile($this->basePath('vendors/skycons/skycons.js')) -//// ->appendFile($this->basePath('vendors/Flot/jquery.flot.js')) -//// ->appendFile($this->basePath('vendors/Flot/jquery.flot.pie.js')) -//// ->appendFile($this->basePath('vendors/Flot/jquery.flot.time.js')) -//// ->appendFile($this->basePath('vendors/Flot/jquery.flot.stack.js')) -//// ->appendFile($this->basePath('vendors/Flot/jquery.flot.resize.js')) -//// ->appendFile($this->basePath('vendors/flot.orderbars/js/jquery.flot.orderBars.js')) -//// ->appendFile($this->basePath('ve ndors/flot-spline/js/jquery.flot.spline.min.js')) -//// ->appendFile($this->basePath('vendors/flot.curvedlines/curvedLines.js')) -//// ->appendFile($this->basePath('vendors/DateJS/build/date.js')) - ->appendFile($this->basePath('build/js/custom.min.js')); +// ->appendFile($this->basePath('vendors/Chart.js/dist/Chart.min.js')) +// ->appendFile($this->basePath('vendors/gauge.js/dista/gauge.min.js')) +// ->appendFile($this->basePath('vendors/bootstrap-progressbar/bootstrap-progressbar.min.js')) +// ->appendFile($this->basePath('vendors/iCheck/icheck.min.js')) +// ->appendFile($this->basePath('vendors/skycons/skycons.js')) +// ->appendFile($this->basePath('vendors/Flot/jquery.flot.js')) +// ->appendFile($this->basePath('vendors/Flot/jquery.flot.pie.js')) +// ->appendFile($this->basePath('vendors/Flot/jquery.flot.time.js')) +// ->appendFile($this->basePath('vendors/Flot/jquery.flot.stack.js')) +// ->appendFile($this->basePath('vendors/Flot/jquery.flot.resize.js')) +// ->appendFile($this->basePath('vendors/flot.orderbars/js/jquery.flot.orderBars.js')) +// ->appendFile($this->basePath('vendors/flot-spline/js/jquery.flot.spline.min.js')) +// ->appendFile($this->basePath('vendors/flot.curvedlines/curvedLines.js')) +// ->appendFile($this->basePath('vendors/DateJS/build/date.js')) + ->appendFile($this->basePath('build/js/custom.js')); //echo $this->headScript()->offsetSetScript(10, $this->basePath('build/js/custom.min.js'), 'text/javascript'); diff --git a/module/Application/view/partials/left-sidebar.phtml b/module/Application/view/partials/left-sidebar.phtml index c6282ff..b46b299 100644 --- a/module/Application/view/partials/left-sidebar.phtml +++ b/module/Application/view/partials/left-sidebar.phtml @@ -1,29 +1,3 @@ -
-
- - -
-
- - - - -
-
leftSideBar()->setItems([ [ 'id' => 'home', 'label' => 'Home', - 'link' => $this->url('home') - ], - [ - 'id' => 'downloads', - 'label' => 'Downloads', - 'link' => $this->url("application", ['action' => 'downloads']) - ], - [ - 'id' => 'support', - 'label' => 'Support', - 'dropdown' => [ - [ - 'id' => 'documentation', - 'label' => 'Documentation', - 'link' => $this->url('application', ['page' => 'contents']) - ], - [ - 'id' => 'help', - 'label' => 'Help', - 'link' => $this->url('application', ['page' => 'help']) - ] - ] + 'link' => $this->url('home'), + 'class' => 'active', ], [ - 'id' => 'about', - 'label' => 'About', - $this->url('home') + 'id' => 'manula-search', + 'label' => 'Manual Search', + 'link' => $this->url("application", ['action' => 'manual-search']) ], +// [ +// 'id' => 'support', +// 'label' => 'Support', +// 'dropdown' => [ +// [ +// 'id' => 'documentation', +// 'label' => 'Documentation', +// 'link' => $this->url('application', ['page' => 'contents']) +// ], +// [ +// 'id' => 'help', +// 'label' => 'Help', +// 'link' => $this->url('application', ['page' => 'help']) +// ] +// ] +// ], +// [ +// 'id' => 'about', +// 'label' => 'About', +// $this->url('home') +// ], ]); -//echo $this->leftSideBar()->render(); \ No newline at end of file +echo $this->leftSideBar()->render(); \ No newline at end of file diff --git a/module/Application/view/partials/top-nav.phtml b/module/Application/view/partials/top-nav.phtml index bf1839e..1410def 100644 --- a/module/Application/view/partials/top-nav.phtml +++ b/module/Application/view/partials/top-nav.phtml @@ -5,7 +5,6 @@ -