From 6e786e41c247276c6d30aa14774a6c8e3ea38b03 Mon Sep 17 00:00:00 2001
From: Lawrence <sirlagz@gmail.com>
Date: Sun, 29 Oct 2017 12:31:51 +0800
Subject: [PATCH] Updating index to create new menu, custom.js with new code,
 moved config parameters from index.php to its own file

---
 includes/config.php | 23 +++++++++++++++++++++++
 index.php           |  9 +++++++--
 js/custom.js        |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 includes/config.php

diff --git a/includes/config.php b/includes/config.php
new file mode 100644
index 00000000..58033aa4
--- /dev/null
+++ b/includes/config.php
@@ -0,0 +1,23 @@
+<?php
+
+define('RASPI_CONFIG', '/etc/raspap');
+define('RASPI_CONFIG_NETWORKING',RASPI_CONFIG.'/networking');
+define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth');
+
+// Constants for configuration file paths.
+// These are typical for default RPi installs. Modify if needed.
+define('RASPI_DNSMASQ_CONFIG', '/etc/dnsmasq.conf');
+define('RASPI_DNSMASQ_LEASES', '/var/lib/misc/dnsmasq.leases');
+define('RASPI_HOSTAPD_CONFIG', '/etc/hostapd/hostapd.conf');
+define('RASPI_WPA_SUPPLICANT_CONFIG', '/etc/wpa_supplicant/wpa_supplicant.conf');
+define('RASPI_HOSTAPD_CTRL_INTERFACE', '/var/run/hostapd');
+define('RASPI_WPA_CTRL_INTERFACE', '/var/run/wpa_supplicant');
+define('RASPI_OPENVPN_CLIENT_CONFIG', '/etc/openvpn/client.conf');
+define('RASPI_OPENVPN_SERVER_CONFIG', '/etc/openvpn/server.conf');
+define('RASPI_TORPROXY_CONFIG', '/etc/tor/torrc');
+
+// Optional services, set to true to enable.
+define('RASPI_OPENVPN_ENABLED', false );
+define('RASPI_TORPROXY_ENABLED', false );
+
+?>
diff --git a/index.php b/index.php
index 4a2f3119..26aad6a0 100755
--- a/index.php
+++ b/index.php
@@ -121,8 +121,13 @@ $theme_url = 'dist/css/' . $theme;
               <li>
                 <a href="index.php?page=hostapd_conf"><i class="fa fa-dot-circle-o fa-fw"></i> Configure Hotspot</a>
               </li>
-              <li>
-                <a href="index.php?page=network_conf"><i class="fa fa-sitemap fa-fw"></i> Configure Networking</a>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Networking <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                    <li>
+                        <a href="index.php?page=network_conf"><i class="fa fa-sitemap fa-fw"></i> Configure Networking</a>
+                    </li>
+                </ul>
               </li>
               <li>
                 <a href="index.php?page=dhcpd_conf"><i class="fa fa-exchange fa-fw"></i> Configure DHCP Server</a>
diff --git a/js/custom.js b/js/custom.js
index 8f8b61a6..f4b8f9db 100644
--- a/js/custom.js
+++ b/js/custom.js
@@ -49,7 +49,7 @@ function loadCurrentSettings(strInterface) {
                 //console.log(i2+":"+v2);
                 switch(i2) {
                     case "static":
-                        if(v2 == 1) {
+                        if(v2 == 'true') {
                             $('#'+int+'-static').click();
                         }
                     break;