ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-26 13:29:05 +01:00
Code Issues Packages Releases Activity

Merge branch '275_add_tag_scope' into 275_tag_scope_jobview_rework

Browse Source
This commit is contained in:
Christoph Kluge 2024-09-16 13:55:17 +02:00
commit ff52fb16b6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/frontend/src/generic/helper/Tag.svelte
View File

@ -38,9 +38,9 @@
<a target={clickable ? "_blank" : null} href={clickable ? `/monitoring/jobs/?tag=${id}` : null}> <a target={clickable ? "_blank" : null} href={clickable ? `/monitoring/jobs/?tag=${id}` : null}>
{#if tag} {#if tag}
{#if tag?.scope === "global"} {#if tag?.scope === "global"}
<span style="background-color:#9e9e9e;" class="badge text-dark">{tag.type}: {tag.name}</span> <span style="background-color:#c85fc8;" class="badge text-dark">{tag.type}: {tag.name}</span>
{:else if tag.scope === "admin"} {:else if tag.scope === "admin"}
<span style="background-color:#80deea;" class="badge text-dark">{tag.type}: {tag.name}</span> <span style="background-color:#19e5e6;" class="badge text-dark">{tag.type}: {tag.name}</span>
{:else} {:else}
<span class="badge bg-warning text-dark">{tag.type}: {tag.name}</span> <span class="badge bg-warning text-dark">{tag.type}: {tag.name}</span>
{/if} {/if}

4
web/templates/monitoring/taglist.tmpl
View File

@ -8,10 +8,10 @@
</div> </div>
{{ range $tagList }} {{ range $tagList }}
{{if eq .scope "global"}} {{if eq .scope "global"}}
<a style="background-color:#9e9e9e;" class="btn btn-lg" href="/monitoring/jobs/?tag={{ .id }}" role="button"> <a style="background-color:#c85fc8;" class="btn btn-lg" href="/monitoring/jobs/?tag={{ .id }}" role="button">
{{ .name }} <span class="badge bg-light text-dark">{{ .count }}</span> </a> {{ .name }} <span class="badge bg-light text-dark">{{ .count }}</span> </a>
{{else if eq .scope "admin"}} {{else if eq .scope "admin"}}
<a style="background-color:#80deea;" class="btn btn-lg" href="/monitoring/jobs/?tag={{ .id }}" role="button"> <a style="background-color:#19e5e6;" class="btn btn-lg" href="/monitoring/jobs/?tag={{ .id }}" role="button">
{{ .name }} <span class="badge bg-light text-dark">{{ .count }}</span> </a> {{ .name }} <span class="badge bg-light text-dark">{{ .count }}</span> </a>
{{else}} {{else}}
<a class="btn btn-lg btn-warning" href="/monitoring/jobs/?tag={{ .id }}" role="button"> <a class="btn btn-lg btn-warning" href="/monitoring/jobs/?tag={{ .id }}" role="button">