Correct display mode highlight keys

Add html display mode to the help documentation.
Correct html and hex display mode highlight keys (help used 'h' for hex).
Correct json display mode highlight keys.

3 files changed, 11 insertions, 3 deletions

diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py
index 2b46064a..06710d2c 100644
--- a/libmproxy/console/contentview.py
+++ b/libmproxy/console/contentview.py
@@ -137,7 +137,7 @@ class ViewXML:
 
 class ViewJSON:
     name = "JSON"
-    prompt = ("json", "j")
+    prompt = ("json", "s")
     content_types = ["application/json"]
     def __call__(self, hdrs, content, limit):
         lines = utils.pretty_json(content)
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 5f1d261f..8932b912 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -34,10 +34,14 @@ def _mkhelp():
                 [("text", ": automatic detection")]
             ),
             (None,
-                common.highlight_key("hex", "h") +
+                common.highlight_key("hex", "e") +
                 [("text", ": Hex")]
             ),
             (None,
+                common.highlight_key("html", "h") +
+                [("text", ": HTML")]
+            ),
+            (None,
                 common.highlight_key("image", "i") +
                 [("text", ": Image")]
             ),
diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py
index 40f81955..de373083 100644
--- a/libmproxy/console/help.py
+++ b/libmproxy/console/help.py
@@ -57,10 +57,14 @@ class HelpView(urwid.ListBox):
                     [("text", ": automatic detection")]
                 ),
                 (None,
-                    common.highlight_key("hex", "h") +
+                    common.highlight_key("hex", "e") +
                     [("text", ": Hex")]
                 ),
                 (None,
+                    common.highlight_key("html", "h") +
+                    [("text", ": HTML")]
+                ),
+                (None,
                     common.highlight_key("image", "i") +
                     [("text", ": Image")]
                 ),