Add conditional to omit the feedback section if necessary

1 files changed, 217 insertions, 215 deletions

diff --git a/layouts/feedback.html b/layouts/feedback.html
index 2e1597e7..9c2daf35 100644
--- a/layouts/feedback.html
+++ b/layouts/feedback.html
@@ -1,230 +1,232 @@
-<div class="comments">
-  <div class="comments-filter">
-    <h2 id="help-and-feedback">
-      <i class="fa fa-star-half-o" aria-hidden="true"></i>
-      Help and feedback
-      <a class="anchor" href="#help-and-feedback"></a>
-    </h2>
-    <div>
-      <!-- Nav tabs -->
-      <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active"><a href="#docs-feedback" aria-controls="docs-feedback" role="tab" data-toggle="tab">
-          <i class="fa fa-file-text-o" aria-hidden="true"></i>
-           <strong>DOCS</strong> FEEDBACK</a>
-        </li>
-        <li role="presentation"><a href="#product-feedback" aria-controls="product-feedback" role="tab" data-toggle="tab">
-          <i class="fa fa-gitlab" aria-hidden="true"></i>
-          <strong>PRODUCT</strong> FEEDBACK</a>
-        </li>
-        <li role="presentation"><a href="#get-help" aria-controls="get-help" role="tab" data-toggle="tab">
-          <i class="fa fa-question-circle" aria-hidden="true"></i>
-          GET <strong>HELP</strong></a>
-        </li>
-        <li role="presentation"><a href="#get-more-features" aria-controls="get-more-features" role="tab" data-toggle="tab">
-          <i class="fa fa-line-chart" aria-hidden="true"></i>
-          GET MORE <strong>FEATURES</strong></a>
-        </li>
-      </ul>
+<% if @item[:feedback].nil? %>
+  <div class="comments">
+    <div class="comments-filter">
+      <h2 id="help-and-feedback">
+        <i class="fa fa-star-half-o" aria-hidden="true"></i>
+        Help and feedback
+        <a class="anchor" href="#help-and-feedback"></a>
+      </h2>
+      <div>
+        <!-- Nav tabs -->
+        <ul class="nav nav-tabs" role="tablist">
+          <li role="presentation" class="active"><a href="#docs-feedback" aria-controls="docs-feedback" role="tab" data-toggle="tab">
+            <i class="fa fa-file-text-o" aria-hidden="true"></i>
+             <strong>DOCS</strong> FEEDBACK</a>
+          </li>
+          <li role="presentation"><a href="#product-feedback" aria-controls="product-feedback" role="tab" data-toggle="tab">
+            <i class="fa fa-gitlab" aria-hidden="true"></i>
+            <strong>PRODUCT</strong> FEEDBACK</a>
+          </li>
+          <li role="presentation"><a href="#get-help" aria-controls="get-help" role="tab" data-toggle="tab">
+            <i class="fa fa-question-circle" aria-hidden="true"></i>
+            GET <strong>HELP</strong></a>
+          </li>
+          <li role="presentation"><a href="#get-more-features" aria-controls="get-more-features" role="tab" data-toggle="tab">
+            <i class="fa fa-line-chart" aria-hidden="true"></i>
+            GET MORE <strong>FEATURES</strong></a>
+          </li>
+        </ul>
 
-      <!-- Tab panes -->
-      <div class="tab-content">
-        <div role="tabpanel" class="tab-pane" id="product-feedback"><!-- product-feedback tab -->
-          <div class="row" id="issue-row"><!-- issue-row -->
-            <div class="col-md-8 col-sm-12">
-              <p>If there's something <strong>you don't like</strong> about <strong>this feature</strong>
-                <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
-              </p>
-            </div>
-            <div class="col-md-4 col-sm-12">
-              <a role="button" class="comments-holder btn btn-default" href="https://gitlab.com/gitlab-org/gitlab-ce/issues/new?issue[title]=Docs%20-%20product%20feedback:%20Write%20your%20title&issue[description]=Describe%20what%20you%20would%20like%20to%20see%20improved.%0A%0A%3C!--%20Don%27t%20edit%20below%20this%20line%20--%3E%0A%0A%2Flabel%20~%22docs%5C-comments%22%20" target="_blank">
-                <i class="fa fa-info-circle" aria-hidden="true"></i>
-                CREATE AN ISSUE
-              </a>
-            </div>
-          </div> <!-- issue-row -->
-          <div class="row" id="feature-proposal-row"><!-- feature-proposal-row -->
-            <div class="col-md-8 col-sm-12">
-              <p>If you want something that <strong>GitLab does not support</strong>
-                <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
-              </p>
-            </div>
-            <div class="col-md-4 col-sm-12">
-              <a role="button" class="comments-holder btn btn-default" href="https://gitlab.com/gitlab-org/gitlab-ce/issues/new?issuable_template=Feature%20proposal&issue[title]=Docs%20feedback%20-%20feature%20proposal:%20Write%20your%20title" target="_blank">
-                <i class="fa fa-plus-circle" aria-hidden="true"></i>
-                SUBMIT FEATURE PROPOSAL
-              </a>
-            </div>
-          </div><!-- feature-proposal-row -->
-        </div><!-- product-feedback tab -->
-
-        <div role="tabpanel" class="tab-pane" id="get-help"><!-- get-help tab -->
-          <div class="row" id="search-row"><!-- search-row -->
-            <div class="col-md-8 col-sm-12">
-              <p>If you <strong>didn't find</strong> what you were looking for
-                <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
-              </p>
-            </div>
-            <div class="col-md-4 col-sm-12">
-              <a role="button" class="comments-holder btn btn-default" href="/search/" target="_blank">
-                <i class="fa fa-search" aria-hidden="true"></i>
-                SEARCH THE DOCS
-              </a>
-            </div>
-          </div><!-- search-row -->
-
-          <div class="row" id="forum-row"><!-- forum-row -->
-            <div class="col-md-8 col-sm-12">
-              <p>If you want help with something very <strong>specific to your use case</strong>,
-                and can use some community support
-                <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
-              </p>
-            </div>
-            <div class="col-md-4 col-sm-12">
-              <p>
-                <a role="button" class="comments-holder btn btn-default" href="https://forum.gitlab.com/" target="_blank">
-                  <i class="fa fa-users" aria-hidden="true"></i>
-                  POST ON GITLAB FORUM
+        <!-- Tab panes -->
+        <div class="tab-content">
+          <div role="tabpanel" class="tab-pane" id="product-feedback"><!-- product-feedback tab -->
+            <div class="row" id="issue-row"><!-- issue-row -->
+              <div class="col-md-8 col-sm-12">
+                <p>If there's something <strong>you don't like</strong> about <strong>this feature</strong>
+                  <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
+                </p>
+              </div>
+              <div class="col-md-4 col-sm-12">
+                <a role="button" class="comments-holder btn btn-default" href="https://gitlab.com/gitlab-org/gitlab-ce/issues/new?issue[title]=Docs%20-%20product%20feedback:%20Write%20your%20title&issue[description]=Describe%20what%20you%20would%20like%20to%20see%20improved.%0A%0A%3C!--%20Don%27t%20edit%20below%20this%20line%20--%3E%0A%0A%2Flabel%20~%22docs%5C-comments%22%20" target="_blank">
+                  <i class="fa fa-info-circle" aria-hidden="true"></i>
+                  CREATE AN ISSUE
+                </a>
+              </div>
+            </div> <!-- issue-row -->
+            <div class="row" id="feature-proposal-row"><!-- feature-proposal-row -->
+              <div class="col-md-8 col-sm-12">
+                <p>If you want something that <strong>GitLab does not support</strong>
+                  <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
+                </p>
+              </div>
+              <div class="col-md-4 col-sm-12">
+                <a role="button" class="comments-holder btn btn-default" href="https://gitlab.com/gitlab-org/gitlab-ce/issues/new?issuable_template=Feature%20proposal&issue[title]=Docs%20feedback%20-%20feature%20proposal:%20Write%20your%20title" target="_blank">
+                  <i class="fa fa-plus-circle" aria-hidden="true"></i>
+                  SUBMIT FEATURE PROPOSAL
                 </a>
-              </p>
-            </div>
-          </div><!-- forum-row -->
+              </div>
+            </div><!-- feature-proposal-row -->
+          </div><!-- product-feedback tab -->
 
-          <div class="row" id="support-row"><!-- support-row -->
-            <div class="col-md-8 col-sm-12">
-              <p>If you <strong>have problems</strong> setting up or using this feature (depending on your GitLab subscription)
-                <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
-              </p>
-            </div>
-            <div class="col-md-4 col-sm-12">
-              <p>
-                <a role="button" class="comments-holder btn btn-default" href="https://about.gitlab.com/support/" target="_blank">
-                  <i class="fa fa-user-circle-o" aria-hidden="true"></i>
-                  REQUEST SUPPORT
+          <div role="tabpanel" class="tab-pane" id="get-help"><!-- get-help tab -->
+            <div class="row" id="search-row"><!-- search-row -->
+              <div class="col-md-8 col-sm-12">
+                <p>If you <strong>didn't find</strong> what you were looking for
+                  <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
+                </p>
+              </div>
+              <div class="col-md-4 col-sm-12">
+                <a role="button" class="comments-holder btn btn-default" href="/search/" target="_blank">
+                  <i class="fa fa-search" aria-hidden="true"></i>
+                  SEARCH THE DOCS
                 </a>
-              </p>
-            </div>
-          </div><!-- support-row -->
-        </div><!-- get-help tab -->
+              </div>
+            </div><!-- search-row -->
 
-        <div role="tabpanel" class="tab-pane" id="get-more-features"><!-- get-more-features tab -->
-          <div class="row" id="sales-row"><!-- gitlab-pricing-row -->
-            <div class="col-md-8 col-sm-12">
-              <p>To view <strong>all GitLab tiers</strong> and features or to upgrade
-                <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
-              </p>
-            </div>
-            <div class="col-md-4 col-sm-12">
-              <a role="button" class="comments-holder btn btn-default" href="https://about.gitlab.com/pricing/" target="_blank">
-                <i class="fa fa-credit-card-alt" aria-hidden="true"></i>
-                VIEW PRICING PAGE
-              </a>
-            </div>
-          </div><!-- gitlab-pricing-row -->          
-          
-          <div class="row" id="sales-row"><!-- gitlab-gold-row -->
-            <div class="col-md-8 col-sm-12">
-              <p>If you want to try all features available in <strong>GitLab.com</strong>
-                <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
-              </p>
-            </div>
-            <div class="col-md-4 col-sm-12">
-              <a role="button" class="comments-holder btn btn-default" href="https://customers.gitlab.com/trials/new?gl_com=true" target="_blank">
-                <i class="fa fa-cloud" aria-hidden="true"></i>
-                GITLAB GOLD FREE-TRIAL
-              </a>
-            </div>
-          </div><!-- gitlab-gold-row -->
+            <div class="row" id="forum-row"><!-- forum-row -->
+              <div class="col-md-8 col-sm-12">
+                <p>If you want help with something very <strong>specific to your use case</strong>,
+                  and can use some community support
+                  <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
+                </p>
+              </div>
+              <div class="col-md-4 col-sm-12">
+                <p>
+                  <a role="button" class="comments-holder btn btn-default" href="https://forum.gitlab.com/" target="_blank">
+                    <i class="fa fa-users" aria-hidden="true"></i>
+                    POST ON GITLAB FORUM
+                  </a>
+                </p>
+              </div>
+            </div><!-- forum-row -->
 
-          <div class="row" id="sales-row"><!-- gitlab-ultimate-row -->
-            <div class="col-md-8 col-sm-12">
-              <p>If you want to try all features available in <strong>GitLab self-managed</strong>
-                <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
-              </p>
-            </div>
-            <div class="col-md-4 col-sm-12">
-              <a role="button" class="comments-holder btn btn-default" href="https://about.gitlab.com/free-trial/" target="_blank">
-                <i class="fa fa-server" aria-hidden="true"></i>
-                GITLAB ULTIMATE FREE-TRIAL
-              </a>
-            </div>
-          </div><!-- gitlab-ultimate-row -->
-        </div><!-- get-more-features tab -->
+            <div class="row" id="support-row"><!-- support-row -->
+              <div class="col-md-8 col-sm-12">
+                <p>If you <strong>have problems</strong> setting up or using this feature (depending on your GitLab subscription)
+                  <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
+                </p>
+              </div>
+              <div class="col-md-4 col-sm-12">
+                <p>
+                  <a role="button" class="comments-holder btn btn-default" href="https://about.gitlab.com/support/" target="_blank">
+                    <i class="fa fa-user-circle-o" aria-hidden="true"></i>
+                    REQUEST SUPPORT
+                  </a>
+                </p>
+              </div>
+            </div><!-- support-row -->
+          </div><!-- get-help tab -->
 
-        <div role="tabpanel" class="tab-pane active" id="docs-feedback"><!-- docs-feedback tab -->
-          <div class="row" id="edit-page-row"><!-- edit-page-row -->
-            <div class="col-md-8 col-sm-12">
-              <p>If you <strong>spot an error or a need for improvement</strong> and would like to <strong>fix it yourself</strong> in a merge request
-                <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
-              </p>
-            </div>
-            <div class="col-md-4 col-sm-12">
-              <p>
-                <a role="button" class="comments-holder btn btn-default" href="<%= edit_on_gitlab(@item) %>" target="_blank">
-                  <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
-                  EDIT THIS PAGE
+          <div role="tabpanel" class="tab-pane" id="get-more-features"><!-- get-more-features tab -->
+            <div class="row" id="sales-row"><!-- gitlab-pricing-row -->
+              <div class="col-md-8 col-sm-12">
+                <p>To view <strong>all GitLab tiers</strong> and features or to upgrade
+                  <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
+                </p>
+              </div>
+              <div class="col-md-4 col-sm-12">
+                <a role="button" class="comments-holder btn btn-default" href="https://about.gitlab.com/pricing/" target="_blank">
+                  <i class="fa fa-credit-card-alt" aria-hidden="true"></i>
+                  VIEW PRICING PAGE
                 </a>
-              </p>
-            </div>
-          </div><!-- edit-page-row -->
+              </div>
+            </div><!-- gitlab-pricing-row -->          
+            
+            <div class="row" id="sales-row"><!-- gitlab-gold-row -->
+              <div class="col-md-8 col-sm-12">
+                <p>If you want to try all features available in <strong>GitLab.com</strong>
+                  <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
+                </p>
+              </div>
+              <div class="col-md-4 col-sm-12">
+                <a role="button" class="comments-holder btn btn-default" href="https://customers.gitlab.com/trials/new?gl_com=true" target="_blank">
+                  <i class="fa fa-cloud" aria-hidden="true"></i>
+                  GITLAB GOLD FREE-TRIAL
+                </a>
+              </div>
+            </div><!-- gitlab-gold-row -->
 
-          <div class="row" id="doc-issue-row"><!-- doc-issue-row -->
-            <div class="col-md-8 col-sm-12">
-              <p>If you would like to <strong>suggest an improvement to this doc</strong>
-                <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
-              </p>
-            </div>
-            <div class="col-md-4 col-sm-12">
-              <a role="button" class="comments-holder btn btn-default" href="https://gitlab.com/gitlab-org/gitlab-ce/issues/new?issue[title]=Docs%20feedback:%20Write%20your%20title&issue[description]=Link%20the%20doc%20and%20describe%20what%20is%20wrong%20with%20it.%0A%0A%3C!--%20Don%27t%20edit%20below%20this%20line%20--%3E%0A%0A%2Flabel%20~Documentation%20~%22docs%5C-comments%22%20" target="_blank">
-                <i class="fa fa-info-circle" aria-hidden="true"></i>
-                CREATE AN ISSUE
-              </a>
-            </div>
-          </div><!-- doc-issue-row -->
-          <%# Show comments only in production and on master branch (hide archives) %>
-          <% if @item[:comments].nil? && ENV['NANOC_ENV'] == 'production' && ENV['CI_COMMIT_REF_NAME'] == 'master' %>
-            <% unless @item.identifier.to_s.split('/')[1] == 'ce' %>
-              <div class="row" id="disqus-row"><!-- disqus-row-->
-                <div class="col-md-8 col-sm-12">
-                  <p>If you want to give <strong>quick and simple feeback</strong> on this doc
-                    <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
-                  </p>
-                </div>
-                <div id="disqus_thread" class="disqus-comments-gitlab">
-                  <div class="col-md-4 col-sm-12">
-                    <a href="#" role="button" class="comments-holder btn btn-default" onclick="loadDisqus();return false;">
-                      <i class="fa fa-comments-o" aria-hidden="true"></i>
-                      SHOW AND POST COMMENTS
-                    </a>
+            <div class="row" id="sales-row"><!-- gitlab-ultimate-row -->
+              <div class="col-md-8 col-sm-12">
+                <p>If you want to try all features available in <strong>GitLab self-managed</strong>
+                  <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
+                </p>
+              </div>
+              <div class="col-md-4 col-sm-12">
+                <a role="button" class="comments-holder btn btn-default" href="https://about.gitlab.com/free-trial/" target="_blank">
+                  <i class="fa fa-server" aria-hidden="true"></i>
+                  GITLAB ULTIMATE FREE-TRIAL
+                </a>
+              </div>
+            </div><!-- gitlab-ultimate-row -->
+          </div><!-- get-more-features tab -->
+
+          <div role="tabpanel" class="tab-pane active" id="docs-feedback"><!-- docs-feedback tab -->
+            <div class="row" id="edit-page-row"><!-- edit-page-row -->
+              <div class="col-md-8 col-sm-12">
+                <p>If you <strong>spot an error or a need for improvement</strong> and would like to <strong>fix it yourself</strong> in a merge request
+                  <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
+                </p>
+              </div>
+              <div class="col-md-4 col-sm-12">
+                <p>
+                  <a role="button" class="comments-holder btn btn-default" href="<%= edit_on_gitlab(@item) %>" target="_blank">
+                    <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
+                    EDIT THIS PAGE
+                  </a>
+                </p>
+              </div>
+            </div><!-- edit-page-row -->
+
+            <div class="row" id="doc-issue-row"><!-- doc-issue-row -->
+              <div class="col-md-8 col-sm-12">
+                <p>If you would like to <strong>suggest an improvement to this doc</strong>
+                  <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
+                </p>
+              </div>
+              <div class="col-md-4 col-sm-12">
+                <a role="button" class="comments-holder btn btn-default" href="https://gitlab.com/gitlab-org/gitlab-ce/issues/new?issue[title]=Docs%20feedback:%20Write%20your%20title&issue[description]=Link%20the%20doc%20and%20describe%20what%20is%20wrong%20with%20it.%0A%0A%3C!--%20Don%27t%20edit%20below%20this%20line%20--%3E%0A%0A%2Flabel%20~Documentation%20~%22docs%5C-comments%22%20" target="_blank">
+                  <i class="fa fa-info-circle" aria-hidden="true"></i>
+                  CREATE AN ISSUE
+                </a>
+              </div>
+            </div><!-- doc-issue-row -->
+            <%# Show comments only in production and on master branch (hide archives) %>
+            <% if @item[:comments].nil? && ENV['NANOC_ENV'] == 'production' && ENV['CI_COMMIT_REF_NAME'] == 'master' %>
+              <% unless @item.identifier.to_s.split('/')[1] == 'ce' %>
+                <div class="row" id="disqus-row"><!-- disqus-row-->
+                  <div class="col-md-8 col-sm-12">
+                    <p>If you want to give <strong>quick and simple feeback</strong> on this doc
+                      <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
+                    </p>
+                  </div>
+                  <div id="disqus_thread" class="disqus-comments-gitlab">
+                    <div class="col-md-4 col-sm-12">
+                      <a href="#" role="button" class="comments-holder btn btn-default" onclick="loadDisqus();return false;">
+                        <i class="fa fa-comments-o" aria-hidden="true"></i>
+                        SHOW AND POST COMMENTS
+                      </a>
+                    </div>
                   </div>
-                </div>
-              </div><!-- disqus-row-->
+                </div><!-- disqus-row-->
+              <% end %>
             <% end %>
-          <% end %>
-        </div><!-- docs-feedback tab -->
+          </div><!-- docs-feedback tab -->
+        </div>
       </div>
     </div>
   </div>
-</div>
-<script>
-  var disqus_config = function () {
-    this.page.url = '<%= @config[:base_url] %><%= @item.identifier.without_ext + '.html' %>';
-    this.page.title = '<%= @item.key?(:title) ? "#{item[:title]} - GitLab Documentation" : "GitLab Documentation" %>';
-  <% if @item[:redirect_from] %>
-    this.page.identifier = '<%= @item[:redirect_from] %>';
-  <% else %>
-    this.page.identifier = '<%= @config[:base_url] %><%= @item.identifier.without_ext + '.html' %>';
-  <% end %>
-  };
+  <script>
+    var disqus_config = function () {
+      this.page.url = '<%= @config[:base_url] %><%= @item.identifier.without_ext + '.html' %>';
+      this.page.title = '<%= @item.key?(:title) ? "#{item[:title]} - GitLab Documentation" : "GitLab Documentation" %>';
+    <% if @item[:redirect_from] %>
+      this.page.identifier = '<%= @item[:redirect_from] %>';
+    <% else %>
+      this.page.identifier = '<%= @config[:base_url] %><%= @item.identifier.without_ext + '.html' %>';
+    <% end %>
+    };
 
-  var is_disqus_loaded = false;
-  function loadDisqus() {
-    if (!is_disqus_loaded){
-      is_disqus_loaded = true;
-      var d = document, s = d.createElement('script');
-      s.src = 'https://gitlab-docs.disqus.com/embed.js';
-      s.setAttribute('data-timestamp', +new Date());
-      (d.head || d.body).appendChild(s);
-    }
-  };
-</script>
-<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
+    var is_disqus_loaded = false;
+    function loadDisqus() {
+      if (!is_disqus_loaded){
+        is_disqus_loaded = true;
+        var d = document, s = d.createElement('script');
+        s.src = 'https://gitlab-docs.disqus.com/embed.js';
+        s.setAttribute('data-timestamp', +new Date());
+        (d.head || d.body).appendChild(s);
+      }
+    };
+  </script>
+  <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
+<% end %>