From 57fce80e24cfe08e530e0697d6c70bba14076d1c Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Tue, 21 May 2019 13:00:34 -0700 Subject: Improve JSON->HTML conversion The existing JSON to html conversion is quite unfortunate, as it runs several very expensive regular expressions on an output to properly invoke the correct behavior, and to escape things like links. This patchset adjusts the behavior to directly dump the tree to HTML, skipping the json step entirely. Most of the code was pulled from the nlohmann::serializer class. Small side node: This also resolves the CSP issue with the inline CSS classes that are currently embedded in the json UI. Note, in terms of user facing behavior, this finally fixes the CSS issue, so the div is now centered as designed. Previously it was left justified. Tested: Ran several redfish schemas and compared to old ones. Output appears the same in the window, and content security policy warnings are gone. Verified several links works as expected, and verified the behavior of all base types, as well as empty arrays and empty objects. All appear to work correctly. Signed-off-by: Ed Tanous Change-Id: Id9bf6dc33acb1603f009de4cd322e81d83f334be --- static/redfish.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 static/redfish.css (limited to 'static/redfish.css') diff --git a/static/redfish.css b/static/redfish.css new file mode 100644 index 0000000000..4e851ebedd --- /dev/null +++ b/static/redfish.css @@ -0,0 +1,19 @@ +img { + max-width: 30em; + margin: 0 auto; +} + +.container { + width: 30em; + top: 50%; + left: 50%; + margin: 0 auto; +} + +.content { + font-family: monospace; +} + +.tab { + margin-left: 2em; +} -- cgit v1.2.3