From 25e01ed449dc912a9c965bc295cfd6cc6b22051f Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Fri, 1 Aug 2014 17:58:27 +1000 Subject: [PATCH] Improve event and request log preview pages --- modules/backend/assets/css/october.css | 7 ++++++ .../assets/less/controls/simplelist.less | 8 +++++++ .../controllers/eventlogs/_message_column.htm | 1 + .../system/controllers/eventlogs/preview.htm | 19 ++++++++++++++- .../controllers/requestlogs/_referer.htm | 9 -------- .../requestlogs/_referer_field.htm | 11 +++++++++ .../controllers/requestlogs/preview.htm | 23 ++++++++++++++++++- modules/system/lang/en/lang.php | 3 +++ modules/system/models/eventlog/columns.yaml | 4 +++- modules/system/models/eventlog/fields.yaml | 9 -------- modules/system/models/requestlog/fields.yaml | 11 ++------- 11 files changed, 75 insertions(+), 30 deletions(-) create mode 100644 modules/system/controllers/eventlogs/_message_column.htm delete mode 100644 modules/system/controllers/requestlogs/_referer.htm create mode 100644 modules/system/controllers/requestlogs/_referer_field.htm diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 37bb0d071..dded03d8f 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -9499,6 +9499,13 @@ table.table.data tr.list-tree-level-25 td.list-cell-index-1 { .control-simplelist ul { padding-left: 15px; } +.control-simplelist.form-control ul { + margin-bottom: 0; +} +.control-simplelist.form-control li { + padding-top: 5px; + padding-bottom: 5px; +} .control-simplelist.with-icons ul, .control-simplelist.with-checkboxes ul, .control-simplelist.is-selectable ul { diff --git a/modules/backend/assets/less/controls/simplelist.less b/modules/backend/assets/less/controls/simplelist.less index f2b8ecf3e..b8cb4f136 100644 --- a/modules/backend/assets/less/controls/simplelist.less +++ b/modules/backend/assets/less/controls/simplelist.less @@ -33,6 +33,14 @@ ul { padding-left: 15px; } + &.form-control { + ul { margin-bottom: 0; } + li { + padding-top: 5px; + padding-bottom: 5px; + } + } + &.with-icons, &.with-checkboxes, &.is-selectable { ul { list-style-type: none; diff --git a/modules/system/controllers/eventlogs/_message_column.htm b/modules/system/controllers/eventlogs/_message_column.htm new file mode 100644 index 000000000..664a26e14 --- /dev/null +++ b/modules/system/controllers/eventlogs/_message_column.htm @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/modules/system/controllers/eventlogs/preview.htm b/modules/system/controllers/eventlogs/preview.htm index a0e17be51..82d865062 100644 --- a/modules/system/controllers/eventlogs/preview.htm +++ b/modules/system/controllers/eventlogs/preview.htm @@ -7,7 +7,24 @@ fatalError): ?> -
+
+
+
+

+

#id ?>

+
+
+

+

level ?>

+
+
+

+

created_at->toDayDateTimeString() ?>

+
+
+
+ +
formRenderPreview() ?>
diff --git a/modules/system/controllers/requestlogs/_referer.htm b/modules/system/controllers/requestlogs/_referer.htm deleted file mode 100644 index 30ee9ab50..000000000 --- a/modules/system/controllers/requestlogs/_referer.htm +++ /dev/null @@ -1,9 +0,0 @@ -referer) > 0): ?> - - -

There were no detected referers to this URL.

- \ No newline at end of file diff --git a/modules/system/controllers/requestlogs/_referer_field.htm b/modules/system/controllers/requestlogs/_referer_field.htm new file mode 100644 index 000000000..fbc41f242 --- /dev/null +++ b/modules/system/controllers/requestlogs/_referer_field.htm @@ -0,0 +1,11 @@ +referer) > 0): ?> +
+
    + referer as $referer): ?> +
    • + +
+
+ +
There were no detected referers to this URL.
+ \ No newline at end of file diff --git a/modules/system/controllers/requestlogs/preview.htm b/modules/system/controllers/requestlogs/preview.htm index bfddf89ab..b690986af 100644 --- a/modules/system/controllers/requestlogs/preview.htm +++ b/modules/system/controllers/requestlogs/preview.htm @@ -7,7 +7,28 @@ fatalError): ?> -
+
+
+
+

+

#id ?>

+
+
+

+

status_code ?>

+
+
+

+

count ?>

+
+
+

+

referer ? count($formModel->referer) : 0 ?>

+
+
+
+ +
formRenderPreview() ?>
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php index 9c83eaf8b..f3dd476fe 100644 --- a/modules/system/lang/en/lang.php +++ b/modules/system/lang/en/lang.php @@ -185,6 +185,7 @@ return [ 'empty_success' => 'Successfully emptied the event log.', 'return_link' => 'Return to event log', 'id' => 'ID', + 'id_label' => 'Event ID', 'created_at' => 'Date & Time', 'message' => 'Message', 'level' => 'Level', @@ -197,6 +198,8 @@ return [ 'empty_loading' => 'Emptying request log...', 'empty_success' => 'Successfully emptied the request log.', 'return_link' => 'Return to request log', + 'id' => 'ID', + 'id_label' => 'Log ID', 'count' => 'Counter', 'referer' => 'Referers', 'url' => 'URL', diff --git a/modules/system/models/eventlog/columns.yaml b/modules/system/models/eventlog/columns.yaml index 5da072cd7..66468347c 100644 --- a/modules/system/models/eventlog/columns.yaml +++ b/modules/system/models/eventlog/columns.yaml @@ -13,4 +13,6 @@ columns: message: label: system::lang.event_log.message - searchable: yes \ No newline at end of file + searchable: yes + type: partial + path: message_column \ No newline at end of file diff --git a/modules/system/models/eventlog/fields.yaml b/modules/system/models/eventlog/fields.yaml index c79bd1903..bc9c06114 100644 --- a/modules/system/models/eventlog/fields.yaml +++ b/modules/system/models/eventlog/fields.yaml @@ -4,14 +4,5 @@ fields: - id: - label: system::lang.event_log.id - span: auto - - level: - label: system::lang.event_log.level - span: auto - message: - label: system::lang.event_log.message type: textarea diff --git a/modules/system/models/requestlog/fields.yaml b/modules/system/models/requestlog/fields.yaml index 325a2b7d8..cafedf72d 100644 --- a/modules/system/models/requestlog/fields.yaml +++ b/modules/system/models/requestlog/fields.yaml @@ -4,17 +4,10 @@ fields: - status_code: - label: system::lang.request_log.status_code - span: auto - - count: - label: system::lang.request_log.count - span: auto - url: label: system::lang.request_log.url referer: label: system::lang.request_log.referer - type: partial \ No newline at end of file + type: partial + path: referer_field \ No newline at end of file