gCubeSystem
/
cdn-experiments
15
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'ccp-features' of https://code-repo.d4science.org/gCubeSystem/cdn-experiments into ccp-features

This commit is contained in:
dcore94 2023-06-23 14:44:50 +02:00
parent de41d0e459 e0273618e5
commit 4947791006
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccp/js/executionhistorycontroller.js
View File

@ -38,7 +38,6 @@ class CCPExecutionHistory extends HTMLElement {
this.#rootdoc.innerHTML = ` this.#rootdoc.innerHTML = `
<link rel="stylesheet" href="https://cdn.dev.d4science.org/ccp/css/common.css"></link> <link rel="stylesheet" href="https://cdn.dev.d4science.org/ccp/css/common.css"></link>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<script src="https://cdn.dev.d4science.org/ccp-dev/js/logterminalcontroller.js"></script>
<style> <style>
.lxd{ .lxd{
background-color: #dd4814; background-color: #dd4814;
@ -115,7 +114,9 @@ class CCPExecutionHistory extends HTMLElement {
<span style="text-overflow:ellipsis" class="badge badge-light text-info border border-info" name="infrastructure" alt="Infrastructure" title="Infrastructure"></span> <span style="text-overflow:ellipsis" class="badge badge-light text-info border border-info" name="infrastructure" alt="Infrastructure" title="Infrastructure"></span>
<span class="badge" name="runtime" alt="Runtime" title="Runtime"></span> <span class="badge" name="runtime" alt="Runtime" title="Runtime"></span>
</div> </div>
<div style="margin:5px 0 5px 0">
<d4s-ccp-logterminal maxlines="10"></d4s-ccp-logterminal> <d4s-ccp-logterminal maxlines="10"></d4s-ccp-logterminal>
</div>
<ul> <ul>
<li></li> <li></li>
</ul> </ul>

6
ccp/js/logterminalcontroller.js
View File

@ -15,6 +15,10 @@ class LogTerminal extends HTMLElement {
} }
get lines(){
return this.#lines
}
render(){ render(){
this.#rootdoc.innerHTML = ` this.#rootdoc.innerHTML = `
<link href="https://fonts.googleapis.com/css2?family=VT323&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css2?family=VT323&display=swap" rel="stylesheet">
@ -63,7 +67,7 @@ class LogTerminal extends HTMLElement {
in : ()=>this, in : ()=>this,
recurse : { recurse : {
target : "div.line", target : "div.line",
in: d=>d.#lines, in: d=>d.lines,
apply: (e,d,i)=>{ apply: (e,d,i)=>{
if(d.source === "stderr") e.classList.add("error"); if(d.source === "stderr") e.classList.add("error");
e.innerHTML = `<span>${d.line}</span>` e.innerHTML = `<span>${d.line}</span>`