mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2025-10-26 11:27:04 +00:00
Resolve merge conflicts with upstream/master
- Integrate annotation handlers with latest handlebars changes - Maintain both upstream updates and annotation functionality
This commit is contained in:
maxwell
commit
dc951b698c
0
public/scripts/custom.js
Normal file
0
public/scripts/custom.js
Normal file
File diff suppressed because it is too large
Load Diff
@ -12,6 +12,7 @@
|
||||
<link rel="apple-touch-icon" href="/favicon-303x303.png" />
|
||||
<script type="text/javascript" src="scripts/common-0.0.1{{min}}.js"></script>
|
||||
<script type="text/javascript" src="scripts/qrcode.min.js"></script>
|
||||
<script type="text/javascript" src="scripts/custom.js"></script>
|
||||
<title>Agent Installation</title>
|
||||
<style>
|
||||
.tab {
|
||||
@ -316,13 +317,14 @@
|
||||
}
|
||||
|
||||
function addAgentToMeshClick() {
|
||||
if (installFlags != 0) { Q('aginsType').value = installFlags; }
|
||||
var v = Q('aginsSelect').value;
|
||||
QV('agins_linux_un', v == 4);
|
||||
QV('agins_linux_inst', v == 5);
|
||||
QV('aginsSysTypeDiv', v == 5);
|
||||
Q('aginsbinlnk').onclick = function() { downloadFile((Q('aginsbinlnk').name.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'') + '&meshinstall=' + Q('aginsSysType').value); };
|
||||
Q('aginsbincmd').value = (Q('aginsbincmd').value.split('&installflags=')[0]) + '&installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'') + '&meshinstall=' + Q('aginsSysType').value + '\"';
|
||||
QV('aginsTypeDiv', (v == 0) || (v == 5));
|
||||
QV('aginsTypeDiv', (installFlags != 0) ? false : ((v == 0) || (v == 5)));
|
||||
QV('asinsTypeDiv', (v == 7));
|
||||
}
|
||||
|
||||
|
||||
@ -51,6 +51,7 @@
|
||||
<script keeplink=1 type="text/javascript" src="scripts/ol3-contextmenu{{{min}}}.js"></script>
|
||||
<script keeplink=1 type="text/javascript" src="scripts/purify{{{min}}}.js"></script>
|
||||
<script keeplink=1 type="text/javascript" src="scripts/marked{{{min}}}.js"></script>
|
||||
<script type="text/javascript" src="scripts/custom.js"></script>
|
||||
<script src="scripts/annotation-ui.js"></script>
|
||||
<title>{{{title}}}</title>
|
||||
</head>
|
||||
|
||||
@ -60,6 +60,7 @@
|
||||
<script keeplink=1 type="text/javascript" src="scripts/ol3-contextmenu{{{min}}}.js"></script>
|
||||
<script keeplink=1 type="text/javascript" src="scripts/purify{{{min}}}.js"></script>
|
||||
<script keeplink=1 type="text/javascript" src="scripts/marked{{{min}}}.js"></script>
|
||||
<script type="text/javascript" src="scripts/custom.js"></script>
|
||||
<script src="scripts/annotation-ui.js"></script>
|
||||
<title>{{{title}}}</title>
|
||||
</head>
|
||||
@ -1470,13 +1471,11 @@
|
||||
</div>
|
||||
</div>
|
||||
<div id=p19 style="display:none">
|
||||
<div id="p19title">
|
||||
<div id="p19BackButton" style="float:left">
|
||||
<div class="backButton" tabindex=0 onclick=goBack() title="Back" onkeypress="if (event.key == 'Enter') goBack()">
|
||||
<div class="backButtonEx"></div>
|
||||
</div>
|
||||
<div id="p19title" class="d-flex align-items-center">
|
||||
<div id="p19BackButton" class="pe-2">
|
||||
<i class="fa-solid fa-square-caret-left fa-2xl" role="button" tabindex=0 onclick=goBack() title="Back" onkeypress="if (event.key == 'Enter') goBack()"></i>
|
||||
</div>
|
||||
<h1>Plugins - <span id=p19deviceName></span></h1>
|
||||
<div class='fs-4 fw-bold'>Plugins - <span id=p19deviceName></span></div>
|
||||
</div>
|
||||
<div id="p19headers"></div>
|
||||
<div id=p19pages></div>
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
<link type="text/css" href="styles/custom.css" media="screen" rel="stylesheet" title="CSS" />
|
||||
<link rel="apple-touch-icon" href="/favicon-303x303.png" />
|
||||
<script type="text/javascript" src="scripts/common-0.0.1{{min}}.js"></script>
|
||||
<script type="text/javascript" src="scripts/custom.js"></script>
|
||||
<title>Agent Installation</title>
|
||||
<style>
|
||||
.tab {
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
<link rel="apple-touch-icon" href="/favicon-303x303.png" />
|
||||
<script type="text/javascript" src="scripts/common-0.0.1{{min}}.js"></script>
|
||||
<script keeplink=1 type="text/javascript" src="scripts/u2f-api{{min}}.js"></script>
|
||||
<script type="text/javascript" src="scripts/custom.js"></script>
|
||||
<title>{{{title}}} - Login</title>
|
||||
<style>
|
||||
#body {
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
<link type="text/css" href="styles/custom.css" media="screen" rel="stylesheet" title="CSS" />
|
||||
<link rel="apple-touch-icon" href="/favicon-303x303.png" />
|
||||
<script type="text/javascript" src="scripts/common-0.0.1{{min}}.js"></script>
|
||||
<script type="text/javascript" src="scripts/custom.js"></script>
|
||||
<title id="topTitle">{{{title1}}}</title>
|
||||
<style>
|
||||
body {
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
<link rel="apple-touch-icon" href="/favicon-303x303.png" />
|
||||
<script type="text/javascript" src="scripts/common-0.0.1{{min}}.js"></script>
|
||||
<script type="text/javascript" src="scripts/filesaver.min.js"></script>
|
||||
<script type="text/javascript" src="scripts/custom.js"></script>
|
||||
</head>
|
||||
<body style="font-family:Arial,Helvetica,sans-serif">
|
||||
<div id="xtop" style="position:absolute;left:0;right:0;top:0;height:38px;background-color:#036;color:#EEE;box-shadow:3px 3px 10px gray">
|
||||
|
||||
@ -23,6 +23,7 @@
|
||||
<script type="text/javascript" src="scripts/xterm-addon-fit-min.js"></script>
|
||||
<script keeplink=1 type="text/javascript" src="scripts/webm-writer.js"></script>
|
||||
<script keeplink=1 type="text/javascript" src="scripts/filesaver.min.js"></script>
|
||||
<script type="text/javascript" src="scripts/custom.js"></script>
|
||||
</head>
|
||||
<body style="overflow:hidden;background-color:black">
|
||||
<div id=p11 class="noselect" style="overflow:hidden">
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
<script type="text/javascript" src="scripts/xterm{{{min}}}.js"></script>
|
||||
<script type="text/javascript" src="scripts/xterm-addon-fit{{{min}}}.js"></script>
|
||||
<script keeplink=1 type="text/javascript" src="scripts/filesaver.min.js"></script>
|
||||
<script type="text/javascript" src="scripts/custom.js"></script>
|
||||
<title>{{{title}}}</title>
|
||||
</head>
|
||||
<body style="overflow:hidden;background-color:black">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user