Add Sales button to feedback layout

Also:
- Rename section from "Your feedback is important" to "Help and feedback"
- Switch the order of the first two tabs so the Docs one is first
- Change "Get Help" tab name to Questions
- Add id to "Help and feedback"

1 files changed, 42 insertions, 26 deletions

diff --git a/layouts/feedback.html b/layouts/feedback.html
index 1ef7e5d2..6e164799 100644
--- a/layouts/feedback.html
+++ b/layouts/feedback.html
@@ -1,23 +1,24 @@
 <div class="comments">
   <div class="comments-filter">
-    <h2>
-      <i class="fa fa-star-half-o" aria-hidden="true"></i> 
-      Your feedback is important!
+    <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" title="Permalink"></a>
     </h2>
     <div>
       <!-- Nav tabs -->
       <ul class="nav nav-tabs" role="tablist">
-        <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> 
-          FEEDBACK ON THE <strong>PRODUCT</strong></a>
-        </li>
         <li role="presentation"><a href="#docs-feedback" aria-controls="docs-feedback" role="tab" data-toggle="tab">
-          <i class="fa fa-file-text-o" aria-hidden="true"></i> 
+          <i class="fa fa-file-text-o" aria-hidden="true"></i>
           FEEDBACK ON THE <strong>DOCS</strong></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>
+          FEEDBACK ON THE <strong>PRODUCT</strong></a>
+        </li>
         <li role="presentation"><a href="#support" aria-controls="support" role="tab" data-toggle="tab">
-          <i class="fa fa-question-circle" aria-hidden="true"></i> 
-          GET <strong>HELP</strong></a>
+          <i class="fa fa-question-circle" aria-hidden="true"></i>
+          QUESTIONS</a>
         </li>
       </ul>
 
@@ -32,7 +33,7 @@
             </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> 
+                <i class="fa fa-info-circle" aria-hidden="true"></i>
                 CREATE AN ISSUE
               </a>
             </div>
@@ -45,7 +46,7 @@
             </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> 
+                <i class="fa fa-plus-circle" aria-hidden="true"></i>
                 SUBMIT FEATURE PROPOSAL
               </a>
             </div>
@@ -61,7 +62,7 @@
             </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> 
+                <i class="fa fa-search" aria-hidden="true"></i>
                 SEARCH THE DOCS
               </a>
             </div>
@@ -69,15 +70,15 @@
 
           <div class="row"><!-- row4 -->
             <div class="col-md-8 col-sm-12">
-              <p>If you want help with something very <strong>specific to your use case</strong>, 
+              <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">
               <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 THE GITLAB FORUM
+                <i class="fa fa-users" aria-hidden="true"></i>
+                POST ON GITLAB FORUM
               </a>
             </div>
           </div><!-- row4 -->
@@ -90,15 +91,30 @@
             </div>
             <div class="col-md-4 col-sm-12">
               <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> 
+                <i class="fa fa-user-circle-o" aria-hidden="true"></i>
                 REQUEST SUPPORT
               </a>
             </div>
           </div><!-- row5 -->
+
+          <div class="row"><!-- row6 -->
+            <div class="col-md-8 col-sm-12">
+              <p>If you have questions about the <a href="https://about.gitlab.com/features/" target="_blank">features</a>
+                 or <a href="https://about.gitlab.com/pricing/" target="_blank">pricing</a> of GitLab's paid tiers
+                <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/sales/" target="_blank">
+                <i class="fa fa-envelope-o" aria-hidden="true"></i>
+                CONTACT SALES
+              </a>
+            </div>
+          </div><!-- row6 -->
         </div><!-- support -->
 
         <div role="tabpanel" class="tab-pane" id="docs-feedback"><!-- docs-feedback -->
-          <div class="row"><!-- row6 -->
+          <div class="row"><!-- row7 -->
             <div class="col-md-8 col-sm-12">
               <p>If you <strong>spot an error</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>
@@ -106,13 +122,13 @@
             </div>
             <div class="col-md-4 col-sm-12">
               <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> 
+                <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
                 EDIT THIS PAGE
               </a>
             </div>
-          </div><!-- row6 -->
+          </div><!-- row7 -->
 
-          <div class="row"><!-- row7 -->
+          <div class="row"><!-- row8 -->
             <div class="col-md-8 col-sm-12">
               <p>If this <strong>document is confusing or unclear</strong>
                 <i class="fa fa-arrow-right black-icon" aria-hidden="true"></i>
@@ -120,15 +136,15 @@
             </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> 
+                <i class="fa fa-info-circle" aria-hidden="true"></i>
                 CREATE AN ISSUE
               </a>
             </div>
-          </div><!-- row7 -->
+          </div><!-- row8 -->
           <%# 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"><!-- row8-->
+              <div class="row"><!-- row9-->
                 <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>
@@ -137,12 +153,12 @@
                 <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> 
+                      <i class="fa fa-comments-o" aria-hidden="true"></i>
                       SHOW AND POST COMMENTS
                     </a>
                   </div>
                 </div>
-              </div><!-- row8-->
+              </div><!-- row9-->
             <% end %>
           <%# end %>
         </div><!-- docs-feedback -->