From 841395d11817110fc64ba4e08df7abd7a01d0dec Mon Sep 17 00:00:00 2001
From: Bincheng Wu <bincheng.wu@rstudio.com>
Date: Thu, 22 Jul 2021 13:54:12 -0400
Subject: [PATCH] update help icon UI

---
 rsconnect_jupyter/static/connect.js | 47 +++++++++--------------------
 rsconnect_jupyter/static/main.css   |  5 +--
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/rsconnect_jupyter/static/connect.js b/rsconnect_jupyter/static/connect.js
index 1d96dad4..2cb01ca4 100644
--- a/rsconnect_jupyter/static/connect.js
+++ b/rsconnect_jupyter/static/connect.js
@@ -1067,18 +1067,17 @@ define([
         '            <span class="help-block"></span>',
         '        </div>',
         '    </div>',
-        '    <div id="hide-all-input-wrapper">',
-        '     <div id="hide-all-input">',
-        '       <input type="checkbox" id="hide_all_input" name="hide_all_input" value="hide_all_input">',
-        '       <label for="hide_all_input"> Hide all input code cells </label>',
-        '     </div>',
-        '    </div>',   
-        '    <div id="hide-tagged-input-wrapper">',
-        '     <div id="hide-tagged-input">',
-        '       <input type="checkbox" id="hide_tagged_input" name="hide_tagged_input" value="hide_tagged_input">',
-        '       <label for="hide_tagged_input"> Hide input code cells with the <span class="code">"hide_input"</span> tag </label>',             
-        '     </div>', 
-        '    </div>',             
+        '    <div id="hide-input-wrapper">',
+        '      <label for="hide-input-wrapper"> Hide Input</label>',        
+        '    </div>',        
+        '    <div id="hide-all-input">',
+        '      <input type="checkbox" id="hide_all_input" name="hide_all_input" value="hide_all_input">',
+        '      <label for="hide_all_input"> Hide all input code cells </label>',
+        '    </div>',
+        '    <div id="hide-tagged-input">',
+        '      <input type="checkbox" id="hide_tagged_input" name="hide_tagged_input" value="hide_tagged_input">',
+        '      <label for="hide_tagged_input"> Hide input code cells with the <span class="code">"hide_input"</span> tag </label>',             
+        '    </div><br>', 
         '    <div id="add-files">',
         '      <label for="rsc-add-files" id="rsc-add-files-label" class="rsc-label">Additional Files</label>',
         '      <button id="rsc-add-files" class="btn btn-default">Select Files...</button>',
@@ -1397,28 +1396,10 @@ define([
           $('#rsc-publish-source > label').append(helpIcon);
         })();
 
-        // setup hide all input help icon
-        (function() {
-          var msg = 
-            '<a href="https://docs.rstudio.com/rsconnect-jupyter/usage/#hide-all-input" target="_blank">Check hide all input documentation</a>';
-          
-            var helpIcon = $(
-            [
-              '<a tabindex="0" role="button" data-toggle="popover" data-trigger="focus">',
-              '<i class="fa fa-question-circle rsc-fa-icon"></i>'
-            ].join('')
-          )
-            .data('content', msg)
-            .data('html', true)
-            .popover();
-
-          $('#hide-all-input-wrapper').append(helpIcon);
-        })();
-
-        // setup hide tagged input help icon
+        // setup hide input help icon
         (function() {
           var msg = 
-            '<a href="https://docs.rstudio.com/rsconnect-jupyter/usage/#hide-tagged-input" target="_blank">Check hide tagged input documentation</a>';
+            '<a href="https://docs.rstudio.com/rsconnect-jupyter/usage/#hide-all-input" target="_blank">Hide input documentation</a>';
           
             var helpIcon = $(
             [
@@ -1430,7 +1411,7 @@ define([
             .data('html', true)
             .popover();
 
-          $('#hide-tagged-input-wrapper').append(helpIcon);
+          $('#hide-input-wrapper').append(helpIcon);
         })();
 
         var form = publishModal.find('form').on('submit', function(e) {
diff --git a/rsconnect_jupyter/static/main.css b/rsconnect_jupyter/static/main.css
index 0dd063d9..8506156a 100644
--- a/rsconnect_jupyter/static/main.css
+++ b/rsconnect_jupyter/static/main.css
@@ -131,10 +131,7 @@ p {
     text-align: right;
 }
 
-#hide-all-input-wrapper {
-    display:flex;
-}
 
-#hide-tagged-input-wrapper {
+#hide-input-wrapper {
     display:flex;
 }