From 1c63cd674c00a358909b1fa3814ba8041047d5a8 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Sat, 17 Sep 2022 21:05:24 +0700
Subject: [PATCH] no themes

---
 .gitignore                      |  6 +++++-
 system/boot.php                 |  2 --
 system/cache/index.html         |  0
 system/controllers/callback.php | 29 ++++++++++------------------
 system/controllers/prepaid.php  |  2 +-
 system/plugin/index.html        |  0
 ui/ui/admin.tpl                 | 16 ++++++++--------
 ui/ui/invoice-print.tpl         | 10 +++++-----
 ui/ui/login.tpl                 |  9 ++++-----
 ui/ui/page-edit.tpl             |  2 +-
 ui/ui/print-by-date.tpl         |  8 ++++----
 ui/ui/print-by-period.tpl       |  8 ++++----
 ui/ui/print-voucher.tpl         |  4 ++--
 ui/ui/register-otp.tpl          | 17 ++++++++---------
 ui/ui/register-rotp.tpl         | 17 ++++++++---------
 ui/ui/register.tpl              | 17 ++++++++---------
 ui/ui/sections/footer.tpl       | 34 ++++++++++++++++-----------------
 ui/ui/sections/header.tpl       | 26 ++++++++++++-------------
 ui/ui/sections/user-footer.tpl  | 24 +++++++++++------------
 ui/ui/sections/user-header.tpl  | 26 ++++++++++++-------------
 20 files changed, 123 insertions(+), 134 deletions(-)
 create mode 100644 system/cache/index.html
 create mode 100644 system/plugin/index.html

diff --git a/.gitignore b/.gitignore
index f9978048..1025436b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,8 @@ system/config.php
 ui/compiled/*.php
 ui/cache/*.php
 test.php
-pages/
\ No newline at end of file
+pages/
+system/cache/**
+system/plugin/**
+!system/cache/index.html
+!system/plugin/index.html
\ No newline at end of file
diff --git a/system/boot.php b/system/boot.php
index 72fd5d22..7d352b33 100644
--- a/system/boot.php
+++ b/system/boot.php
@@ -72,7 +72,6 @@ function _notify($msg, $type = 'e')
 }
 
 require_once('system/vendors/smarty/libs/Smarty.class.php');
-$_theme = APP_URL . '/ui/ui';
 $lan_file = 'system/lan/' . $config['language'] . '/common.lan.php';
 require($lan_file);
 $ui = new Smarty();
@@ -84,7 +83,6 @@ $ui->assign('app_url', APP_URL);
 $ui->assign('_domain', str_replace('www.', '', parse_url(APP_URL, PHP_URL_HOST)));
 define('U', APP_URL . '/index.php?_route=');
 $ui->assign('_url', APP_URL . '/index.php?_route=');
-$ui->assign('_theme', $_theme);
 $ui->assign('_path', __DIR__);
 $ui->assign('_c', $config);
 $ui->assign('_L', $_L);
diff --git a/system/cache/index.html b/system/cache/index.html
new file mode 100644
index 00000000..e69de29b
diff --git a/system/controllers/callback.php b/system/controllers/callback.php
index 279805b4..e37859ce 100644
--- a/system/controllers/callback.php
+++ b/system/controllers/callback.php
@@ -3,26 +3,17 @@
 /**
  * PHP Mikrotik Billing (https://ibnux.github.io/phpmixbill/)
  **/
-_auth();
-$ui->assign('_system_menu', 'order');
+
 $action = $routes['1'];
-$user = User::_info();
-$ui->assign('_user', $user);
 
 
-require('system/autoload/Paymentgateway.php');
-require('system/autoload/Recharge.php');
+if(file_exists('system/paymentgateway/'.$action.'.php')){
+    include 'system/paymentgateway/'.$action.'.php';
+    if(function_exists($action.'_payment_notification')){
+        call_user_func($action.'_payment_notification');
+        die();
+    }
+}
 
-switch ($action) {
-    case 'xendit':
-        echo "done";
-        break;
-    case 'midtrans':
-        echo "done";
-        break;
-    case 'tripay':
-        echo '{"success": true}';
-        break;
-    default:
-        echo "not found";
-}
\ No newline at end of file
+header('HTTP/1.1 404 Not Found');
+echo 'Not Found';
\ No newline at end of file
diff --git a/system/controllers/prepaid.php b/system/controllers/prepaid.php
index 5b9111d0..b6938971 100644
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@@ -708,7 +708,7 @@ switch ($action) {
         break;
 
     case 'refill':
-        $ui->assign('xfooter', '<script type="text/javascript" src="' . $_theme . '/scripts/form-elements.init.js"></script>');
+        $ui->assign('xfooter', '<script type="text/javascript" src="ui/ui/scripts/form-elements.init.js"></script>');
 
         $c = ORM::for_table('tbl_customers')->find_many();
         $ui->assign('c', $c);
diff --git a/system/plugin/index.html b/system/plugin/index.html
new file mode 100644
index 00000000..e69de29b
diff --git a/ui/ui/admin.tpl b/ui/ui/admin.tpl
index d85d4e82..55880f6d 100644
--- a/ui/ui/admin.tpl
+++ b/ui/ui/admin.tpl
@@ -4,22 +4,22 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<title>{$_title} - {$_L['Login']}</title>
-	<link rel="shortcut icon" href="{$_theme}/images/logo.png" type="image/x-icon" />
+	<link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
 	<!-- Icons -->
-	<link rel="stylesheet" href="{$_theme}/fonts/ionicons/css/ionicons.min.css">
-	<link rel="stylesheet" href="{$_theme}/fonts/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
 
 	<!-- Plugins -->
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/waves.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/perfect-scrollbar.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/waves.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/perfect-scrollbar.css">
 
 	<!-- Css/Less Stylesheets -->
-	<link rel="stylesheet" href="{$_theme}/styles/bootstrap.min.css">
-	<link rel="stylesheet" href="{$_theme}/styles/main.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/main.min.css">
 
 	<!-- Match Media polyfill for IE9 -->
-	<!--[if IE 9]> <script src="{$_theme}/scripts/ie/matchMedia.js"></script>  <![endif]-->
+	<!--[if IE 9]> <script src="ui/ui/scripts/ie/matchMedia.js"></script>  <![endif]-->
 
 </head>
 <body id="app" class="app off-canvas body-full">
diff --git a/ui/ui/invoice-print.tpl b/ui/ui/invoice-print.tpl
index 80c36eb9..c4a2cedf 100644
--- a/ui/ui/invoice-print.tpl
+++ b/ui/ui/invoice-print.tpl
@@ -4,12 +4,12 @@
     <title>{$_title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link href="{$_theme}/styles/bootstrap.min.css" rel="stylesheet">
-    <link rel="shortcut icon" type="image/x-icon" href="{$_theme}/images/favicon.ico">
+    <link href="ui/ui/styles/bootstrap.min.css" rel="stylesheet">
+    <link rel="shortcut icon" type="image/x-icon" href="ui/ui/images/favicon.ico">
 
 	<script type="text/javascript">
 	function printpage() {
-		window.print();  
+		window.print();
 	}
 	</script>
 </head>
@@ -48,8 +48,8 @@
     </div>
 </div>
 
-<script src="{$_theme}/scripts/jquery-1.10.2.js"></script>
-<script src="{$_theme}/scripts/bootstrap.min.js"></script>
+<script src="ui/ui/scripts/jquery-1.10.2.js"></script>
+<script src="ui/ui/scripts/bootstrap.min.js"></script>
 {if isset($xfooter)}
     {$xfooter}
 {/if}
diff --git a/ui/ui/login.tpl b/ui/ui/login.tpl
index a5321dc3..97e42e55 100644
--- a/ui/ui/login.tpl
+++ b/ui/ui/login.tpl
@@ -4,15 +4,14 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<title>{$_title} - {$_L['Login']}</title>
-	<link rel="shortcut icon" href="{$_theme}/images/logo.png" type="image/x-icon" />
+	<link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
 	<!-- Css/Less Stylesheets -->
-	<link rel="stylesheet" href="{$_theme}/styles/bootstrap.min.css">
-	<link rel="stylesheet" href="{$_theme}/styles/main.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/main.min.css">
 
- 	<!-- <link href='http://fonts.googleapis.com/css?family=Roboto:400,500,700,300' rel='stylesheet' type='text/css'> -->
 	<!-- Match Media polyfill for IE9 -->
-	<!--[if IE 9]> <script src="{$_theme}/scripts/ie/matchMedia.js"></script>  <![endif]-->
+	<!--[if IE 9]> <script src="ui/ui/scripts/ie/matchMedia.js"></script>  <![endif]-->
 
 </head>
 <body>
diff --git a/ui/ui/page-edit.tpl b/ui/ui/page-edit.tpl
index 71e76d14..a029eea2 100644
--- a/ui/ui/page-edit.tpl
+++ b/ui/ui/page-edit.tpl
@@ -23,7 +23,7 @@
 <form id="formpages" class="hidden" method="post" role="form" action="{$_url}pages/{$pageHeader}-post" >
     <textarea name="html" id="html"></textarea>
 </form>
-<script src="{$_theme}/scripts/nicEdit.js"></script>
+<script src="ui/ui/scripts/nicEdit.js"></script>
 <script type="text/javascript">
     var myNicEditor
     bkLib.onDomLoaded(function() {
diff --git a/ui/ui/print-by-date.tpl b/ui/ui/print-by-date.tpl
index a9015afb..62f1794c 100644
--- a/ui/ui/print-by-date.tpl
+++ b/ui/ui/print-by-date.tpl
@@ -4,8 +4,8 @@
     <title>{$_title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link href="{$_theme}/styles/bootstrap.min.css" rel="stylesheet">
-    <link rel="shortcut icon" type="image/x-icon" href="{$_theme}/images/favicon.ico">
+    <link href="ui/ui/styles/bootstrap.min.css" rel="stylesheet">
+    <link rel="shortcut icon" type="image/x-icon" href="ui/ui/images/favicon.ico">
 
     <style type="text/css">
         @media print
@@ -55,8 +55,8 @@
         <button type="button" id="actprint" class="btn btn-default btn-sm no-print">{$_L['Click_Here_to_Print']}</button>
     </div>
 </div>
-<script src="{$_theme}/scripts/jquery-1.10.2.js"></script>
-<script src="{$_theme}/scripts/bootstrap.min.js"></script>
+<script src="ui/ui/scripts/jquery-1.10.2.js"></script>
+<script src="ui/ui/scripts/bootstrap.min.js"></script>
 {if isset($xfooter)}
     {$xfooter}
 {/if}
diff --git a/ui/ui/print-by-period.tpl b/ui/ui/print-by-period.tpl
index 45e5a813..9033b00c 100644
--- a/ui/ui/print-by-period.tpl
+++ b/ui/ui/print-by-period.tpl
@@ -4,8 +4,8 @@
     <title>{$_title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link href="{$_theme}/styles/bootstrap.min.css" rel="stylesheet">
-    <link rel="shortcut icon" type="image/x-icon" href="{$_theme}/images/favicon.ico">
+    <link href="ui/ui/styles/bootstrap.min.css" rel="stylesheet">
+    <link rel="shortcut icon" type="image/x-icon" href="ui/ui/images/favicon.ico">
 
     <style type="text/css">
         @media print
@@ -55,8 +55,8 @@
         <button type="button" id="actprint" class="btn btn-default btn-sm no-print">{$_L['Click_Here_to_Print']}</button>
     </div>
 </div>
-<script src="{$_theme}/scripts/jquery-1.10.2.js"></script>
-<script src="{$_theme}/scripts/bootstrap.min.js"></script>
+<script src="ui/ui/scripts/jquery-1.10.2.js"></script>
+<script src="ui/ui/scripts/bootstrap.min.js"></script>
 {if isset($xfooter)}
     {$xfooter}
 {/if}
diff --git a/ui/ui/print-voucher.tpl b/ui/ui/print-voucher.tpl
index cf3d7680..30b6e267 100644
--- a/ui/ui/print-voucher.tpl
+++ b/ui/ui/print-voucher.tpl
@@ -3,7 +3,7 @@
 <head>
     <title>{$_title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="shortcut icon" type="image/x-icon" href="{$_theme}/images/favicon.ico">
+    <link rel="shortcut icon" type="image/x-icon" href="ui/ui/images/favicon.ico">
     <style>
 	.ukuran {
 		size:A4;
@@ -118,7 +118,7 @@
                 {/foreach}
         </div>
 </page>
-<script src="{$_theme}/scripts/jquery-1.10.2.js"></script>
+<script src="ui/ui/scripts/jquery-1.10.2.js"></script>
 {if isset($xfooter)}
     {$xfooter}
 {/if}
diff --git a/ui/ui/register-otp.tpl b/ui/ui/register-otp.tpl
index 1203520b..9af84a3f 100644
--- a/ui/ui/register-otp.tpl
+++ b/ui/ui/register-otp.tpl
@@ -4,23 +4,22 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<title>{$_title} - {$_L['Register']}</title>
-	<link rel="shortcut icon" href="{$_theme}/images/logo.png" type="image/x-icon" />
+	<link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
 	<!-- Icons -->
-	<link rel="stylesheet" href="{$_theme}/fonts/ionicons/css/ionicons.min.css">
-	<link rel="stylesheet" href="{$_theme}/fonts/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
 
 	<!-- Plugins -->
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/waves.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/perfect-scrollbar.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/waves.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/perfect-scrollbar.css">
 
 	<!-- Css/Less Stylesheets -->
-	<link rel="stylesheet" href="{$_theme}/styles/bootstrap.min.css">
-	<link rel="stylesheet" href="{$_theme}/styles/main.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/main.min.css">
 
- 	<!-- <link href='http://fonts.googleapis.com/css?family=Roboto:400,500,700,300' rel='stylesheet' type='text/css'> -->
 	<!-- Match Media polyfill for IE9 -->
-	<!--[if IE 9]> <script src="{$_theme}/scripts/ie/matchMedia.js"></script>  <![endif]-->
+	<!--[if IE 9]> <script src="ui/ui/scripts/ie/matchMedia.js"></script>  <![endif]-->
 
 </head>
 <body id="app" class="app off-canvas body-full">
diff --git a/ui/ui/register-rotp.tpl b/ui/ui/register-rotp.tpl
index 82efa6d6..f56a5365 100644
--- a/ui/ui/register-rotp.tpl
+++ b/ui/ui/register-rotp.tpl
@@ -4,23 +4,22 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<title>{$_title} - {$_L['Register']}</title>
-	<link rel="shortcut icon" href="{$_theme}/images/logo.png" type="image/x-icon" />
+	<link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
 	<!-- Icons -->
-	<link rel="stylesheet" href="{$_theme}/fonts/ionicons/css/ionicons.min.css">
-	<link rel="stylesheet" href="{$_theme}/fonts/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
 
 	<!-- Plugins -->
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/waves.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/perfect-scrollbar.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/waves.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/perfect-scrollbar.css">
 
 	<!-- Css/Less Stylesheets -->
-	<link rel="stylesheet" href="{$_theme}/styles/bootstrap.min.css">
-	<link rel="stylesheet" href="{$_theme}/styles/main.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/main.min.css">
 
- 	<!-- <link href='http://fonts.googleapis.com/css?family=Roboto:400,500,700,300' rel='stylesheet' type='text/css'> -->
 	<!-- Match Media polyfill for IE9 -->
-	<!--[if IE 9]> <script src="{$_theme}/scripts/ie/matchMedia.js"></script>  <![endif]-->
+	<!--[if IE 9]> <script src="ui/ui/scripts/ie/matchMedia.js"></script>  <![endif]-->
 
 </head>
 <body id="app" class="app off-canvas body-full">
diff --git a/ui/ui/register.tpl b/ui/ui/register.tpl
index 7d2fb2c4..03047c75 100644
--- a/ui/ui/register.tpl
+++ b/ui/ui/register.tpl
@@ -4,23 +4,22 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<title>{$_title} - {$_L['Register']}</title>
-	<link rel="shortcut icon" href="{$_theme}/images/logo.png" type="image/x-icon" />
+	<link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
 	<!-- Icons -->
-	<link rel="stylesheet" href="{$_theme}/fonts/ionicons/css/ionicons.min.css">
-	<link rel="stylesheet" href="{$_theme}/fonts/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
 
 	<!-- Plugins -->
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/waves.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/perfect-scrollbar.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/waves.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/perfect-scrollbar.css">
 
 	<!-- Css/Less Stylesheets -->
-	<link rel="stylesheet" href="{$_theme}/styles/bootstrap.min.css">
-	<link rel="stylesheet" href="{$_theme}/styles/main.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/main.min.css">
 
- 	<!-- <link href='http://fonts.googleapis.com/css?family=Roboto:400,500,700,300' rel='stylesheet' type='text/css'> -->
 	<!-- Match Media polyfill for IE9 -->
-	<!--[if IE 9]> <script src="{$_theme}/scripts/ie/matchMedia.js"></script>  <![endif]-->
+	<!--[if IE 9]> <script src="ui/ui/scripts/ie/matchMedia.js"></script>  <![endif]-->
 
 </head>
 <body id="app" class="app off-canvas body-full">
diff --git a/ui/ui/sections/footer.tpl b/ui/ui/sections/footer.tpl
index b1c593dd..83ebdc6a 100644
--- a/ui/ui/sections/footer.tpl
+++ b/ui/ui/sections/footer.tpl
@@ -11,8 +11,8 @@
 						<div class="left small">Fixed Header</div>
 						<div class="md-switch right">
 							<label>
-								<input type="checkbox" id="fixedHeader"> 
-								<span>&nbsp;</span> 
+								<input type="checkbox" id="fixedHeader">
+								<span>&nbsp;</span>
 							</label>
 						</div>
 					</li>
@@ -20,8 +20,8 @@
 						<div class="left small">Nav Full</div>
 						<div class="md-switch right">
 							<label>
-								<input type="checkbox" id="navFull"> 
-								<span>&nbsp;</span> 
+								<input type="checkbox" id="navFull">
+								<span>&nbsp;</span>
 							</label>
 						</div>
 					</li>
@@ -41,23 +41,23 @@
 		</div>
 	</div>
 
-	<script src="{$_theme}/scripts/vendors.js"></script>
-	<script src="{$_theme}/scripts/plugins/screenfull.js"></script>
-	<script src="{$_theme}/scripts/plugins/perfect-scrollbar.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/waves.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/select2.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/bootstrap-colorpicker.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/bootstrap-slider.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/summernote.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/bootstrap-datepicker.min.js"></script>
+	<script src="ui/ui/scripts/vendors.js"></script>
+	<script src="ui/ui/scripts/plugins/screenfull.js"></script>
+	<script src="ui/ui/scripts/plugins/perfect-scrollbar.min.js"></script>
+	<script src="ui/ui/scripts/plugins/waves.min.js"></script>
+	<script src="ui/ui/scripts/plugins/select2.min.js"></script>
+	<script src="ui/ui/scripts/plugins/bootstrap-colorpicker.min.js"></script>
+	<script src="ui/ui/scripts/plugins/bootstrap-slider.min.js"></script>
+	<script src="ui/ui/scripts/plugins/summernote.min.js"></script>
+	<script src="ui/ui/scripts/plugins/bootstrap-datepicker.min.js"></script>
 	<script src="ui/lib/js/bootbox.min.js"></script>
-	<script src="{$_theme}/scripts/app.js"></script>
-	<script src="{$_theme}/scripts/custom.js"></script>
-	<script src="{$_theme}/scripts/form-elements.init.js"></script>
+	<script src="ui/ui/scripts/app.js"></script>
+	<script src="ui/ui/scripts/custom.js"></script>
+	<script src="ui/ui/scripts/form-elements.init.js"></script>
 
 {if isset($xfooter)}
 	{$xfooter}
 {/if}
-		
+
 </body>
 </html>
\ No newline at end of file
diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl
index 10d2eb3a..05b20af1 100644
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@@ -4,28 +4,28 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<title>{$_title}</title>
-	<link rel="shortcut icon" href="{$_theme}/images/logo.png" type="image/x-icon" />
+	<link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
 	<!-- Icons -->
-	<link rel="stylesheet" href="{$_theme}/fonts/ionicons/css/ionicons.min.css">
-	<link rel="stylesheet" href="{$_theme}/fonts/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
 
 	<!-- Plugins -->
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/waves.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/perfect-scrollbar.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/select2.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/bootstrap-colorpicker.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/bootstrap-slider.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/bootstrap-datepicker.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/summernote.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/waves.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/perfect-scrollbar.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/select2.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/bootstrap-colorpicker.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/bootstrap-slider.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/bootstrap-datepicker.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/summernote.css">
 
 	<!-- Css/Less Stylesheets -->
-	<link rel="stylesheet" href="{$_theme}/styles/bootstrap.min.css">
-	<link rel="stylesheet" href="{$_theme}/styles/main.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/main.min.css">
 
 
 	<!-- Match Media polyfill for IE9 -->
-	<!--[if IE 9]> <script src="{$_theme}/scripts/ie/matchMedia.js"></script>  <![endif]-->
+	<!--[if IE 9]> <script src="ui/ui/scripts/ie/matchMedia.js"></script>  <![endif]-->
 {if isset($xheader)}
 	{$xheader}
 {/if}
diff --git a/ui/ui/sections/user-footer.tpl b/ui/ui/sections/user-footer.tpl
index d2b6172c..fbc4b1b9 100644
--- a/ui/ui/sections/user-footer.tpl
+++ b/ui/ui/sections/user-footer.tpl
@@ -41,18 +41,18 @@
 		</div>
 	</div>
 
-	<script src="{$_theme}/scripts/vendors.js"></script>
-	<script src="{$_theme}/scripts/plugins/screenfull.js"></script>
-	<script src="{$_theme}/scripts/plugins/perfect-scrollbar.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/waves.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/select2.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/bootstrap-colorpicker.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/bootstrap-slider.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/summernote.min.js"></script>
-	<script src="{$_theme}/scripts/plugins/bootstrap-datepicker.min.js"></script>
-	<script src="{$_theme}/scripts/app.js"></script>
-	<script src="{$_theme}/scripts/custom.js"></script>
-	<script src="{$_theme}/scripts/form-elements.init.js"></script>
+	<script src="ui/ui/scripts/vendors.js"></script>
+	<script src="ui/ui/scripts/plugins/screenfull.js"></script>
+	<script src="ui/ui/scripts/plugins/perfect-scrollbar.min.js"></script>
+	<script src="ui/ui/scripts/plugins/waves.min.js"></script>
+	<script src="ui/ui/scripts/plugins/select2.min.js"></script>
+	<script src="ui/ui/scripts/plugins/bootstrap-colorpicker.min.js"></script>
+	<script src="ui/ui/scripts/plugins/bootstrap-slider.min.js"></script>
+	<script src="ui/ui/scripts/plugins/summernote.min.js"></script>
+	<script src="ui/ui/scripts/plugins/bootstrap-datepicker.min.js"></script>
+	<script src="ui/ui/scripts/app.js"></script>
+	<script src="ui/ui/scripts/custom.js"></script>
+	<script src="ui/ui/scripts/form-elements.init.js"></script>
 
 	<script src="ui/lib/js/bootbox.min.js"></script>
 
diff --git a/ui/ui/sections/user-header.tpl b/ui/ui/sections/user-header.tpl
index 64c38ffb..3008a892 100644
--- a/ui/ui/sections/user-header.tpl
+++ b/ui/ui/sections/user-header.tpl
@@ -4,28 +4,28 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<title>{$_title}</title>
-	<link rel="shortcut icon" href="{$_theme}/images/logo.png" type="image/x-icon" />
+	<link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
 
 	<!-- Icons -->
-	<link rel="stylesheet" href="{$_theme}/fonts/ionicons/css/ionicons.min.css">
-	<link rel="stylesheet" href="{$_theme}/fonts/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
+	<link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
 
 	<!-- Plugins -->
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/waves.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/perfect-scrollbar.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/select2.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/bootstrap-colorpicker.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/bootstrap-slider.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/bootstrap-datepicker.css">
-	<link rel="stylesheet" href="{$_theme}/styles/plugins/summernote.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/waves.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/perfect-scrollbar.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/select2.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/bootstrap-colorpicker.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/bootstrap-slider.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/bootstrap-datepicker.css">
+	<link rel="stylesheet" href="ui/ui/styles/plugins/summernote.css">
 
 	<!-- Css/Less Stylesheets -->
-	<link rel="stylesheet" href="{$_theme}/styles/bootstrap.min.css">
-	<link rel="stylesheet" href="{$_theme}/styles/main.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+	<link rel="stylesheet" href="ui/ui/styles/main.min.css">
 
 
 	<!-- Match Media polyfill for IE9 -->
-	<!--[if IE 9]> <script src="{$_theme}/scripts/ie/matchMedia.js"></script>  <![endif]-->
+	<!--[if IE 9]> <script src="ui/ui/scripts/ie/matchMedia.js"></script>  <![endif]-->
 {if isset($xheader)}
 	{$xheader}
 {/if}