Merge pull request #2095 from edx/giulio/comment-out-forum-follow

Comment out forum follow checkboxes

lms/templates/discussion/_inline_new_post.html

@@ -6,7 +6,9 @@
         <form class="new-post-form">
             <div class="left-column">
                 <div class="options">
-                    <input type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label for="new-post-follow">${_("follow this post")}</label>
+
+                    <input style="display: none;" type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label style="display: none;" for="new-post-follow">${_("follow this post")}</label>
+
                     <br>
                     % if course.allow_anonymous:
                         <input type="checkbox" name="anonymous" class="discussion-anonymous" id="new-post-anonymous"><label for="new-post-anonymous">${_("post anonymously")}</label>

lms/templates/discussion/_new_post.html

@@ -39,7 +39,9 @@
                     </div>
                 </div>
                 <div class="options">
-                    <input type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label for="new-post-follow">${_("follow this post")}</label>
+
+                    <input style="display: none;" type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label style="display: none;" for="new-post-follow">${_("follow this post")}</label>
+
                     <br>
                     % if course.allow_anonymous:
                         <input type="checkbox" name="anonymous" class="discussion-anonymous" id="new-post-anonymous"><label for="new-post-anonymous">${_("post anonymously")}</label>

lms/templates/discussion/_underscore_templates.html

@@ -218,15 +218,17 @@
   <span class="row-description">Follow posts for updates</span>
   </td>
   </tr>
-  <tr class="helpgrid-row helpgrid-row-notification">
-  <td class="row-title">Receive updates</td>
-  <td class="row-item-full" colspan="3">
-  <label class="sr" for="email-setting-checkbox">${_("Toggle Notifications Setting")}</label>
-  <input type="checkbox" id="email-setting-checkbox" class="email-setting" name="email-notification"/>
-  <i class="icon icon-envelope"></i>
-  <span class="row-description"> If enabled, you will receive an email digest once a day notifying you about new, unread activity from posts you are following. </span>
-  </td>
+  
+  <tr class="helpgrid-row helpgrid-row-notification" style="display: none;">
+    <td class="row-title">Receive updates</td>
+    <td class="row-item-full" colspan="3">
+      <label class="sr" for="email-setting-checkbox">${_("Toggle Notifications Setting")}</label>
+      <input type="checkbox" id="email-setting-checkbox" class="email-setting" name="email-notification"/>
+      <i class="icon icon-envelope"></i>
+      <span class="row-description"> If enabled, you will receive an email digest once a day notifying you about new, unread activity from posts you are following. </span>
+    </td>
   </tr>
+  
   </table>
   % endif
   % endif

lms/templates/discussion/mustache/_inline_discussion.mustache

@@ -19,7 +19,7 @@
                 <input type="submit" class="submit" value="Add post">
                 <a href="#" class="new-post-cancel">Cancel</a>
                 <div class="options">
-                    <input type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label for="new-post-follow">follow this post</label>
+                    <input style="display: none;" type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label style="display: none;" for="new-post-follow">follow this post</label>
                     <br>
                     {{#allow_anonymous}}
                         <input type="checkbox" name="anonymous" class="discussion-anonymous" id="new-post-anonymous"><label for="new-post-anonymous">post anonymously</label>