Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
trinity
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tony Bonnin
trinity
Commits
7a382148
Verified
Commit
7a382148
authored
6 months ago
by
Tony Bonnin
Browse files
Options
Downloads
Patches
Plain Diff
HSTS Ready for Nginx
parent
74e8e423
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/acf-util/welcome-html.lsp
+2
-2
2 additions, 2 deletions
app/acf-util/welcome-html.lsp
app/alpine-baselayout/health-networkstats-html.lsp
+9
-9
9 additions, 9 deletions
app/alpine-baselayout/health-networkstats-html.lsp
app/template-html.lsp
+9
-9
9 additions, 9 deletions
app/template-html.lsp
with
20 additions
and
20 deletions
app/acf-util/welcome-html.lsp
+
2
−
2
View file @
7a382148
...
...
@@ -177,7 +177,7 @@
<span class="data-title">Uptime</span>
<span id="uptime" class="uptime">
<%= uptime %><br>
<script type="application/javascript">
<script
nonce="NONCE_PLACEHOLDER"
type="application/javascript">
// IMPORT UPTIME FOR JS LIVE TIMER
if (location.href.includes("welcome/read")) {
let increment = "<%= up_time or 'unknown' %>";
...
...
@@ -217,7 +217,7 @@
print ("<span class='nan'>N/A<span>")
end
%>
<script type="application/javascript" defer>
<script
nonce="NONCE_PLACEHOLDER"
type="application/javascript" defer>
// CONVERT TEMP TO FAHRENHEIT
if (((<%= tonumber(api.value.cpuTemp.value) %>) < 50000) && (window.localStorage.getItem('toggle-degree') === 'fahrenheit')) {
document.getElementById("cpuTemp").innerHTML = ((Math.ceil(((<%= tonumber(api.value.boardTemp.value) %>) / 1000) * 9 / 5) + 32) + " °F | <span class='normal'>" + (Math.floor(((<%= tonumber(api.value.cpuTemp.value) %>) / 1000) * 9 / 5) + 32)) + " °F</span>";
...
...
This diff is collapsed.
Click to expand it.
app/alpine-baselayout/health-networkstats-html.lsp
+
9
−
9
View file @
7a382148
...
...
@@ -37,26 +37,26 @@
width: auto;
}
</style>
<!--[if IE]><script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/excanvas.js"></script><![endif]-->
<script type="text/javascript">
<!--[if IE]><script
nonce="NONCE_PLACEHOLDER"
type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/excanvas.js"></script><![endif]-->
<script
nonce="NONCE_PLACEHOLDER"
type="text/javascript">
if (typeof jQuery == 'undefined') {
document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>');
document.write('<script
nonce="NONCE_PLACEHOLDER"
type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>');
}
</script>
<script type="text/javascript">
<script
nonce="NONCE_PLACEHOLDER"
type="text/javascript">
if (typeof $.plot == 'undefined') {
document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.flot.js"><\/script>');
document.write('<script
nonce="NONCE_PLACEHOLDER"
type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.flot.js"><\/script>');
}
</script>
<script type="text/javascript">
<script
nonce="NONCE_PLACEHOLDER"
type="text/javascript">
if (typeof $.plot.formatDate == 'undefined') {
document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.flot.time.js"><\/script>');
document.write('<script
nonce="NONCE_PLACEHOLDER"
type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.flot.time.js"><\/script>');
}
</script>
<script type="text/javascript">
<script
nonce="NONCE_PLACEHOLDER"
type="text/javascript">
var interval = 1000;
var duration = 60000;
var lastdata = <%= json.encode(view) %>;
...
...
@@ -124,7 +124,7 @@
val.data = [];
});
Update();
ID = window.setInterval(
"
Update
()"
, interval);
ID = window.setInterval(Update, interval);
$("#Start").attr("disabled","disabled");
$("#Stop").removeAttr("disabled");
}
...
...
This diff is collapsed.
Click to expand it.
app/template-html.lsp
+
9
−
9
View file @
7a382148
...
...
@@ -64,20 +64,20 @@ 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://cdn.jsdelivr.net/npm/chart.js/dist/chart.umd.min.js"
></script>
<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
nonce=
"NONCE_PLACEHOLDER"
type=
"application/javascript"
src=
"https://cdn.jsdelivr.net/npm/chart.js/dist/chart.umd.min.js"
></script>
<script
nonce=
"NONCE_PLACEHOLDER"
type=
"application/javascript"
src=
"https://cdn.jsdelivr.net/npm/luxon@latest"
></script>
<script
nonce=
"NONCE_PLACEHOLDER"
type=
"application/javascript"
src=
"https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@latest/dist/chartjs-adapter-luxon.umd.min.js"
></script>
<script
nonce=
"NONCE_PLACEHOLDER"
type=
"application/javascript"
src=
"https://cdn.jsdelivr.net/npm/chartjs-plugin-streaming@latest"
></script>
<!-- UNPKG JS CDN FOR LATEST HIGHLIGHT.JS -->
<script
type=
"application/javascript"
src=
"https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@latest/build/highlight.min.js"
></script>
<script
nonce=
"NONCE_PLACEHOLDER"
type=
"application/javascript"
src=
"https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@latest/build/highlight.min.js"
></script>
<!-- INITIALIZE HIGHLIGHT.JS -->
<script
defer
type=
"application/javascript"
>
hljs
.
highlightAll
()
</script>
<script
nonce=
"NONCE_PLACEHOLDER"
defer
type=
"application/javascript"
>
hljs
.
highlightAll
()
</script>
<!-- UNPKG JS CDN FOR LATEST JQUERY -->
<script
type=
"application/javascript"
src=
"https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"
></script>
<script
nonce=
"NONCE_PLACEHOLDER"
type=
"application/javascript"
src=
"https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"
></script>
<!-- GLOBAL FUNCTIONS -->
<script
defer
type=
"application/javascript"
src=
"<%= html.html_escape(pageinfo.wwwprefix..pageinfo.skin.."
/"..
posix.basename
(
pageinfo.skin
)..".
js
")
%
>
"
>
</script>
<script
nonce=
"NONCE_PLACEHOLDER"
defer
type=
"application/javascript"
src=
"<%= html.html_escape(pageinfo.wwwprefix..pageinfo.skin.."
/"..
posix.basename
(
pageinfo.skin
)..".
js
")
%
>
"
>
</script>
<!-- HIDE LOGGON PAGE FOR AUTH USERS -->
<script
type=
"application/javascript"
>
let
user
=
"
<%= session.userinfo %>
"
;
if
((
user
!==
"
nil
"
)
&&
(
window
.
location
.
href
.
indexOf
(
"
logon/logon
"
)
>
-
1
))
{
window
.
location
.
href
=
'
//
'
+
window
.
location
.
hostname
+
'
/cgi-bin/acf/acf-util/welcome/read
'
}
</script>
<script
nonce=
"NONCE_PLACEHOLDER"
type=
"application/javascript"
>
let
user
=
"
<%= session.userinfo %>
"
;
if
((
user
!==
"
nil
"
)
&&
(
window
.
location
.
href
.
indexOf
(
"
logon/logon
"
)
>
-
1
))
{
window
.
location
.
href
=
'
//
'
+
window
.
location
.
hostname
+
'
/cgi-bin/acf/acf-util/welcome/read
'
}
</script>
</head>
<
%
end
--
pageinfo.skinned
%
>
<
%
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment