Work in progress

This commit is contained in:
billz 2019-10-13 00:25:35 +01:00
parent a8e3687bdd
commit 7712d9f4be
1 changed files with 156 additions and 140 deletions

296
index.php
View File

@ -93,7 +93,7 @@ $theme_url = 'app/css/'.htmlspecialchars($theme, ENT_QUOTES);
<![endif]--> <![endif]-->
</head> </head>
<body id="page-top"> <body id="page-top">
<!-- Page Wrapper -->
<div id="wrapper"> <div id="wrapper">
<!-- Sidebar --> <!-- Sidebar -->
<ul class="navbar-nav bg-gray-100 sidebar sidebar-light accordion" id="accordionSidebar"> <ul class="navbar-nav bg-gray-100 sidebar sidebar-light accordion" id="accordionSidebar">
@ -107,142 +107,158 @@ $theme_url = 'app/css/'.htmlspecialchars($theme, ENT_QUOTES);
<!-- Divider --> <!-- Divider -->
<hr class="sidebar-divider my-0"> <hr class="sidebar-divider my-0">
<!-- Nav Item - Dashboard --> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=wlan0_info"><i class="fas fa-tachometer-alt fa-fw"></i> <?php echo _("Dashboard"); ?></a>
<a class="nav-link" href="index.php?page=wlan0_info"><i class="fas fa-tachometer-alt fa-fw"></i> <?php echo _("Dashboard"); ?></a> </li>
</li> <?php if (RASPI_WIFICLIENT_ENABLED) : ?>
<?php if (RASPI_WIFICLIENT_ENABLED) : ?> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=wpa_conf"><i class="fas fa-wifi fa-fw"></i> <?php echo _("Configure WiFi client"); ?></a>
<a class="nav-link" href="index.php?page=wpa_conf"><i class="fas fa-wifi fa-fw"></i> <?php echo _("Configure WiFi client"); ?></a> </li>
</li> <?php endif; ?>
<?php endif; ?> <?php if (RASPI_HOTSPOT_ENABLED) : ?>
<?php if (RASPI_HOTSPOT_ENABLED) : ?> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=hostapd_conf"><i class="far fa-dot-circle fa-fw"></i> <?php echo _("Configure hotspot"); ?></a>
<a class="nav-link" href="index.php?page=hostapd_conf"><i class="far fa-dot-circle fa-fw"></i> <?php echo _("Configure hotspot"); ?></a> </li>
</li> <?php endif; ?>
<?php endif; ?> <?php if (RASPI_NETWORK_ENABLED) : ?>
<?php if (RASPI_NETWORK_ENABLED) : ?> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=network_conf"><i class="fas fa-sitemap fa-fw"></i> <?php echo _("Configure networking"); ?></a>
<a class="nav-link" href="index.php?page=network_conf"><i class="fas fa-sitemap fa-fw"></i> <?php echo _("Configure networking"); ?></a> </li>
</li> <?php endif; ?>
<?php endif; ?> <?php if (RASPI_DHCP_ENABLED) : ?>
<?php if (RASPI_DHCP_ENABLED) : ?> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=dhcpd_conf"><i class="fas fa-exchange-alt fa-fw"></i> <?php echo _("Configure DHCP Server"); ?></a>
<a class="nav-link" href="index.php?page=dhcpd_conf"><i class="fas fa-exchange-alt fa-fw"></i> <?php echo _("Configure DHCP Server"); ?></a> </li>
</li> <?php endif; ?>
<?php endif; ?> <?php if (RASPI_OPENVPN_ENABLED) : ?>
<?php if (RASPI_OPENVPN_ENABLED) : ?> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=openvpn_conf"><i class="fas fa-lock fa-fw"></i> <?php echo _("Configure OpenVPN"); ?></a>
<a class="nav-link" href="index.php?page=openvpn_conf"><i class="fas fa-lock fa-fw"></i> <?php echo _("Configure OpenVPN"); ?></a> </li>
</li> <?php endif; ?>
<?php endif; ?> <?php if (RASPI_TORPROXY_ENABLED) : ?>
<?php if (RASPI_TORPROXY_ENABLED) : ?> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=torproxy_conf"><i class="fas fa-eye-slash fa-fw"></i> <?php echo _("Configure TOR proxy"); ?></a>
<a class="nav-link" href="index.php?page=torproxy_conf"><i class="fas fa-eye-slash fa-fw"></i> <?php echo _("Configure TOR proxy"); ?></a> </li>
</li> <?php endif; ?>
<?php endif; ?> <?php if (RASPI_CONFAUTH_ENABLED) : ?>
<?php if (RASPI_CONFAUTH_ENABLED) : ?> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=auth_conf"><i class="fas fa-lock fa-fw"></i> <?php echo _("Configure Auth"); ?></a>
<a class="nav-link" href="index.php?page=auth_conf"><i class="fas fa-lock fa-fw"></i> <?php echo _("Configure Auth"); ?></a> </li>
</li> <?php endif; ?>
<?php endif; ?> <?php if (RASPI_CHANGETHEME_ENABLED) : ?>
<?php if (RASPI_CHANGETHEME_ENABLED) : ?> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=theme_conf"><i class="fas fa-paint-brush fa-fw"></i> <?php echo _("Change Theme"); ?></a>
<a class="nav-link" href="index.php?page=theme_conf"><i class="fas fa-paint-brush fa-fw"></i> <?php echo _("Change Theme"); ?></a> </li>
</li> <?php endif; ?>
<?php endif; ?> <?php if (RASPI_VNSTAT_ENABLED) : ?>
<?php if (RASPI_VNSTAT_ENABLED) : ?> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=data_use"><i class="fas fa-chart-bar fa-fw"></i> <?php echo _("Data usage"); ?></a>
<a class="nav-link" href="index.php?page=data_use"><i class="fas fa-chart-bar fa-fw"></i> <?php echo _("Data usage"); ?></a> </li>
</li> <?php endif; ?>
<?php endif; ?> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=system_info"><i class="fas fa-cube fa-fw"></i> <?php echo _("System"); ?></a>
<a class="nav-link" href="index.php?page=system_info"><i class="fas fa-cube fa-fw"></i> <?php echo _("System"); ?></a> </li>
</li> <li class="nav-item">
<li class="nav-item"> <a class="nav-link" href="index.php?page=about"><i class="fas fa-info-circle fa-fw"></i> <?php echo _("About RaspAP"); ?></a>
<a class="nav-link" href="index.php?page=about"><i class="fas fa-info-circle fa-fw"></i> <?php echo _("About RaspAP"); ?></a> </li>
</li> <hr class="sidebar-divider d-none d-md-block">
<hr class="sidebar-divider d-none d-md-block"> <!-- Sidebar Toggler (Sidebar) -->
<!-- Sidebar Toggler (Sidebar) --> <div class="text-center d-none d-md-inline">
<div class="text-center d-none d-md-inline"> <button class="rounded-circle border-0" id="sidebarToggle"></button>
<button class="rounded-circle border-0" id="sidebarToggle"></button>
</div>
</ul>
<!-- End of Sidebar -->
<!-- Begin Page Content -->
<div class="container-fluid">
<!-- Content Row
<div class="row">
<div class="col-sm-12">
<h2 class="page-header">
<img class="logo" src="app/img/raspAP-logo.png" width="45" height="45">RaspAP
</h2>
</div>
</div>< /.row -->
<!-- Page Heading -->
<div class="d-sm-flex align-items-center justify-content-between mb-4">
<!-- todo -->
</div> </div>
</ul>
<!-- End of Sidebar -->
<?php <!-- Begin Page Content -->
$extraFooterScripts = array(); <div id="content-wrapper" class="d-flex flex-column">
// handle page actions <!-- Main Content -->
switch ($page) { <div id="content">
case "wlan0_info": <!-- Topbar -->
DisplayDashboard(); <nav class="navbar navbar-expand navbar-light bg-gray-100 topbar mb-4 static-top">
break; <!-- Sidebar Toggle (Topbar) -->
case "dhcpd_conf": <button id="sidebarToggleTop" class="btn btn-link d-md-none rounded-circle mr-3">
DisplayDHCPConfig(); <i class="fa fa-bars"></i>
break; </button>
case "wpa_conf": <!-- Topbar Navbar -->
DisplayWPAConfig(); </nav>
break; <!-- End of Topbar -->
case "network_conf": <!-- Begin Page Content -->
DisplayNetworkingConfig(); <div class="container-fluid">
break;
case "hostapd_conf": <?php
DisplayHostAPDConfig(); $extraFooterScripts = array();
break; // handle page actions
case "openvpn_conf": switch ($page) {
DisplayOpenVPNConfig(); case "wlan0_info":
break; DisplayDashboard();
case "torproxy_conf": break;
DisplayTorProxyConfig(); case "dhcpd_conf":
break; DisplayDHCPConfig();
case "auth_conf": break;
DisplayAuthConfig($config['admin_user'], $config['admin_pass']); case "wpa_conf":
break; DisplayWPAConfig();
case "save_hostapd_conf": break;
SaveTORAndVPNConfig(); case "network_conf":
break; DisplayNetworkingConfig();
case "theme_conf": break;
DisplayThemeConfig(); case "hostapd_conf":
break; DisplayHostAPDConfig();
case "data_use": break;
DisplayDataUsage($extraFooterScripts); case "openvpn_conf":
break; DisplayOpenVPNConfig();
case "system_info": break;
DisplaySystem(); case "torproxy_conf":
break; DisplayTorProxyConfig();
case "about": break;
DisplayAbout(); case "auth_conf":
break; DisplayAuthConfig($config['admin_user'], $config['admin_pass']);
default: break;
DisplayDashboard(); case "save_hostapd_conf":
} SaveTORAndVPNConfig();
break;
case "theme_conf":
DisplayThemeConfig();
break;
case "data_use":
DisplayDataUsage($extraFooterScripts);
break;
case "system_info":
DisplaySystem();
break;
case "about":
DisplayAbout();
break;
default:
DisplayDashboard();
}
?> ?>
</div><!-- /#page-wrapper --> </div><!-- /.container-fluid -->
</div><!-- /#wrapper --> </div><!-- End of Main Content -->
<!-- Footer -->
<footer class="sticky-footer bg-grey-100">
<div class="container my-auto">
<div class="copyright text-center my-auto">
<span></span>
</div>
</div>
</footer>
<!-- End Footer -->
</div><!-- End of Content Wrapper -->
</div><!-- End of Page Wrapper -->
<!-- Scroll to Top Button-->
<a class="scroll-to-top rounded" href="#page-top" style="display: inline;">
<i class="fas fa-angle-up"></i>
</a>
<!-- jQuery --> <!-- jQuery -->
<script src="dist/jquery/jquery.min.js"></script> <script src="dist/jquery/jquery.min.js"></script>
<!-- Bootstrap Core JavaScript --> <!-- Bootstrap Core JavaScript -->
<script src="dist/bootstrap/js/bootstrap.min.js"></script> <script src="dist/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Core plugin JavaScript -->
<script src="dist/jquery-easing/jquery.easing.min.js"></script>
<!-- Bootstrap Toggle JavaScript --> <!-- Bootstrap Toggle JavaScript -->
<script src="dist/bootstrap-toggle/js/bootstrap-toggle.min.js"></script> <script src="dist/bootstrap-toggle/js/bootstrap-toggle.min.js"></script>
@ -256,18 +272,18 @@ $theme_url = 'app/css/'.htmlspecialchars($theme, ENT_QUOTES);
<!-- Custom RaspAP JS --> <!-- Custom RaspAP JS -->
<script src="app/js/custom.js"></script> <script src="app/js/custom.js"></script>
<?php <?php
// Load non default JS/ECMAScript in footer. // Load non default JS/ECMAScript in footer.
foreach ($extraFooterScripts as $script) { foreach ($extraFooterScripts as $script) {
echo ' <script type="text/javascript" src="' , $script['src'] , '"'; echo ' <script type="text/javascript" src="' , $script['src'] , '"';
if ($script['defer']) { if ($script['defer']) {
echo ' defer="defer"'; echo ' defer="defer"';
} }
// if ($script['async']) { echo ( echo ' defer="async"'; ), intrigity=, nonce= etc. etc. // if ($script['async']) { echo ( echo ' defer="async"'; ), intrigity=, nonce= etc. etc.
echo '></script>' , PHP_EOL; echo '></script>' , PHP_EOL;
} }
?> ?>
</body> </body>
</html> </html>