From 6809ca5f6a84ca1c0d79389e77309bd7d5005c69 Mon Sep 17 00:00:00 2001 From: lideming Date: Wed, 24 Feb 2021 12:50:54 +0800 Subject: [PATCH] Improve JSON value rendering --- src/views/head_layout.pug | 6 ++++++ src/views/member_detail.pug | 5 +---- src/views/network_detail.pug | 7 ++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/head_layout.pug b/src/views/head_layout.pug index f96a9c3..9ce19d8 100644 --- a/src/views/head_layout.pug +++ b/src/views/head_layout.pug @@ -7,6 +7,12 @@ mixin nav_item(name, displayName, href) li(class=((navigate && navigate.active === name) ? 'active' : '')) a(href=href) #{displayName} +mixin json_value(value) + - if ((!!value ) && (value.constructor == Object || value.constructor == Array)) + code(style='white-space: pre;')= JSON.stringify(value, null, 2) + - else + code= value + doctype html html(lang='en') head diff --git a/src/views/member_detail.pug b/src/views/member_detail.pug index c714851..03b4f12 100644 --- a/src/views/member_detail.pug +++ b/src/views/member_detail.pug @@ -14,10 +14,7 @@ block net_content .col-sm-2 a(href=('/controller/network/' + member.nwid + '/member/' + member.address + '/' + key)) #{key}: .col-sm-10 - - if ((!!value ) && (value.constructor == Object || value.constructor == Array)) - code #{JSON.stringify(value)} - - else - code #{value} + +json_value(value) a.btn.btn-default(href=('/controller/network/' + member.nwid + "#members") name='networks' role='button' style='margin-top: 10px;') | Members diff --git a/src/views/network_detail.pug b/src/views/network_detail.pug index 7f59e20..ca8d8a3 100644 --- a/src/views/network_detail.pug +++ b/src/views/network_detail.pug @@ -123,13 +123,10 @@ block net_content h3#detail Detail for network each value, key in network - .row + .row(style='margin: 5px 0;') .col-sm-2 a(href= network.nwid + '/' + key) #{key}: .col-sm-10 - - if ((!!value ) && (value.constructor == Object || value.constructor == Array)) - code #{JSON.stringify(value)} - - else - code #{value} + +json_value(value) a.btn.btn-default(href='/controller/networks' name='networks' role='button' style='margin-top: 10px;') Networks