diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml index 23450fd..58007d3 100644 --- a/k8s/deployment.yaml +++ b/k8s/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: cloud-dashboard - image: naeel/cloud-dashboard:v9.10 + image: naeel/cloud-dashboard:v9.11 imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/static/index.html b/static/index.html index 3155b2a..8cb8e55 100644 --- a/static/index.html +++ b/static/index.html @@ -81,6 +81,12 @@ .tab { padding: 7px 14px; font-size: 13px; cursor: pointer; border-bottom: 2px solid transparent; color: #8b949e; } .tab.active { color: #58a6ff; border-bottom-color: #58a6ff; } .panel { display: none; } + .panel-params { background: #0d1117; } + .panel-history { background: #0b0f1a; } + .panel-deps { background: #0f1107; } + body.light .panel-params { background: #f8fafc; } + body.light .panel-history { background: #f0f4ff; } + body.light .panel-deps { background: #f0fff4; } .panel.active { display: block; } .inst-graph { height: 420px; border: 1px solid #30363d; border-radius: 8px; background: #0b0f14; } .graph-hint { color: #8b949e; font-size: 12px; margin-bottom: 8px; } @@ -454,11 +460,9 @@ function humanAge(dtStr){ var days = Math.floor(hrs / 24); var months = Math.floor(days / 30); var years = Math.floor(days / 365); - if(years >= 1) return years + "г " + (months % 12) + "м"; - if(months >= 1) return months + "м " + (days % 30) + "д"; - if(days >= 1) return days + "д"; - if(hrs >= 1) return hrs + "ч"; - return mins + "мин"; + if(days >= 1) return days + " д"; + if(hrs >= 1) return hrs + " ч"; + return mins + " мин"; } function graphElements(data, focusUid, laneById){ @@ -563,12 +567,15 @@ function drawGraph(containerId, data, focusUid, forceShowAux){ { selector: "edge", style: { "line-color": "data(color)", "target-arrow-shape": "none", + "source-arrow-shape": "none", + "mid-target-arrow-shape": "none", + "mid-source-arrow-shape": "none", "curve-style": "taxi", "taxi-direction": "auto", "taxi-turn": "50px", "taxi-turn-min-distance": "10px", - "width": 2.4, - "opacity": 0.9 + "width": 2, + "opacity": 0.7 }} ], layout: layoutCfg @@ -950,7 +957,7 @@ function buildDetail(inst){ (hasDeps ? "
Граф
" : "") + ""; - h += "
" + + h += "
" + "

Input (params)

" + renderP(params) + "
" + "

Output (out)

" + renderP(out) + "
" + "
"; @@ -968,7 +975,7 @@ function buildDetail(inst){ } else { opsHtml = "Нет записей"; } - h += "
" + + h += "
" + "" + "" + opsHtml + "
ОперацияКтоНачалоКонецДлит. (s)Статус
"; @@ -995,7 +1002,7 @@ function buildDetail(inst){ } else { depOnHtml = "
Никто не зависит
"; } - h += "
" + + h += "
" + "

Зависит от (" + deps.length + ")

" + depsHtml + "
" + "

Зависят от него (" + depOn.length + ")

" + depOnHtml + "
" + "
";