Update navigation

LaravelRUS · May 20, 2016 · 9da3d6b · 9da3d6b
1 parent 9e687c6
commit 9da3d6b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/src/Navigation.php b/src/Navigation.php
@@ -4,17 +4,26 @@
 
 class Navigation extends \KodiComponents\Navigation\Navigation
 {
+
     /**
-     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory
+     * @param string|null $view
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function render()
+    public function render($view = null)
     {
-        $this->findActive();
+        $this->findActivePage();
         $this->filterByAccessRights();
         $this->sort();
 
+        if (! is_null($view)) {
+            return view($view, [
+                'pages' => $this->getPages(),
+            ])->render();
+        }
+
         return app('sleeping_owl.template')->view('_partials.navigation.navigation', [
-            'pages' => $this->toArray(),
+            'pages' => $this->getPages(),
         ])->render();
     }
 }
diff --git a/src/Navigation/Page.php b/src/Navigation/Page.php
@@ -83,11 +83,20 @@ public function getAccessLogic()
     }
 
     /**
-     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory
+     * @param string|null $view
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function render()
+    public function render($view = null)
     {
-        return app('sleeping_owl.template')->view('_partials.navigation.page', $this->toArray());
+        $data          = $this->toArray();
+        $data['pages'] = $this->getPages();
+
+        if (! is_null($view)) {
+            return view($view, $data)->render();
+        }
+
+        return app('sleeping_owl.template')->view('_partials.navigation.page', $data)->render();
     }
 
     /**