From 7d4cd0a6765bf3b89f2f37fe17db80c3bba4275f Mon Sep 17 00:00:00 2001
From: Jimmy McArthur <jimmy@tipit.net>
Date: Sun, 26 Aug 2018 17:51:28 -0500
Subject: [PATCH] Reverted Community changes on dev

Signed-off-by: Jimmy McArthur <jimmy@tipit.net>
---
 themes/openstack/css/community-bis.css        |  11 +-
 .../templates/Layout/CommunityPageBis.ss      | 149 ++++++++----------
 .../Layout/Includes/CommunityPageBisCode.ss   |  20 +--
 .../Includes/CommunityPageBisSponsorship.ss   |  46 ++++--
 .../Layout/Includes/CommunityPageBisUsers.ss  |  60 ++++---
 5 files changed, 156 insertions(+), 130 deletions(-)

diff --git a/themes/openstack/css/community-bis.css b/themes/openstack/css/community-bis.css
index fe6c3ac28..dce47d8c9 100644
--- a/themes/openstack/css/community-bis.css
+++ b/themes/openstack/css/community-bis.css
@@ -4,7 +4,6 @@
     padding: 0 50px 50px 50px;
     color: white;
     font-size: 1.2em;
-    margin-top: 50px;
 }
 
 .banner .banner-text-wrapper {
@@ -167,7 +166,7 @@
 }
 
 .project-groups-selected .project-group-button-selected {
-    width: 90%;
+    width: 100%;
     background-color: #58a935;
     font-weight: bold;
     height: 45px;
@@ -203,15 +202,13 @@
 }
 
 .project-button img {
-    width: 65px;
+    width: 100%;
     position: relative;
-    top: -5px;
-    left: -30px
+    top: -10px;
 }
 
 .project-button .code-name {
     position: relative;
-    top: -6px;
     left: -20px;
     font-weight: bold;
 }
@@ -232,7 +229,7 @@
 
 .where-to-start {
     padding: 50px;
-    /*margin-top: 50px;*/
+    margin-top: 50px;
     color: white;
     background-image: url('/themes/openstack/images/community/bg.png');
 }
diff --git a/themes/openstack/templates/Layout/CommunityPageBis.ss b/themes/openstack/templates/Layout/CommunityPageBis.ss
index eefa7777e..f19bbe0aa 100644
--- a/themes/openstack/templates/Layout/CommunityPageBis.ss
+++ b/themes/openstack/templates/Layout/CommunityPageBis.ss
@@ -1,27 +1,24 @@
 </div>
-<div class="where-to-start">
+<div class="banner">
     <div class="container">
         <div class="row">
-            <div class="col-md-7 col-sm-6">
-                <h2>Where should I start?</h2>
+            <div class="col-md-4 col-xs-12 banner-img-wrapper pull-right">
+                <img src="themes/openstack/images/community/rocket.png" />
+            </div>
+            <div class="col-md-8 col-xs-12 banner-text-wrapper pull-right">
+                <h2>New to the community?</h2>
                 <p>
-                    OpenStack is a large community, and it can seem overwhelming when you don't know where to start.
-                    The best way to approach it is to get involved with a specific project, working group or local meetup.
+                    Then you are in the right place! There are lots of benefits to participation, including opportinities to influence the future of the project.
+                    Find out how to get started:
                 </p>
-            </div>
-            <div class="col-md-5 col-sm-6 start-options">
-                <a href="https://governance.openstack.org/tc/reference/help-most-needed.html" class="start-option btn">
-                    <i class="fa fa-check-square-o" aria-hidden="true"></i>
-                    <span>Areas where help is most needed</span>
-                </a><br>
-                <a href="https://docs.openstack.org/upstream-training/" class="start-option btn">
-                    <i class="fa fa-check-square-o" aria-hidden="true"></i>
-                    <span>Tutorials & Upstream Institute</span>
-                </a><br>
-                <a href="https://groups.openstack.org/" class="start-option btn">
-                    <i class="fa fa-check-square-o" aria-hidden="true"></i>
-                    <span>Find a local user group or attend an event</span>
+                <a href="https://docs.openstack.org/contributors" target="_blank" class="banner-button btn btn-primary">
+                    Contributor Guide <i class="fa fa-chevron-circle-right fa-inverse" aria-hidden="true"></i>
                 </a>
+                <hr />
+                <p>
+                    Already a contributor and looking for resources? <a href="/community/#quicklinks" class="bannerquicklinks">Skip to Quick Links</a>
+                </p>
+                
             </div>
         </div>
     </div>
@@ -32,7 +29,7 @@
             Select the way you want to contribute...
         </div>
         <div class="row nav">
-            <div class="col-md-5ths col-sm-6 col-xs-6 nav-button-box">
+            <div class="col-md-5ths col-xs-6 nav-button-box">
                 <a class="nav-button" data-toggle="collapse" data-target="#code" data-parent="#accordion-parent">
                     <div class="nav-button-icon">
                         <img src="themes/openstack/images/community/pencil.png" />
@@ -40,7 +37,7 @@
                     <div>Code & Documentation</div>
                 </a>
             </div>
-            <div class="col-md-5ths col-sm-6 col-xs-6 nav-button-box">
+            <div class="col-md-5ths col-xs-6 nav-button-box">
                 <a class="nav-button" data-toggle="collapse" data-target="#events" data-parent="#accordion-parent">
                     <div class="nav-button-icon">
                         <img src="themes/openstack/images/community/globe.png" />
@@ -48,7 +45,7 @@
                     <div>Events</div>
                 </a>
             </div>
-            <div class="col-md-5ths col-sm-6 col-xs-6 nav-button-box">
+            <div class="col-md-5ths col-xs-6 nav-button-box">
                 <a href="https://groups.openstack.org/" class="nav-button" target="_blank">
                     <div class="nav-button-icon">
                         <img src="themes/openstack/images/community/pin.png" />
@@ -56,7 +53,7 @@
                     <div>User Groups</div>
                 </a>
             </div>
-            <div class="col-md-5ths col-sm-6 col-xs-6 nav-button-box">
+            <div class="col-md-5ths col-xs-6 nav-button-box">
                 <a class="nav-button" data-toggle="collapse" data-target="#users" data-parent="#accordion-parent">
                     <div class="nav-button-icon">
                         <img src="themes/openstack/images/community/bulb.png" />
@@ -64,10 +61,10 @@
                     <div>Users</div>
                 </a>
             </div>
-            <div class="col-md-5ths col-sm-6 col-xs-6 nav-button-box">
+            <div class="col-md-5ths col-xs-6 nav-button-box">
                 <a class="nav-button" data-toggle="collapse" data-target="#sponsorship" data-parent="#accordion-parent">
                     <div class="nav-button-icon">
-                        <img src="themes/openstack/images/community/book.png" />
+                        <img src="themes/openstack/images/community/book.png">
                     </div>
                     <div>Operators</div>
                 </a>
@@ -95,37 +92,42 @@
         </div>
     </div>
 </div>
-<div class="banner">
+<div class="where-to-start">
     <div class="container">
         <div class="row">
-            <div class="col-md-4 col-xs-12 banner-img-wrapper pull-right">
-                <img src="themes/openstack/images/community/rocket.png" />
-            </div>
-            <div class="col-md-8 col-xs-12 banner-text-wrapper pull-right">
-                <h2>New to the community?</h2>
+            <div class="col-md-7 col-sm-6">
+                <h2>Where should I start?</h2>
                 <p>
-                    Then you are in the right place! There are lots of benefits to participation, including opportinities to influence the future of the project.
-                    Find out how to get started:
+                    OpenStack is a large community, and it can seem overwhelming when you don't know where to start.
+                    The best way to approach it is to get involved with a specific project, working group or local meetup.
                 </p>
-                <a href="https://docs.openstack.org/contributors" target="_blank" class="banner-button btn btn-primary">
-                    Contributor Guide <i class="fa fa-chevron-circle-right fa-inverse" aria-hidden="true"></i>
+            </div>
+            <div class="col-md-5 col-sm-6 start-options">
+                <a href="https://governance.openstack.org/tc/reference/help-most-needed.html" class="start-option btn">
+                    <i class="fa fa-check-square-o" aria-hidden="true"></i>
+                    <span>Areas where help is most needed</span>
+                </a><br>
+                <a href="https://docs.openstack.org/upstream-training/" class="start-option btn">
+                    <i class="fa fa-check-square-o" aria-hidden="true"></i>
+                    <span>Tutorials & Upstream Institute</span>
+                </a><br>
+                <a href="https://groups.openstack.org/" class="start-option btn">
+                    <i class="fa fa-check-square-o" aria-hidden="true"></i>
+                    <span>Find a local user group or attend an event</span>
                 </a>
-                <hr />
-                <p>
-                    Already a contributor and looking for resources? <a href="/community/#quicklinks" class="bannerquicklinks">Skip to Quick Links</a>
-                </p>
-                
             </div>
         </div>
     </div>
 </div>
+
 <div class="help">
     <div class="container">
         <div class="row">
             <div class="col-md-12 help-header">
                 <div class="help-title">Don't worry! We're here to help.</div>
                 <p>
-                    We want you to have a great experience. OpenStack Foundation staff are here to help you!
+                    We want you to have a great experience. OpenStack Foundation staff and volunteer ambassadors around
+                    the world are here to help you get plugged in and make an impact.
                 </p>
             </div>
             <div class="col-md-12 help-managers">
@@ -149,6 +151,24 @@
                 <% end_loop %>
                 </div>
             </div>
+            <div class="col-md-12 help-ambassadors">
+                <h4>Global OpenStack Ambassadors</h4>
+                <div class="row">
+                <% loop $Ambassadors.Sort(Order) %>
+                    <div class="col-md-2 col-sm-3 col-xs-6 ambassador">
+                        <div class="profile-pic">
+                            $ProfilePhoto(130, true)
+                        </div>
+                        <p><strong>$FullName</strong><br/>
+                        $City, $Top.CountryName($Country)</p>
+                        <div class="ambassador-twitter-veil">
+                            <i class="fa fa-twitter" aria-hidden="true"></i><br>
+                            <span> @$TwitterName </span>
+                        </div>
+                    </div>
+                <% end_loop %>
+                </div>
+            </div>
         </div>
     </div>
 </div>
@@ -172,9 +192,10 @@
                     IRC channels (on Freenode)
                 </div>
                 <div>
-                    <a href="https://webchat.freenode.net/?channels=openstack">#openstack</a> (usage questions)<br/>
-                    <a href="https://webchat.freenode.net/?channels=openstack-dev">#openstack-dev</a> (development questions)<br/>
-                    <a href="https://webchat.freenode.net/?channels=openstack-infra">#openstack-infra</a> (project infrastructure)<br/>
+                    <a href="https://docs.openstack.org/contributors/common/irc.html" target="_blank">How to set up IRC</a>
+                    <a href="https://webchat.freenode.net/?channels=openstack" target="_blank">#openstack</a> (usage questions)<br/>
+                    <a href="https://webchat.freenode.net/?channels=openstack-dev" target="_blank">#openstack-dev</a> (development questions)<br/>
+                    <a href="https://webchat.freenode.net/?channels=openstack-infra" target="_blank">#openstack-infra</a> (project infrastructure)<br/>
                     <a href="http://eavesdrop.openstack.org/">List of IRC meetings and channel logs</a>
                 </div>
             </div>
@@ -183,11 +204,11 @@
                     Mailing lists
                 </div>
                 <div>
-                    <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack">OpenStack general list</a><br>
-                    <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev">OpenStack development list</a><br>
-                    <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-operators">OpenStack operators list</a><br>
-                    <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-sigs">OpenStack Special Interest Groups list</a><br>
-                    <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo">List of all available mailing-lists</a>
+                    <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack" target="_blank">OpenStack general list</a><br>
+                    <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev" target="_blank">OpenStack development list</a><br>
+                    <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-operators" target="_blank">OpenStack operators list</a><br>
+                    <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-sigs" target="_blank">OpenStack Special Interest Groups list</a><br>
+                    <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo" target="_blank">List of all available mailing-lists</a>
                 </div>
             </div>
             <div class="col-md-4 col-sm-6 communicate-item">
@@ -236,36 +257,6 @@
     </div>
 </div>
 
-<div class="help">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-12 help-header">
-                <div class="help-title">Don't worry! We're here to help.</div>
-                <p>
-                    Our global volunteer ambassadors are here to help you get plugged in and make an impact.
-                </p>
-            </div>
-            <div class="col-md-12 help-ambassadors">
-                <h4>Global OpenStack Ambassadors</h4>
-                <div class="row">
-                <% loop $Ambassadors.Sort(Order) %>
-                    <div class="col-md-2 col-sm-3 col-xs-6 ambassador">
-                        <div class="profile-pic">
-                            $ProfilePhoto(130, true)
-                        </div>
-                        <p><strong>$FullName</strong><br/>
-                        $City, $Top.CountryName($Country)</p>
-                        <div class="ambassador-twitter-veil">
-                            <i class="fa fa-twitter" aria-hidden="true"></i><br>
-                            <span> @$TwitterName </span>
-                        </div>
-                    </div>
-                <% end_loop %>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
 
 <div class="quick-links">
     <div class="quick-links-banner">
@@ -310,7 +301,7 @@
                     <a href="https://docs.openstack.org/project-team-guide/" target="_blank">Project team guide</a><br>
                     <a href="https://governance.openstack.org/tc/goals/" target="_blank">Community-wide goals</a><br>
                     <a href="http://specs.openstack.org/" target="_blank">Specs</a> and <a href="https://review.openstack.org/" target="_blank">Code reviews</a><br>
-                    <a href="http://codesearch.openstack.org/ target="_blank">Search all OpenStack code</a>
+                    <a href="http://codesearch.openstack.org/" target="_blank">Search all OpenStack code</a>
                 </div>
             </div>
             <div class="col-md-3 col-sm-3 quick-links-item">
diff --git a/themes/openstack/templates/Layout/Includes/CommunityPageBisCode.ss b/themes/openstack/templates/Layout/Includes/CommunityPageBisCode.ss
index 34e26f5c5..9d525ef26 100644
--- a/themes/openstack/templates/Layout/Includes/CommunityPageBisCode.ss
+++ b/themes/openstack/templates/Layout/Includes/CommunityPageBisCode.ss
@@ -38,15 +38,17 @@
         <% loop $OpenStackComponents() %>
             <div class="col-md-4 col-sm-6">
                 <a class="project-button btn btn-success" href="https://docs.openstack.org/{$Slug}" >
-                    <div class="col-md-2 col-sm-2 col-xs-2">
-                        <img src="$Top.MascotImage($Slug)" />
-                    </div>
-                    <div class="col-md-8 col-sm-8 col-xs-8">
-                        <span class="code-name"> $CodeName </span><br>
-                        <span class="name"> $Name </span>
-                    </div>
-                    <div class="col-md-2 col-sm-2 col-xs-2">
-                        <i class="fa fa-angle-right" aria-hidden="true"></i>
+                    <div class="row">
+                        <div class="col-xs-3">
+                            <img src="$Top.MascotImage($Slug)" />
+                        </div>
+                        <div class="col-xs-7">
+                            <span class="code-name"> $CodeName </span><br>
+                            <span class="name"> $Name </span>
+                        </div>
+                        <div class="col-xs-2">
+                            <i class="fa fa-angle-right" aria-hidden="true"></i>
+                        </div>
                     </div>
                 </a>
             </div>
diff --git a/themes/openstack/templates/Layout/Includes/CommunityPageBisSponsorship.ss b/themes/openstack/templates/Layout/Includes/CommunityPageBisSponsorship.ss
index 00544bcc3..f87a9178b 100644
--- a/themes/openstack/templates/Layout/Includes/CommunityPageBisSponsorship.ss
+++ b/themes/openstack/templates/Layout/Includes/CommunityPageBisSponsorship.ss
@@ -1,18 +1,40 @@
 <div class="nav-first-group project-events row">
     <div class="line"><div class="triangle"></div></div>
-    <div class="col-md-12">
-        <h4>Plug into the vibrant operators community:</h4>
+    <div class="row">
+        <div class="col-md-12">
+            <h4>Plug into the vibrant operators community:</h4>
+        </div>
     </div>
-    <div class="col-md-4 col-sm-4 nav-first-group-btn">
-        <a class="btn btn-success" href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-operators" title="Join the conversation for those who are currently running OpenStack infrastructure.">
-            Operator’s Mailing List
-            <p>Join the conversation for those who are currently running OpenStack infrastructure.</p>
-        </a>
+    <div class="row">
+        <div class="col-md-4 col-sm-4 nav-first-group-btn">
+            <a class="btn btn-success" href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-operators" title="Join the conversation for those who are currently running OpenStack infrastructure.">
+                Operator’s Mailing List
+                <p>Join the conversation for those who are currently running OpenStack infrastructure.</p>
+            </a>
+        </div>
+        <div class="col-md-4 col-sm-4 nav-first-group-btn">
+            <a class="btn btn-success" href="https://governance.openstack.org/sigs/" title="SIGs are teams that collaborate around common interests, whether it’s sharing knowledge or advocating for features upstream.">
+                OpenStack Special Interest Groups
+                <p>SIGs are teams that collaborate around common interests, whether it’s sharing knowledge or advocating for features upstream.</p>
+            </a>
+        </div>
+        <div class="col-md-4 col-sm-4 nav-first-group-btn">
+            <a class="btn btn-success" href="https://www.openstack.org/user-survey">
+                OpenStack User Survey
+                <p>This survey provides users an opportunity to influence the community and software direction.</p>
+            </a>
+        </div>
     </div>
-    <div class="col-md-4 col-sm-4 nav-first-group-btn">
-        <a class="btn btn-success" href="https://governance.openstack.org/sigs/" title="SIGs are teams that collaborate around common interests, whether it’s sharing knowledge or advocating for features upstream.">
-            OpenStack Special Interest Groups
-            <p>SIGs are teams that collaborate around common interests, whether it’s sharing knowledge or advocating for features upstream.</p>
-        </a>
+    <div class="row">
+        <div class="col-md-12">
+            <h4>Resources for operators:</h4>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-4 col-sm-4 nav-first-group-btn">
+            <a class="btn btn-success" href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-operators">
+                Operators Mailing List
+            </a>
+        </div>
     </div>
 </div>
diff --git a/themes/openstack/templates/Layout/Includes/CommunityPageBisUsers.ss b/themes/openstack/templates/Layout/Includes/CommunityPageBisUsers.ss
index 372d9b854..8b2c77aa3 100644
--- a/themes/openstack/templates/Layout/Includes/CommunityPageBisUsers.ss
+++ b/themes/openstack/templates/Layout/Includes/CommunityPageBisUsers.ss
@@ -1,30 +1,44 @@
 <div class="nav-first-group project-events row">
     <div class="line"><div class="triangle"></div></div>
-    <div class="col-md-12">
-        <h4>Plug into the vibrant user community:</h4>
+    <div class="row">
+        <div class="col-md-12">
+            <h4>Plug into the vibrant user community:</h4>
+        </div>
     </div>
-    <div class="col-md-4 col-sm-4 nav-first-group-btn">
-        <a class="btn btn-success" href="https://www.openstack.org/foundation/user-committee/" title="The User Committee is elected by the community and meets weekly in IRC and via their mailing list.">
-            User Committee
-            <p>The User Committee is elected by the community and meets weekly in IRC and via their mailing list.</p>
-        </a>
+    <div class="row">
+        <div class="col-md-4 col-sm-4 nav-first-group-btn">
+            <a class="btn btn-success" href="https://www.openstack.org/foundation/user-committee/" title="The User Committee is elected by the community and meets weekly in IRC and via their mailing list.">
+                User Committee
+                <p>The User Committee is elected by the community and meets weekly in IRC and via their mailing list.</p>
+            </a>
+        </div>
+        <div class="col-md-4 col-sm-4 nav-first-group-btn">
+            <a class="btn btn-success" href="https://www.openstack.org/user-survey">
+                OpenStack User Survey
+                <p>This survey provides users an opportunity to influence the community and software direction.</p>
+            </a>
+        </div>
     </div>
-    <div class="col-md-12">
-        <h4>Resources for users:</h4>
+    <div class="row">
+        <div class="col-md-12">
+            <h4>Resources for users:</h4>
+        </div>
     </div>
-    <div class="col-md-4 col-sm-4 nav-first-group-btn">
-        <a class="btn btn-success" href="https://developer.openstack.org/api-guide/quick-start/">
-            API Guide
-        </a>
-    </div>
-    <div class="col-md-4 col-sm-4 nav-first-group-btn">
-        <a class="btn btn-success" href="https://www.openstack.org/software/sample-configs#compute-starter-kit">
-            Sample Configurations
-        </a>
-    </div>
-    <div class="col-md-4 col-sm-4 nav-first-group-btn">
-        <a class="btn btn-success" href="http://superuser.openstack.org">
-            SuperUser Magazine
-        </a>
+    <div class="row">
+        <div class="col-md-4 col-sm-4 nav-first-group-btn">
+            <a class="btn btn-success" href="https://developer.openstack.org/api-guide/quick-start/">
+                API Guide
+            </a>
+        </div>
+        <div class="col-md-4 col-sm-4 nav-first-group-btn">
+            <a class="btn btn-success" href="https://www.openstack.org/software/sample-configs#compute-starter-kit">
+                Sample Configurations
+            </a>
+        </div>
+        <div class="col-md-4 col-sm-4 nav-first-group-btn">
+            <a class="btn btn-success" href="http://superuser.openstack.org">
+                SuperUser Magazine
+            </a>
+        </div>
     </div>
 </div>