frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with upstream master

Browse Source
This commit is contained in:
billz
2021-06-05 12:02:26 +01:00
parent 083e19d631 57f3512b79
commit 06476b9a61
22 changed files with 428 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/css/custom.php
View File

@@ -16,6 +16,11 @@ body {
color: #212529;
}
.h-underlined {
border-bottom: 1px solid #e3e6f0;
padding-bottom: 0.3rem;
}
.page-header {
margin: 20px 0 20px;
}
@@ -32,7 +37,6 @@ body {
.row { margin-left: 0rem; margin-right: 0rem; }
.col-lg-12 { padding-right: 0.25rem; padding-left: 0.25rem; }
.form-group.col-md-6 { margin-left: -0.5rem; }
.js-wifi-stations { margin-left: -0.5rem; margin-right: -0.5rem; }
h4.mt-3 { margin-left: 0.5rem; }
}
@@ -141,6 +145,7 @@ i.fa.fa-bars:hover{
.service-status {
border-width: 0;
align-items: center;
}
.service-status-up {
@@ -190,8 +195,12 @@ pre.unstyled {
width: 100%;
}
.js-reload-wifi-stations {
min-width: 10rem;
@media (min-width: 576px) {
.card-grid {
display: grid;
grid-template-columns: minmax(0, 1fr) 50%;
grid-gap: 1rem;
}
}
.sidebar.toggled .nav-item .nav-link span {

16
app/css/hackernews.css
View File

@@ -8,7 +8,6 @@ License: GNU General Public License v3.0
html * {
font-family: Verdana, Geneva, sans-serif;
font-size: 0.9rem;
color: #828282;
}
@@ -34,6 +33,11 @@ h5.card-title {
color: #212529;
}
.h-underlined {
border-bottom: 1px solid #e3e6f0;
padding-bottom: 0.3rem;
}
.card, .modal-dialog {
border-radius: 1px;
border-color: #ff6600;
@@ -115,7 +119,6 @@ ul.nav-tabs, .nav-tabs .nav-link {
.row { margin-left: 0rem; margin-right: 0rem; }
.col-lg-12 { padding-right: 0.25rem; padding-left: 0.25rem; }
.form-group.col-md-6 { margin-left: -0.5rem; }
.js-wifi-stations { margin-left: -0.5rem; margin-right: -0.5rem; }
h4.mt-3 { margin-left: 0.5rem; }
}
@@ -180,6 +183,7 @@ ul.nav-tabs, .nav-tabs .nav-link {
.service-status {
border-width: 0;
align-items: center;
}
.service-status-up {
@@ -231,8 +235,12 @@ pre.unstyled {
width: 100%;
}
.js-reload-wifi-stations {
min-width: 10rem;
@media (min-width: 576px) {
.card-grid {
display: grid;
grid-template-columns: minmax(0, 1fr) 50%;
grid-gap: 1rem;
}
}
.sidebar.toggled .nav-item .nav-link {

29
app/css/lightsout.css
View File

@@ -23,6 +23,11 @@ h5.card-title {
font-size: 1.2rem;
}
.h-underlined {
border-bottom: 1px solid #e3e6f0;
padding-bottom: 0.3rem;
}
.page-header {
padding: 0 20px;
border-left: .01rem solid #d2d2d2;
@@ -53,7 +58,6 @@ h5.card-title {
.row { margin-left: 0rem; margin-right: 0rem; }
.col-lg-12 { padding-right: 0.25rem; padding-left: 0.25rem; }
.form-group.col-md-6 { margin-left: -0.5rem; }
.js-wifi-stations { margin-left: -0.5rem; margin-right: -0.5rem; }
h4.mt-3 { margin-left: 0.5rem; }
}
@@ -374,15 +378,18 @@ tspan, rect {
fill: #d2d2d2;
}
small {
font-size: 80%;
font-weight: 400;
text-muted {
font-size: 0.8rem;
}
.fas.fa-circle {
font-size: 0.5rem;
}
.service-status {
align-items: center;
}
.service-status-up {
color: #a1ec38 !important;
}
@@ -416,6 +423,20 @@ pre {
margin-bottom: 0.5em;
}
.loading-spinner {
background: url("../../app/img/loading-spinner.gif") no-repeat scroll center center transparent;
min-height: 150px;
width: 100%;
}
@media (min-width: 576px) {
.card-grid {
display: grid;
grid-template-columns: minmax(0, 1fr) 50%;
grid-gap: 1rem;
}
}
.toggle-off.btn {
padding-left: 1.2rem;
font-size: 0.9rem!important;

2
app/img/wifi-qr-code.php
View File

@@ -28,7 +28,7 @@ $ssid = qr_encode($ssid);
$password = qr_encode($password);
$data = "WIFI:S:$ssid;T:$type;P:$password;$hidden;";
$command = "qrencode -t svg -m 0 -o - " . mb_escapeshellarg($data);
$command = "qrencode -t svg -m 1 -o - " . mb_escapeshellarg($data);
$svg = shell_exec($command);
$config_mtime = filemtime(RASPI_HOSTAPD_CONFIG);

4
app/js/custom.js
View File

@@ -202,8 +202,8 @@ Populates the DHCP server form fields
Option toggles are set dynamically depending on the loaded configuration
*/
function loadInterfaceDHCPSelect() {
var iface = $('#cbxdhcpiface').val();
$.get('ajax/networking/get_netcfg.php?iface='+iface,function(data){
var strInterface = $('#cbxdhcpiface').val();
$.get('ajax/networking/get_netcfg.php?iface='+strInterface,function(data){
jsonData = JSON.parse(data);
$('#dhcp-iface')[0].checked = jsonData.DHCPEnabled;
$('#txtipaddress').val(jsonData.StaticIP);