From 7dfc89489b1842b78225d9396e0040a6d01ac3f0 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Sun, 22 Apr 2018 15:40:51 +0300
Subject: [PATCH] Admin: theme fixes

---
 site/plugins/admin/views/partials/navigation.php | 2 +-
 site/plugins/admin/views/partials/tail.php       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/plugins/admin/views/partials/navigation.php b/site/plugins/admin/views/partials/navigation.php
index 22924a19..07bba6e9 100755
--- a/site/plugins/admin/views/partials/navigation.php
+++ b/site/plugins/admin/views/partials/navigation.php
@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-lg navbar-light bg-white border-bottom box-shadow">
 <div class="container">
-  <a class="navbar-brand" href="<?php echo Flextype\Component\Http\Http::getBaseUrl(); ?>"><?php echo Flextype\Config::get('site.title'); ?></a>
+  <a class="navbar-brand" href="<?php echo Flextype\Component\Http\Http::getBaseUrl(); ?>/admin"><?php echo Flextype\Config::get('site.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>
diff --git a/site/plugins/admin/views/partials/tail.php b/site/plugins/admin/views/partials/tail.php
index e3e18ced..5370ece3 100755
--- a/site/plugins/admin/views/partials/tail.php
+++ b/site/plugins/admin/views/partials/tail.php
@@ -1,5 +1,5 @@
-<script src="<?php echo Flextype\Component\Http\Http::getBaseUrl(); ?>/site/themes/<?php echo Flextype\Config::get('site.theme'); ?>/node_modules/jquery/dist/jquery.slim.min.js"></script>
-<script src="<?php echo Flextype\Component\Http\Http::getBaseUrl(); ?>/site/themes/<?php echo Flextype\Config::get('site.theme'); ?>/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="<?php echo Flextype\Component\Http\Http::getBaseUrl(); ?>/site/plugins/admin/node_modules/jquery/dist/jquery.slim.min.js"></script>
+<script src="<?php echo Flextype\Component\Http\Http::getBaseUrl(); ?>/site/plugins/admin/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
 <script src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>
 <script src="<?php echo Flextype\Component\Http\Http::getBaseUrl(); ?>/site/plugins/admin/node_modules/codemirror/lib/codemirror.js"></script>