final edits on the frontend to ensure a comment's visibility is shown on the...

final edits on the frontend to ensure a comment's visibility is shown on the listing when it's private but not when it's public

hypha/apply/activity/templates/activity/include/listing_base.html

@@ -22,12 +22,10 @@
                 </p>
             {% endif %}
 
-            {% if activity.private %}
-                <p class="feed__meta-item feed__meta-item--right">
+                <p class="feed__meta-item feed__meta-item--right" {% if not activity.private %} hidden {% endif %}>
                     <svg class="icon icon--eye"><use xlink:href="#eye"></use></svg>
                     <span class="js-comment-visibility">{{ activity.visibility }}</span>
                 </p>
-            {% endif %}
         </div>
 
         <p class="feed__heading">

hypha/static_src/src/javascript/apply/edit-comment.js

@@ -37,6 +37,7 @@
                 <div id="wmd-preview-edit-comment" class="wmd-preview"></div>
                 <br>
                 <div>Visible to:</div>
+            </div>
         `;
 
         const radioButtonsDiv = '<div id="edit-comment-visibility"></div>';
@@ -53,7 +54,6 @@
                     <button class="button button--primary js-submit-edit" type="submit">Update</button>
                     <button class="button button--white js-cancel-edit">Cancel</button>
                 </div>
-            </div>
         `;
 
         // add the comment to the editor
@@ -144,7 +144,14 @@
     };
 
     const updateVisibility = (el, visibility) => {
-        $(el).closest(feedContent).find(commentVisibility).html(`${visibility}`);
+        if (visibility !== 'all') {
+            $(el).closest(feedContent).find(commentVisibility).parent().attr('hidden', false);
+            $(el).closest(feedContent).find(commentVisibility).text(visibility);
+        }
+        else {
+            $(el).closest(feedContent).find(commentVisibility).parent().attr('hidden', true);
+            $(el).closest(feedContent).find(commentVisibility).html(`${visibility}`);
+        }
     };
 
     const updateLastEdited = (el, date) => {

hypha/static_src/src/sass/apply/components/_feed.scss

@@ -117,6 +117,10 @@
 
         &--right {
             margin-left: auto;
+
+            span {
+                font-weight: $weight--normal;
+            }
         }
 
         &--progress {