diff --git a/web/DB.php b/web/DB.php index dd9b92a..6bfd4e1 100644 --- a/web/DB.php +++ b/web/DB.php @@ -41,7 +41,7 @@ class DB { public function get_all_tasks($status = null) { if (is_null($status)) { $query = ' - SELECT DISTINCT t.id, t.host, t.type, t.params, t.frequency, t.creation_date, t.last_execution, t.active, t.group_id, h.status, g.name as group_name + SELECT DISTINCT t.id, t.host, t.type, t.params, t.frequency, t.creation_date, t.last_execution, t.active, t.group_id, h.status, h.output, g.name as group_name FROM `tasks` as t LEFT JOIN `tasks_history` as h ON (h.task_id = t.id) LEFT JOIN `groups` as g ON (g.id = t.group_id) diff --git a/web/css/styles.css b/web/css/styles.css index 715a22a..b3a321a 100644 --- a/web/css/styles.css +++ b/web/css/styles.css @@ -92,24 +92,25 @@ td { .new-group { - margin: .2rem; + margin: .1rem; display: inline-block; - border: 1px solid rgba(7, 7, 7, 0.432); - padding: 1px; - + border-radius: .4rem; + overflow: hidden; + cursor: pointer; } .quick-view .square { - width: 1rem; - min-width: 1rem; - max-width: 1rem; - height: 1rem; - min-height: 1rem; - max-height: 1rem; - margin: 0.1rem; + height: 100%; + margin: 0; text-align: center; vertical-align: middle; float: left; + line-height: 1.2rem; + min-width: 1.4rem; +} + +.quick-view .square:not(:first-of-type) { + border-left: 1px solid white; } .spacer { @@ -132,7 +133,6 @@ td { } - .highlight { background-color: #000; padding: 0px 1rem; diff --git a/web/img/info.png b/web/img/info.png new file mode 100644 index 0000000..39dc9ce Binary files /dev/null and b/web/img/info.png differ diff --git a/web/index.php b/web/index.php index 4164b27..1292b65 100644 --- a/web/index.php +++ b/web/index.php @@ -7,7 +7,7 @@ MonitoLite - Network monitoring tool - + @@ -21,60 +21,73 @@ v-for="group in tasks" v-bind:key="group.id" class="new-group" - :title="group.name" + :title="'Group: '+group.name" > - -

- -

-
+   +

 

-
-

Tasks for group {{ group.name }} (#{{ group.id }})

- - - - - - - - - - - - - - - - - - - - -
Up?HostTypeLast executionFrequency (min)Active -
- Status - - - {{ task.host }} - - Type of check - {{ task.last_execution ?? 'never' }}{{ task.frequency }}{{ task.active == 1 ? 'Yes' : 'No' }}
+
+
+

Tasks for group {{ group.name }} (#{{ group.id }})

+ + + + + + + + + + + + + + + + + + + +
Up?HostTypeLast executionFrequency (min)Active +
+ Status + + + {{ task.host }} + + Type of check + + + {{ task.last_execution }} + Infos + + + Never + + {{ task.frequency }}{{ task.active == 1 ? 'Yes' : 'No' }}
+