diff --git a/app/acf-util/welcome-html.lsp b/app/acf-util/welcome-html.lsp index 20cb1a9706597ba4e2e4fe981a7dce43dffe30a0..140eb3784756d3c572a1255d2ab91b329aefbbdb 100644 --- a/app/acf-util/welcome-html.lsp +++ b/app/acf-util/welcome-html.lsp @@ -32,12 +32,12 @@ end local minor_distver = string.gsub(string.match(actual_distver, "%p%d+"), "%D", "") -- Parse Minor for Update local patch_distver = string.gsub(string.match(actual_distver, ".[^.]*$"), "%D", "") -- Parse Patch for Fix if major_sysver == major_distver and minor_sysver == minor_distver and patch_sysver == patch_distver then - chkres = "<a class='version-link version-ok' href='https://www.alpinelinux.org/releases/' target='_blank'><span class='version-check-ok'>Alpine Linux <span class='version-letter'>" .. check_sysver .. "</span></span></a> | up to date " + chkres = "<a class='version-link version-ok' href='https://www.alpinelinux.org/releases/' title='🟩 Up to Date' target='_blank'><span class='version-check-ok'>Alpine Linux <span class='version-letter'>" .. check_sysver .. "</span></span></a> | up to date " else - chkres = "<a class='version-link version-update' href='https://www.alpinelinux.org/releases/' target='_blank'><span class='version-check-update'>Alpine Linux <span class='version-letter'>" .. check_sysver .. "</span></span></a> | update needed " + chkres = "<a class='version-link version-update' href='https://www.alpinelinux.org/releases/' title='🟧 Update Needed' target='_blank'><span class='version-check-update'>Alpine Linux <span class='version-letter'>" .. check_sysver .. "</span></span></a> | update needed " end if major_sysver ~= major_distver then - chkres = "<a class='version-link version-upgrade' href='https://www.alpinelinux.org/releases/' target='_blank'><span class='version-check-upgrade'>Alpine Linux <span class='version-letter'>" .. check_sysver .. "</span></span></a> | upgrade required " + chkres = "<a class='version-link version-upgrade' href='https://www.alpinelinux.org/releases/' title='🟥 Upgrade Needed' target='_blank'><span class='version-check-upgrade'>Alpine Linux <span class='version-letter'>" .. check_sysver .. "</span></span></a> | upgrade required " end -- GET DIST VERSION CHANGES @@ -145,14 +145,14 @@ end <span class="data-title">OS : </span> <%= chkres %> <span class="check-version"> - - <a class="version-link version-external-link" href="https://www.alpinelinux.org/posts/<%= check_verchanges %>" target="_blank"> - Last Release : <%= actual_distver %> - </span></a><br> + - + <a class="version-link version-external-link" href="https://www.alpinelinux.org/posts/<%= check_verchanges %>" title="🔗 https://www.alpinelinux.org/posts/<%= check_verchanges %>" target="_blank">Last Release : <%= actual_distver %></a><br> + </span> <span class="data-title">ACF Version : </span><%= sys.value.luaver.value %> <% if sys.value.ACFlightServer.value ~= "" then %> - <span class="data-title"> | Serve by : </span><%= sys.value.ACFlightServer.value %> + <span class="data-title"> | Served by : </span><%= sys.value.ACFlightServer.value %> <% else %> - <span class="data-title"> | Serve by : </span><%= sys.value.ACFminiServer.value %> + <span class="data-title"> | Served by : </span><%= sys.value.ACFminiServer.value %> <% end %> </p> @@ -233,7 +233,7 @@ end </p> <p class="dashboard-infos dash-info-network-wan"> <span class="data-title">Wan IP : </span> - <span class="value-title value-net-wan"></span><%= net.value.wanIP.value %> + <span class="value-title value-net-wan"></span><a href="https://ifconfig.me" target="_blank" title="🔗 https://ifconfig.me"><%= net.value.wanIP.value %><i class="fa-solid fa-up-right-from-square icon-listing"></i></a> </p> <p class="dashboard-infos dash-info-cpu-temp"> <span class="data-title">CPU Temp</span> @@ -322,7 +322,7 @@ end </div> <!-- Dashboard Main Block - MEMORY CHART.JS --> -<script type="application/javascript"> +<script type="application/javascript" defer> $(function memChart() { // Setup Block var memFree = <%= json.encode(sys.value.memory.free) %>; @@ -379,7 +379,7 @@ $(function memChart() { <script type="application/javascript" src="https://cdn.jsdelivr.net/npm/luxon@latest"></script> <script type="application/javascript" src="https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@latest/dist/chartjs-adapter-luxon.umd.min.js"></script> <script type="application/javascript" src="https://cdn.jsdelivr.net/npm/chartjs-plugin-streaming@latest"></script> -<script type="application/javascript"> +<script type="application/javascript" defer> var interval = 1000; var duration = 60000; var lastdata = <%= json.encode(netstats) %>; diff --git a/app/template-html.lsp b/app/template-html.lsp index 08cd0558948354f6919d733f83732ecafe1a0470..645664dc21caa873aa2bdfb6926485396c71060b 100644 --- a/app/template-html.lsp +++ b/app/template-html.lsp @@ -70,7 +70,7 @@ end <link rel="stylesheet" type="text/css" href="<%= html.html_escape(pageinfo.wwwprefix..pageinfo.skin.."/"..posix.basename(pageinfo.skin).."-ie.css") %>"> <![endif]--> <!-- UNPKG JS CDN FOR LATEST CHART.JS --> - <script type="application/javascript" src="https://unpkg.com/chart.js@latest/dist/chart.umd.js" async defer></script> + <script type="application/javascript" src="https://unpkg.com/chart.js@latest/dist/chart.umd.js"></script> <!-- UNPKG JS CDN FOR LATEST HIGHLIGHT.JS --> <script type="application/javascript" src="https://unpkg.com/@highlightjs/cdn-assets@latest/highlight.min.js"></script> <!-- INITIALIZE HIGHLIGHT.JS --> @@ -138,7 +138,7 @@ end local ctlr = pageinfo.script .. "/acf-util/logon/" if session.userinfo and session.userinfo.userid then - print("<a href='javascript:void(0);' class='icon' id='toogle-link' onclick='toogleMenu()'><div id='toogle'><i class='fa-solid fa-bars'></i></div></a>") + print("<a href='javascript:void(0);' class='icon' id='toogle-link' title='Menu' onclick='toogleMenu()'><div id='toogle'><i class='fa-solid fa-bars'></i></div></a>") print("<div id='header-links'><a id='logoff' class='icon-header' title='Logoff' href=\""..html.html_escape(ctlr).."logoff\"><i class='fa-solid fa-user-lock fa-2x logoff-icon'></i></a>") print("<a id='home-link' class='icon-header' title='Home' href="..html.html_escape(pageinfo.wwwprefix).."/".."><i class='fa-solid fa-house fa-2x home-icon'></i></a>") else diff --git a/css/dashboard-pages/welcome.css b/css/dashboard-pages/welcome.css index 2c1467a4535f30e51a401bba6d7d4c8b60e81f00..bb1fc1bef4b95fe453facff74f897340e88786d2 100644 --- a/css/dashboard-pages/welcome.css +++ b/css/dashboard-pages/welcome.css @@ -259,6 +259,10 @@ margin: auto 3rem; } +.dashboard-main.main-block a:hover { + text-decoration: underline !important; +} + /*.data-mem-total { color: #086ea0; } @@ -297,6 +301,7 @@ content: '\F058' !important; display: inline-block; position: relative; + top: 0.025rem; margin: 0 0.25rem 0 0.15rem; color: inherit; font-size: 0.7rem; @@ -313,6 +318,7 @@ content: '\F06A' !important; display: inline-block; position: relative; + top: 0.025rem; margin: 0 0.25rem 0 0.15rem; color: inherit; font-size: 0.7rem; @@ -329,6 +335,7 @@ content: '\F057' !important; display: inline-block; position: relative; + top: 0.025rem; margin: 0 0.25rem 0 0.15rem; color: inherit; font-size: 0.7rem; @@ -360,9 +367,17 @@ content: '\F35D' !important; display: inline-block; position: relative; - margin: 0 0.25rem 0 0.15rem; + top: -0.05rem; + margin: 0 0.25rem 0 0.25rem; color: inherit; + font-size: 0.4rem; +} + +.icon-listing { font-size: 0.45rem; + position: relative; + top: -0.075rem; + left: 0.25rem; } .welcome .data-system-up-time::before {