Skip to content

Commit

Permalink
Reverted Community changes on dev
Browse files Browse the repository at this point in the history 
Signed-off-by: Jimmy McArthur <jimmy@tipit.net>
  • Loading branch information
@jimmytipit
jimmytipit committed Aug 26, 2018
1 parent def512f commit 7d4cd0a
Show file tree
Hide file tree
Showing 5 changed files with 156 additions and 130 deletions.
11 changes: 4 additions & 7 deletions themes/openstack/css/community-bis.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
padding: 0 50px 50px 50px;
color: white;
font-size: 1.2em;
margin-top: 50px;
}

.banner .banner-text-wrapper {
Expand Down Expand Up @@ -167,7 +166,7 @@
}

.project-groups-selected .project-group-button-selected {
width: 90%;
width: 100%;
background-color: #58a935;
font-weight: bold;
height: 45px;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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');
}
Expand Down
149 changes: 70 additions & 79 deletions themes/openstack/templates/Layout/CommunityPageBis.ss
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -32,42 +29,42 @@
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" />
</div>
<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" />
</div>
<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" />
</div>
<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" />
</div>
<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>
Expand Down Expand Up @@ -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">
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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">
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
20 changes: 11 additions & 9 deletions themes/openstack/templates/Layout/Includes/CommunityPageBisCode.ss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
46 changes: 34 additions & 12 deletions themes/openstack/templates/Layout/Includes/CommunityPageBisSponsorship.ss
View file
Original file line number Diff line number Diff line change
@@ -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>
Loading

0 comments on commit 7d4cd0a

Please sign in to comment.