Merge billz/raspap-webgui master

2025-03-01 10:31:47 +00:00 · 2020-08-22 14:43:26 +01:00
parent 0fa59b3272 44e9ae75ae
commit 5be1ad5844
61 changed files with 2918 additions and 1936 deletions
--- a/app/css/custom.php
+++ b/app/css/custom.php
@@ -1,3 +1,9 @@
+<?php header("Content-Type: text/css; charset=utf-8"); ?>
+<?php
+require_once '../../includes/functions.php';
+$color = getColorOpt();
+?>
+
 /*
 Theme Name: RaspAP default
 Author: @billz
@@ -51,9 +57,15 @@ body {
 }

 .card .card-header {
-  border-color: #d8224c;
-  background-color: #d8224c;
+  border-color: <?php echo $color; ?>;
  color: #fff;
+  background-color: <?php echo $color; ?>;
+}
+
+.btn-primary {
+  color: <?php echo $color; ?>;
+  border-color: <?php echo $color; ?>;
+  background-color: #fff;
 }

 .card-footer {
@@ -86,9 +98,7 @@ a.nav-link.active {
 }

 .btn-primary {
-  color: #d8224c;
  background-color: #fff;
-  border-color: #d8224c;
 }

 .btn-warning {
@@ -96,8 +106,8 @@ a.nav-link.active {
 }

 .btn-primary:hover {
-  background-color: #c61931;
-  border-color: #c61931;
+  background-color: <?php echo $color; ?>;
+  border-color: <?php echo $color; ?>;
 }

 i.fa.fa-bars {
@@ -123,21 +133,6 @@ i.fa.fa-bars:hover{
  float: left;
 }

-.webconsole {
-  width:100%;
-  height:100%;
-  border:1px solid;
-}
-
-#console {
-  height:500px;
-}
-
-.systemtabcontent {
-  height:100%;
-  min-height:500px;
-}
-
 .service-status {
  border-width: 0;
 }
@@ -232,10 +227,18 @@ canvas#divDBChartBandwidthhourly {

 .check-updated {
  opacity: 0;
-  color: #1cc88a;
+  color: #90ee90;
 }

 .check-progress {
  color: #999;
 }

+.fa-check {
+  color: #90ee90;
+}
+
+.fa-times {
+  color: #ff4500;
+}
+
--- a/app/css/hackernews.css
+++ b/app/css/hackernews.css
@@ -271,3 +271,11 @@ canvas#divDBChartBandwidthhourly {
  color: #999;
 }

+.fa-check {
+  color: #90ee90;
+}
+
+.fa-times {
+  color: #ff4500;
+}
+
--- a/app/css/lightsout.css
+++ b/app/css/lightsout.css
@@ -166,6 +166,10 @@ hr {
  font-family: inherit;
 }

+.ra-raspap:before {
+  color: #ac1b3d !important;
+}
+
 .sidebar-light #sidebarToggle {
  background-color: #202020;
  border: 1px solid #afafaf !important
@@ -353,16 +357,6 @@ color: #d2d2d2 !important
  border-color: #404040;
 }

-.webconsole {
-  width: 100%;
-  height: 20rem;
-  border: 1px solid #404040;
-}
-
-#console {
-  height: 500px;
-}
-
 tspan, rect {
  fill: #d2d2d2;
 }
@@ -452,3 +446,11 @@ canvas#divDBChartBandwidthhourly {
  color: #999;
 }

+.fa-check {
+  color: #90ee90;
+}
+
+.fa-times {
+  color: #ff4500;
+}
+
--- a/app/img/raspAP-logo.php
+++ b/app/img/raspAP-logo.php
@@ -1,3 +1,8 @@
+<?php header("Content-Type: image/svg+xml; charset=utf-8"); ?>
+<?php
+require_once '../../includes/functions.php';
+$color = getColorOpt();
+?>
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -27,20 +32,20 @@
           transform="translate(192.6768,123.4365)"
           id="g20"><path
             id="path22"
-             style="fill:#d8224c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             style="fill:<?php echo $color; ?>;fill-opacity:1;fill-rule:nonzero;stroke:none"
             d="m 0,0 c 0,-37.169 -30.128,-67.3 -67.296,-67.3 -37.167,0 -67.294,30.131 -67.294,67.3 0,37.165 30.127,67.296 67.294,67.296 C -30.128,67.296 0,37.165 0,0" /></g><g
           transform="translate(125.3823,219.0791)"
           id="g24"><path
             id="path26"
-             style="fill:#d8224c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             style="fill:<?php echo $color; ?>;fill-opacity:1;fill-rule:nonzero;stroke:none"
             d="m 0,0 c -52.737,0 -95.641,-42.905 -95.641,-95.643 0,-52.74 42.904,-95.647 95.641,-95.647 52.737,0 95.642,42.907 95.642,95.647 C 95.642,-42.905 52.737,0 0,0 m 0,-217.29 c -67.073,0 -121.641,54.571 -121.641,121.647 C -121.641,-28.569 -67.073,26 0,26 67.074,26 121.642,-28.569 121.642,-95.643 121.642,-162.719 67.074,-217.29 0,-217.29" /></g><g
           transform="translate(144.4277,271.9385)"
           id="g28"><path
             id="path30"
-             style="fill:#d8224c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             style="fill:<?php echo $color; ?>;fill-opacity:1;fill-rule:nonzero;stroke:none"
             d="m 0,0 c 66.188,0 121.118,-49.055 130.392,-112.714 l 28.259,-1.874 C 150.044,-34.655 82.181,27.791 0,27.791 c -3.892,0 -7.75,-0.147 -11.571,-0.423 L -9.73,-0.397 C -6.513,-0.161 -3.275,0 0,0" /></g><g
           transform="translate(144.4883,334.7588)"
           id="g32"><path
             id="path34"
-             style="fill:#d8224c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             d="m 0,0 c 101.94,0 185.667,-79.438 192.56,-179.664 l 27.962,-1.857 C 214.513,-65.087 117.899,27.791 0,27.791 c -5.31,0 -10.576,-0.2 -15.792,-0.571 l 1.84,-27.728 C -9.343,-0.177 -4.691,0 0,0" /></g></g></g></g></svg>
+             style="fill:<?php echo $color; ?>;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 101.94,0 185.667,-79.438 192.56,-179.664 l 27.962,-1.857 C 214.513,-65.087 117.899,27.791 0,27.791 c -5.31,0 -10.576,-0.2 -15.792,-0.571 l 1.84,-27.728 C -9.343,-0.177 -4.691,0 0,0" /></g></g></g></g></svg>
--- a/app/img/wifi-qr-code.php
+++ b/app/img/wifi-qr-code.php
@@ -4,6 +4,12 @@ require_once '../../includes/config.php';
 require_once '../../includes/defaults.php';
 require_once '../../includes/functions.php';

+// prevent direct file access
+if (!isset($_SERVER['HTTP_REFERER'])) {
+    header('HTTP/1.0 403 Forbidden');
+    exit;
+}
+
 function qr_encode($str)
 {
    return preg_replace('/(?<!\\\)([\":;,])/', '\\\\\1', $str);
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -375,8 +375,9 @@ function getCookie(cname) {
    return (value != null) ? unescape(value[1]) : null;
 }

+// Define themes
 var themes = {
-    "default": "custom.css",
+    "default": "custom.php",
    "hackernews" : "hackernews.css",
    "lightsout" : "lightsout.css",
 }
--- a/app/js/huebee.js
+++ b/app/js/huebee.js
@@ -0,0 +1,22 @@
+// Initialize Huebee color picker
+var elem = document.querySelector('.color-input');
+var hueb = new Huebee( elem, {
+    notation: 'hex',
+    saturations: 2,
+    customColors: [ '#d8224c', '#dd4814', '#ea0', '#19f', '#333' ],
+    className: 'light-picker',
+    hue0: 210
+});
+
+// Set custom color if defined
+var color = getCookie('color');
+if (color == null || color == '') {
+    color = '#d8224c';
+}
+hueb.setColor(color);
+
+// Change event
+hueb.on( 'change', function( color, hue, sat, lum ) {
+    setCookie('color',color,90);
+})
+