diff --git a/htdocs/css/style.css b/htdocs/css/style.css index 9206f11..43722c8 100644 --- a/htdocs/css/style.css +++ b/htdocs/css/style.css @@ -815,34 +815,59 @@ td.table_label { .stats.grid-container { display: grid; + background-color: var(--box-background-color); + border: 1px solid var(--border-color); + border-right: 0px; /* grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); */ grid-template-columns: repeat(10, auto); align-items: center; - gap: 14px; - padding: 4px; + gap: 0px; + padding: 0px; direction: ltr; /* background-color: #80808005; */ - border-radius: 12px; + /* border-radius: 6px; */ } .stats.grid-item { - border: 1px solid #ccccccde; + border: 0px; + border-right: 1px solid var(--border-color); + /* border-top: 1px solid var(--border-color); */ + /* border-bottom: 1px solid var(--border-color); */ background-color: var(--box-background-color); /* background-color: #FAFAFA; */ /* transition: border-width 0.3s; */ - padding: 4px; - border-radius: 12px; + padding: 6px; + border-radius: 0px; + /* border-top-left-radius: 6px; */ + /* border-bottom-left-radius: 6px; */ word-wrap: break-word; white-space: wrap; overflow: hidden; /* white-space: normal; */ direction: ltr; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + /* box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); */ /* vertical-align: middle; */ } + /* body.dark .stats.grid-item { + border: 1px solid #cccccc26; + } body.dark .stats.grid-item { + box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.75); + } */ + + body.dark .stats.grid-item:hover { + color: #FFF; + background-color: var(--background-color); + } + + .stats.grid-item:hover { + /* border: 1px solid #cccccc26; */ + background-color: #cccccc26; + } + + /* body.dark .stats.grid-item { background-color: initial; } body.dark .stats.grid-item:hover { @@ -851,7 +876,7 @@ td.table_label { } .stats.grid-item:hover { background-color: rgba(128,128,128, 0.1); - } + } */ @media (max-width: 1200px) { .stats.grid-container { @@ -864,17 +889,19 @@ td.table_label { /* grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); */ grid-template-columns: repeat(7, auto); align-items: center; - gap: 6px; + gap: 0px; padding: 0px; - padding-bottom: 12px; + /* padding-bottom: 12px; */ margin-top: 12px; - /* background-color: var(--box-background-color); */ - background-color: initial; - border: 0px solid var( --border-color); - border-radius: 6px; + margin-bottom: 12px; + background-color: var(--background-color); + border: 1px solid var( --border-color); + border-bottom: 0px; + border-left: 0px; + border-radius: 0px; } - .job-details.running.grid-container { + .job-details.grid-container.running { grid-template-columns: repeat(6, auto); } @@ -886,11 +913,12 @@ td.table_label { display: flex; align-items: baseline; justify-content: space-evenly; - border: 1px solid var( --border-color); - background-color: var(--box-background-color); + border-bottom: 1px solid var( --border-color); + border-left: 1px solid var( --border-color); + background-color: var(--background-color); flex-wrap: wrap; padding-top: 8px; - border-radius: 6px; + /* border-radius: 6px; */ } body.dark .job-details.grid-item:hover div.info_value { @@ -908,7 +936,7 @@ td.table_label { overflow: hidden; /* white-space: normal; */ direction: ltr; - box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* vertical-align: middle; */ } @@ -918,12 +946,13 @@ td.table_label { body.dark .upcoming.schedule.grid-item { - background-color: #44444444 + background-color: #44444444 /* color: #fff */ } .upcoming.schedule.grid-item { - background-color: #fafafa + /* background-color: #fafafa */ + background-color: var(--box-background-color); /* color: #fff */ } @@ -960,10 +989,6 @@ td.table_label { box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.75); } - body.dark .stats.grid-item { - box-shadow: 0px 4px 8px 0px rgba(0,0,0,0.75); - } - .upcoming.minute.grid-item { background-color: #b7ffb770 } @@ -1012,7 +1037,7 @@ td.table_label { } .upcoming.grid-item:hover { - border-color: rgba(46, 38, 12, 0.4); + border-color: rgba(128,128,128,0.5) /* background-color:rgb(0, 255, 0) */ } @@ -1049,10 +1074,6 @@ td.table_label { border: 1px solid #cccccc26; } - body.dark .stats.grid-item { - border: 1px solid #cccccc26; - } - .upcoming.grid-title { /* font-weight: bold; */ font-size: 1.2em; diff --git a/htdocs/js/pages/History.class.js b/htdocs/js/pages/History.class.js index 3d5fac7..34672d7 100644 --- a/htdocs/js/pages/History.class.js +++ b/htdocs/js/pages/History.class.js @@ -378,7 +378,7 @@ Class.subclass( Page.Base, "Page.History", { } html += ` -
+
EVENT NAME:
${eventTitle}
CATEGORY:
${this.getNiceCategory(cat, col_width) }
PLUGIN:
${this.getNicePlugin(plugin, col_width)}
diff --git a/htdocs/js/pages/JobDetails.class.js b/htdocs/js/pages/JobDetails.class.js index a370d60..7f87720 100644 --- a/htdocs/js/pages/JobDetails.class.js +++ b/htdocs/js/pages/JobDetails.class.js @@ -209,7 +209,7 @@ Class.subclass(Page.Base, "Page.JobDetails", { html += 'Completed Job'; if (event.id && !event.multiplex) html += '
 Run Again
'; - if (event.id) html += `
 Jump to History
`; + let jumpToHist = `
 Jump to History
`; //adding edit button on job detail page if (event.id) html += '
 Edit
'; if (app.isAdmin()) html += '
 Delete Job
'; @@ -254,7 +254,7 @@ Class.subclass(Page.Base, "Page.JobDetails", {
JOB ID:
${job.id}
PID:
${(job.detached_pid || job.pid || '(Unknown)')}
CAT:
${jobCategory}
-
SOURCE:
${job.source || 'Scheduler'}
+
SOURCE:
${job.source || 'Scheduler'}
TARGET:
${jobTarget}
START:
${jobStarted}
ELAPSED:
${get_text_from_seconds(job.elapsed, false, false)}
@@ -266,13 +266,16 @@ Class.subclass(Page.Base, "Page.JobDetails", {
MEMO:
${job.memo || '(none)'}
HOST:
${this.getNiceGroup(null, job.hostname, col_width)}
END:
${get_nice_date_time(job.time_end, false, true)}
-
${timing}
+
${jumpToHist }
+
` + //
${timing}
+ // pies - html += '
'; + html += '
'; html += '
'; html += '
Performance Metrics
'; @@ -809,7 +812,7 @@ Class.subclass(Page.Base, "Page.JobDetails", { } html += ` -
+
JOB ID:
${job.id}
PID:
${(job.detached_pid || job.pid || '(Unknown)')}
CAT:
${this.getNiceCategory(cat, col_width)}