From 67bef4d276cbb03695bd5e00a5f8577ede7b2134 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Tue, 25 Dec 2018 20:48:02 +0300
Subject: [PATCH] Default theme: navigation updates

---
 .../default/views/partials/navigation.php     | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)
 mode change 100755 => 100644 site/themes/default/views/partials/navigation.php

diff --git a/site/themes/default/views/partials/navigation.php b/site/themes/default/views/partials/navigation.php
old mode 100755
new mode 100644
index aab37a5c..55a0da4f
--- a/site/themes/default/views/partials/navigation.php
+++ b/site/themes/default/views/partials/navigation.php
@@ -1,17 +1,19 @@
-<?php namespace Flextype ?>
-<?php use Flextype\Component\{Http\Http, Registry\Registry} ?>
-<nav class="navbar navbar-expand-lg navbar-light bg-white border-bottom box-shadow">
-<div class="container">
-  <a class="navbar-brand" href="<?= Http::getBaseUrl() ?>"><?= Registry::get('settings.title') ?></a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-  <div class="collapse navbar-collapse justify-content-end" id="navbarNav">
-    <ul class="navbar-nav">
-      <li class="nav-item">
-        <a class="nav-link <?php if(Http::getUriSegment(0) == 'home' || Http::getUriSegment(0) == ''): ?>active<?php endif ?>" href="<?= Http::getBaseUrl() ?>">Home</a>
-      </li>
-    </ul>
-  </div>
-</div>
-</nav>
+<?php namespace Flextype ?>
+<?php use Flextype\Component\{Http\Http, Registry\Registry, Arr\Arr} ?>
+<nav class="navbar navbar-expand-lg navbar-light bg-white border-bottom box-shadow">
+<div class="container">
+  <a class="navbar-brand" href="<?= Http::getBaseUrl() ?>"><?= Registry::get('settings.title') ?></a>
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  <div class="collapse navbar-collapse justify-content-end" id="navbarNav">
+    <ul class="navbar-nav">
+        <?php foreach (Arr::sort(Menus::get('default')['items'], 'order') as $item): ?>
+        <li class="nav-item">
+            <a class="nav-link <?php if (Http::getUriString() == $item['url']): ?>active<?php endif ?>" href="<?= Http::getBaseUrl() . '/' . $item['url'] ?>"><?= $item['title'] ?></a>
+        </li>
+        <?php endforeach ?>
+    </ul>
+  </div>
+</div>
+</nav>