From 7b4af63a90a726b98a59b83e53f040a7a566a11d Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 10 Nov 2021 17:53:13 +0100 Subject: Update --- .../cms-special/admin-v2/$resources/admin.js | 16 ------- .../cms-special/admin-v2/$resources/common.css | 11 ++--- .../cms-special/admin-v2/$resources/header.php | 0 .../cms-special/admin-v2/$resources/index-auto.css | 0 .../cms-special/admin-v2/$resources/index-dark.css | 0 .../cms-special/admin-v2/$resources/index.css | 0 .../admin-v2/$resources/postcontent.php | 2 +- .../cms-special/admin-v2/$resources/precontent.php | 56 +++++++++++++--------- .../cms-special/admin-v2/$resources/responsive.css | 0 .../cms-special/admin-v2/$resources/session.php | 11 +++++ .../admin-v2/$resources/spotlight-test.php | 2 +- .../cms-special/admin-v2/$resources/spotlight.php | 2 +- 12 files changed, 51 insertions(+), 49 deletions(-) mode change 100755 => 100644 Neutron-trunk/cms-special/admin-v2/$resources/admin.js mode change 100755 => 100644 Neutron-trunk/cms-special/admin-v2/$resources/common.css mode change 100755 => 100644 Neutron-trunk/cms-special/admin-v2/$resources/header.php mode change 100755 => 100644 Neutron-trunk/cms-special/admin-v2/$resources/index-auto.css mode change 100755 => 100644 Neutron-trunk/cms-special/admin-v2/$resources/index-dark.css mode change 100755 => 100644 Neutron-trunk/cms-special/admin-v2/$resources/index.css mode change 100755 => 100644 Neutron-trunk/cms-special/admin-v2/$resources/postcontent.php mode change 100755 => 100644 Neutron-trunk/cms-special/admin-v2/$resources/precontent.php mode change 100755 => 100644 Neutron-trunk/cms-special/admin-v2/$resources/responsive.css create mode 100644 Neutron-trunk/cms-special/admin-v2/$resources/session.php mode change 100755 => 100644 Neutron-trunk/cms-special/admin-v2/$resources/spotlight-test.php mode change 100755 => 100644 Neutron-trunk/cms-special/admin-v2/$resources/spotlight.php (limited to 'Neutron-trunk/cms-special/admin-v2/$resources') diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/admin.js b/Neutron-trunk/cms-special/admin-v2/$resources/admin.js old mode 100755 new mode 100644 index bca683b..e69de29 --- a/Neutron-trunk/cms-special/admin-v2/$resources/admin.js +++ b/Neutron-trunk/cms-special/admin-v2/$resources/admin.js @@ -1,16 +0,0 @@ -window.onscroll = () => { - // console.log("> Scroll"); - if (window.scrollY >= 52 && !document.getElementById('portal-background').classList.contains('scrolled')) { - // console.log("> ADD"); - document.getElementById('portal-background').classList.add('scrolled'); - } else if (window.scrollY < 52 && document.getElementById('portal-background').classList.contains('scrolled')) { - // console.log("> REMOVE"); - document.getElementById('portal-background').classList.remove('scrolled'); - } else { - // console.log("> Nothing"); - } -} - -window.onbeforeunload = () => { - window.parent.$("#loader").fadeIn(200); -} \ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/common.css b/Neutron-trunk/cms-special/admin-v2/$resources/common.css old mode 100755 new mode 100644 index 3826747..1276d2f --- a/Neutron-trunk/cms-special/admin-v2/$resources/common.css +++ b/Neutron-trunk/cms-special/admin-v2/$resources/common.css @@ -47,15 +47,15 @@ html, body { .ttdemo { padding: 10px; - font-family: "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif !important; + font-family: "Noto Sans", "Segoe UI", "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif !important; } * { - font-family: "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif; + font-family: "Noto Sans", "Segoe UI", "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif; } span, p, body, div, h1, h2, h3, h4, h5, h6 { - font-family: "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif !important; + font-family: "Noto Sans", "Segoe UI", "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif !important; } #main-content { @@ -69,15 +69,10 @@ span, p, body, div, h1, h2, h3, h4, h5, h6 { overflow-y: auto; } -html, body, #app-grid { - height: 100%; -} - #app-frame { margin: -16px; border: none; width: calc(100% + 32px); - height: calc(100% + 32px); } .mdc-top-app-bar--fixed-adjust { diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/header.php b/Neutron-trunk/cms-special/admin-v2/$resources/header.php old mode 100755 new mode 100644 diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/index-auto.css b/Neutron-trunk/cms-special/admin-v2/$resources/index-auto.css old mode 100755 new mode 100644 diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/index-dark.css b/Neutron-trunk/cms-special/admin-v2/$resources/index-dark.css old mode 100755 new mode 100644 diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/index.css b/Neutron-trunk/cms-special/admin-v2/$resources/index.css old mode 100755 new mode 100644 diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/postcontent.php b/Neutron-trunk/cms-special/admin-v2/$resources/postcontent.php old mode 100755 new mode 100644 index 573a1d9..cface57 --- a/Neutron-trunk/cms-special/admin-v2/$resources/postcontent.php +++ b/Neutron-trunk/cms-special/admin-v2/$resources/postcontent.php @@ -3,4 +3,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/precontent.php b/Neutron-trunk/cms-special/admin-v2/$resources/precontent.php old mode 100755 new mode 100644 index af8d999..9b7e60c --- a/Neutron-trunk/cms-special/admin-v2/$resources/precontent.php +++ b/Neutron-trunk/cms-special/admin-v2/$resources/precontent.php @@ -47,19 +47,19 @@ if (isset($lang["admin-titles"][$pageid])) { $invalid = false; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(""); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(""); } } else { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(""); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(""); } if (isset($_POST['password'])) { if (password_verify($_POST['password'], file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/password"))) { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(""); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(""); return; } else { $invalid = true; @@ -112,7 +112,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso ?> - + @@ -127,19 +127,19 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso /resources/css/ui.css"> /resources/css/codename.css"> /resources/image/siteicon.png"> - + /resources/css/fonts-import.css" as="style"> /resources/css/alerts.css" as="style"> /resources/css/admin.css" as="style"> /resources/css/ui.css" as="style"> - /cms-special/admin/$resources/common.css" as="style"> - /cms-special/admin/$resources/index.css" as="style"> - /cms-special/admin/$resources/responsive.css" as="style"> - /cms-special/admin/$resources/index-dark.css" as="style"> + /cms-special/admin-v2/$resources/common.css" as="style"> + /cms-special/admin-v2/$resources/index.css" as="style"> + /cms-special/admin-v2/$resources/responsive.css" as="style"> + /cms-special/admin-v2/$resources/index-dark.css" as="style"> - /cms-special/admin/$resources/admin.js" as="script"> + /cms-special/admin-v2/$resources/admin.js" as="script"> '); - } elseif (file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme") == "auto") { - echo(''); + /*if (file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme") == "dark") {*/ + echo(''); + /*} elseif (file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme") == "auto") { + echo(''); } else { - echo(''); - } + echo(''); + }*/ ?> /resources/lib/pushbar.js/library.css"> + + /resources/css/admin_v2/chromium.css"> + + <?php @@ -199,8 +211,8 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso ?> </head> -<body id="settings" style="overflow-x:hidden;"> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/spotlight.php"; ?> +<body id="settings" style="background-color:transparent !important;overflow-x:hidden;"> + <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/spotlight.php"; ?> <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/documentbody.php"; @@ -209,15 +221,15 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso $name = $pageConfig['headerName']; ?> - <div id="admin"> + <div id="admin" style="background-color:transparent !important;"> <?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/updates")) { - echo("<div id=\"updates-available\">" . $lang["admin-home"]["updates"][0] . " — <a href=\"/cms-special/admin/updates\">" . $lang["admin-home"]["updates"][1] . "</a></div>"); + echo("<div id=\"updates-available\">" . $lang["admin-home"]["updates"][0] . " — <a href=\"/cms-special/admin-v2/updates\">" . $lang["admin-home"]["updates"][1] . "</a></div>"); $updatable = true; } else { $updatable = false; } ?> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/header.php"; ?> \ No newline at end of file + <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/header.php"; ?> \ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/responsive.css b/Neutron-trunk/cms-special/admin-v2/$resources/responsive.css old mode 100755 new mode 100644 diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/session.php b/Neutron-trunk/cms-special/admin-v2/$resources/session.php new file mode 100644 index 0000000..ae480ba --- /dev/null +++ b/Neutron-trunk/cms-special/admin-v2/$resources/session.php @@ -0,0 +1,11 @@ +<?php + +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { + + } else { + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin-v2/login'</script>"); + } +} else { + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin-v2/login'</script>"); +} \ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/spotlight-test.php b/Neutron-trunk/cms-special/admin-v2/$resources/spotlight-test.php old mode 100755 new mode 100644 index bffaa87..625f734 --- a/Neutron-trunk/cms-special/admin-v2/$resources/spotlight-test.php +++ b/Neutron-trunk/cms-special/admin-v2/$resources/spotlight-test.php @@ -9,6 +9,6 @@ <link rel="stylesheet" href="/resources/lib/material/iconfont.css"> </head> <body> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/spotlight.php"; ?> + <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/spotlight.php"; ?> </body> </html> \ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/spotlight.php b/Neutron-trunk/cms-special/admin-v2/$resources/spotlight.php old mode 100755 new mode 100644 index f803f52..2a09ed3 --- a/Neutron-trunk/cms-special/admin-v2/$resources/spotlight.php +++ b/Neutron-trunk/cms-special/admin-v2/$resources/spotlight.php @@ -4,7 +4,7 @@ <?php -$data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/home/all/db.json")); +$data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/home/all/db.json")); ?> <ul class="spotlight-elements"> -- cgit