mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 15:33:12 +09:00
Refactor EJS string gluing code
Rewrite awful string gluing of HTML with JS to use the slightly less awful EJS string gluing method.
This commit is contained in:
1 parent
706a1dbd39
commit
6726c2b16f
2 files changed
+59
-70
No files matched your search
+16
-19
@@ -10,27 +10,24 @@
|
||||
</div>
|
||||
<div class="nav-item mr-1">
|
||||
<a class="nav-link align-middle" href="/nodes">Slaves</a>
|
||||
</div>
|
||||
<%# Very ugly ejs code to hide the Players button if the playerManager plugin isn`t installed %>
|
||||
<%
|
||||
let sidebarPluginButtonsHtml = "";
|
||||
for(let o in locals.masterPlugins){
|
||||
</div><%
|
||||
for(let o in locals.masterPlugins) {
|
||||
let plug = locals.masterPlugins[o];
|
||||
if(plug.main
|
||||
&& plug.main.ui
|
||||
&& typeof plug.main.ui.sidebar == "object"
|
||||
&& Array.isArray(plug.main.ui.sidebar)){
|
||||
let sidebarEntries = plug.main.ui.sidebar;
|
||||
for(let i in sidebarEntries){
|
||||
let button = sidebarEntries[i];
|
||||
if(button.getHtml && typeof button.getHtml == "function"){
|
||||
sidebarPluginButtonsHtml += button.getHtml();
|
||||
if (
|
||||
plug.main
|
||||
&& plug.main.ui
|
||||
&& typeof plug.main.ui.sidebar == "object"
|
||||
&& Array.isArray(plug.main.ui.sidebar)
|
||||
) {
|
||||
let sidebarEntries = plug.main.ui.sidebar;
|
||||
for (let i in sidebarEntries) {
|
||||
let button = sidebarEntries[i];
|
||||
if (button.getHtml && typeof button.getHtml == "function") { %>
|
||||
<%- button.getHtml() %><%
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
%>
|
||||
<%- sidebarPluginButtonsHtml %>
|
||||
} %>
|
||||
<div class="nav-item">
|
||||
<a class="nav-link align-middle" href="/settings">Settings</a>
|
||||
</div>
|
||||
|
||||
+43
-51
@@ -7,56 +7,48 @@
|
||||
<body>
|
||||
<%- include("nav") %>
|
||||
<div id="body" class="container">
|
||||
<div class="page-header mt-2 row" id="banner">
|
||||
<div class="col-lg-8 col-md-7 col-sm-6">
|
||||
<h2>Connected Nodes</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div id="display">
|
||||
<%
|
||||
let html = ""
|
||||
for(let [id, slave] of locals.slaves){
|
||||
html += `
|
||||
<div id="${id}" class="slaveBox card mb-3">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title"><a href='nodeDetails?instanceID=${id}'>
|
||||
${slave.instanceName}
|
||||
</a></h5>
|
||||
</div>
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item">ID: ${id}</li>
|
||||
<li class="list-group-item">Last seen: ${moment(Number(slave.time)).format("DD.MM.YY, hh:mm")}</li>
|
||||
<li class="list-group-item">Online players: ${slave.playerCount}</li>
|
||||
<li class="list-group-item">IP: ${slave.publicIP}:${slave.serverPort}</li>
|
||||
<li class="list-group-item">Host: ${slave.mac}</li>
|
||||
</ul>
|
||||
`
|
||||
for(let o in locals.masterPlugins){
|
||||
let plug = locals.masterPlugins[o];
|
||||
if(plug.main
|
||||
&& plug.main.ui
|
||||
&& typeof plug.main.ui.slaveListing == "object"
|
||||
&& Array.isArray(plug.main.ui.slaveListing)){
|
||||
let slaveListingEntries = plug.main.ui.slaveListing;
|
||||
for(let i in slaveListingEntries){
|
||||
let button = slaveListingEntries[i];
|
||||
if(button.getHtml && typeof button.getHtml == "function"){
|
||||
html += "<div class=\"plugin-link\">"
|
||||
html += button.getHtml({slave});
|
||||
html += "</div>"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
html += `
|
||||
</div>
|
||||
`
|
||||
}
|
||||
%>
|
||||
<%- html %>
|
||||
<div class="page-header mt-2 row" id="banner">
|
||||
<div class="col-lg-8 col-md-7 col-sm-6">
|
||||
<h2>Connected Nodes</h2>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$('.plugin-link a').addClass('btn btn-primary')
|
||||
</script>
|
||||
</div>
|
||||
<div id="display"><%
|
||||
for (let [id, slave] of locals.slaves) { %>
|
||||
<div id="<%= id %>" class="slaveBox card mb-3">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title"><a href='nodeDetails?instanceID=<%=id%>'>
|
||||
<%= slave.instanceName %>
|
||||
</a></h5>
|
||||
</div>
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item">ID: <%= id %></li>
|
||||
<li class="list-group-item">Last seen: <%= moment(Number(slave.time)).format("DD.MM.YY, hh:mm") %></li>
|
||||
<li class="list-group-item">Online players: <%= slave.playerCount %></li>
|
||||
<li class="list-group-item">IP: <%= slave.publicIP %>:<%= slave.serverPort %></li>
|
||||
<li class="list-group-item">Host: <%= slave.mac %></li>
|
||||
</ul><%
|
||||
for (let o in locals.masterPlugins) {
|
||||
let plug = locals.masterPlugins[o];
|
||||
if (
|
||||
plug.main
|
||||
&& plug.main.ui
|
||||
&& typeof plug.main.ui.slaveListing == "object"
|
||||
&& Array.isArray(plug.main.ui.slaveListing)
|
||||
) {
|
||||
let slaveListingEntries = plug.main.ui.slaveListing;
|
||||
for (let i in slaveListingEntries) {
|
||||
let button = slaveListingEntries[i];
|
||||
if (button.getHtml && typeof button.getHtml == "function") { %>
|
||||
<div class="plugin-link"><%- button.getHtml({slave}) %></div><%
|
||||
}
|
||||
}
|
||||
}
|
||||
} %>
|
||||
</div><%
|
||||
} %>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$('.plugin-link a').addClass('btn btn-primary')
|
||||
</script>
|
||||
</body>
|
||||
Reference in new issue
Block a user