Skip to content

Commit 7d4cd0a

Browse files
committed
Reverted Community changes on dev
Signed-off-by: Jimmy McArthur <[email protected]>
1 parent def512f commit 7d4cd0a

File tree

5 files changed

+156
-130
lines changed

5 files changed

+156
-130
lines changed

themes/openstack/css/community-bis.css

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
padding: 0 50px 50px 50px;
55
color: white;
66
font-size: 1.2em;
7-
margin-top: 50px;
87
}
98

109
.banner .banner-text-wrapper {
@@ -167,7 +166,7 @@
167166
}
168167

169168
.project-groups-selected .project-group-button-selected {
170-
width: 90%;
169+
width: 100%;
171170
background-color: #58a935;
172171
font-weight: bold;
173172
height: 45px;
@@ -203,15 +202,13 @@
203202
}
204203

205204
.project-button img {
206-
width: 65px;
205+
width: 100%;
207206
position: relative;
208-
top: -5px;
209-
left: -30px
207+
top: -10px;
210208
}
211209

212210
.project-button .code-name {
213211
position: relative;
214-
top: -6px;
215212
left: -20px;
216213
font-weight: bold;
217214
}
@@ -232,7 +229,7 @@
232229

233230
.where-to-start {
234231
padding: 50px;
235-
/*margin-top: 50px;*/
232+
margin-top: 50px;
236233
color: white;
237234
background-image: url('/themes/openstack/images/community/bg.png');
238235
}

themes/openstack/templates/Layout/CommunityPageBis.ss

Lines changed: 70 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
</div>
2-
<div class="where-to-start">
2+
<div class="banner">
33
<div class="container">
44
<div class="row">
5-
<div class="col-md-7 col-sm-6">
6-
<h2>Where should I start?</h2>
5+
<div class="col-md-4 col-xs-12 banner-img-wrapper pull-right">
6+
<img src="themes/openstack/images/community/rocket.png" />
7+
</div>
8+
<div class="col-md-8 col-xs-12 banner-text-wrapper pull-right">
9+
<h2>New to the community?</h2>
710
<p>
8-
OpenStack is a large community, and it can seem overwhelming when you don't know where to start.
9-
The best way to approach it is to get involved with a specific project, working group or local meetup.
11+
Then you are in the right place! There are lots of benefits to participation, including opportinities to influence the future of the project.
12+
Find out how to get started:
1013
</p>
11-
</div>
12-
<div class="col-md-5 col-sm-6 start-options">
13-
<a href="https://governance.openstack.org/tc/reference/help-most-needed.html" class="start-option btn">
14-
<i class="fa fa-check-square-o" aria-hidden="true"></i>
15-
<span>Areas where help is most needed</span>
16-
</a><br>
17-
<a href="https://docs.openstack.org/upstream-training/" class="start-option btn">
18-
<i class="fa fa-check-square-o" aria-hidden="true"></i>
19-
<span>Tutorials & Upstream Institute</span>
20-
</a><br>
21-
<a href="https://groups.openstack.org/" class="start-option btn">
22-
<i class="fa fa-check-square-o" aria-hidden="true"></i>
23-
<span>Find a local user group or attend an event</span>
14+
<a href="https://docs.openstack.org/contributors" target="_blank" class="banner-button btn btn-primary">
15+
Contributor Guide <i class="fa fa-chevron-circle-right fa-inverse" aria-hidden="true"></i>
2416
</a>
17+
<hr />
18+
<p>
19+
Already a contributor and looking for resources? <a href="/community/#quicklinks" class="bannerquicklinks">Skip to Quick Links</a>
20+
</p>
21+
2522
</div>
2623
</div>
2724
</div>
@@ -32,42 +29,42 @@
3229
Select the way you want to contribute...
3330
</div>
3431
<div class="row nav">
35-
<div class="col-md-5ths col-sm-6 col-xs-6 nav-button-box">
32+
<div class="col-md-5ths col-xs-6 nav-button-box">
3633
<a class="nav-button" data-toggle="collapse" data-target="#code" data-parent="#accordion-parent">
3734
<div class="nav-button-icon">
3835
<img src="themes/openstack/images/community/pencil.png" />
3936
</div>
4037
<div>Code & Documentation</div>
4138
</a>
4239
</div>
43-
<div class="col-md-5ths col-sm-6 col-xs-6 nav-button-box">
40+
<div class="col-md-5ths col-xs-6 nav-button-box">
4441
<a class="nav-button" data-toggle="collapse" data-target="#events" data-parent="#accordion-parent">
4542
<div class="nav-button-icon">
4643
<img src="themes/openstack/images/community/globe.png" />
4744
</div>
4845
<div>Events</div>
4946
</a>
5047
</div>
51-
<div class="col-md-5ths col-sm-6 col-xs-6 nav-button-box">
48+
<div class="col-md-5ths col-xs-6 nav-button-box">
5249
<a href="https://groups.openstack.org/" class="nav-button" target="_blank">
5350
<div class="nav-button-icon">
5451
<img src="themes/openstack/images/community/pin.png" />
5552
</div>
5653
<div>User Groups</div>
5754
</a>
5855
</div>
59-
<div class="col-md-5ths col-sm-6 col-xs-6 nav-button-box">
56+
<div class="col-md-5ths col-xs-6 nav-button-box">
6057
<a class="nav-button" data-toggle="collapse" data-target="#users" data-parent="#accordion-parent">
6158
<div class="nav-button-icon">
6259
<img src="themes/openstack/images/community/bulb.png" />
6360
</div>
6461
<div>Users</div>
6562
</a>
6663
</div>
67-
<div class="col-md-5ths col-sm-6 col-xs-6 nav-button-box">
64+
<div class="col-md-5ths col-xs-6 nav-button-box">
6865
<a class="nav-button" data-toggle="collapse" data-target="#sponsorship" data-parent="#accordion-parent">
6966
<div class="nav-button-icon">
70-
<img src="themes/openstack/images/community/book.png" />
67+
<img src="themes/openstack/images/community/book.png">
7168
</div>
7269
<div>Operators</div>
7370
</a>
@@ -95,37 +92,42 @@
9592
</div>
9693
</div>
9794
</div>
98-
<div class="banner">
95+
<div class="where-to-start">
9996
<div class="container">
10097
<div class="row">
101-
<div class="col-md-4 col-xs-12 banner-img-wrapper pull-right">
102-
<img src="themes/openstack/images/community/rocket.png" />
103-
</div>
104-
<div class="col-md-8 col-xs-12 banner-text-wrapper pull-right">
105-
<h2>New to the community?</h2>
98+
<div class="col-md-7 col-sm-6">
99+
<h2>Where should I start?</h2>
106100
<p>
107-
Then you are in the right place! There are lots of benefits to participation, including opportinities to influence the future of the project.
108-
Find out how to get started:
101+
OpenStack is a large community, and it can seem overwhelming when you don't know where to start.
102+
The best way to approach it is to get involved with a specific project, working group or local meetup.
109103
</p>
110-
<a href="https://docs.openstack.org/contributors" target="_blank" class="banner-button btn btn-primary">
111-
Contributor Guide <i class="fa fa-chevron-circle-right fa-inverse" aria-hidden="true"></i>
104+
</div>
105+
<div class="col-md-5 col-sm-6 start-options">
106+
<a href="https://governance.openstack.org/tc/reference/help-most-needed.html" class="start-option btn">
107+
<i class="fa fa-check-square-o" aria-hidden="true"></i>
108+
<span>Areas where help is most needed</span>
109+
</a><br>
110+
<a href="https://docs.openstack.org/upstream-training/" class="start-option btn">
111+
<i class="fa fa-check-square-o" aria-hidden="true"></i>
112+
<span>Tutorials & Upstream Institute</span>
113+
</a><br>
114+
<a href="https://groups.openstack.org/" class="start-option btn">
115+
<i class="fa fa-check-square-o" aria-hidden="true"></i>
116+
<span>Find a local user group or attend an event</span>
112117
</a>
113-
<hr />
114-
<p>
115-
Already a contributor and looking for resources? <a href="/community/#quicklinks" class="bannerquicklinks">Skip to Quick Links</a>
116-
</p>
117-
118118
</div>
119119
</div>
120120
</div>
121121
</div>
122+
122123
<div class="help">
123124
<div class="container">
124125
<div class="row">
125126
<div class="col-md-12 help-header">
126127
<div class="help-title">Don't worry! We're here to help.</div>
127128
<p>
128-
We want you to have a great experience. OpenStack Foundation staff are here to help you!
129+
We want you to have a great experience. OpenStack Foundation staff and volunteer ambassadors around
130+
the world are here to help you get plugged in and make an impact.
129131
</p>
130132
</div>
131133
<div class="col-md-12 help-managers">
@@ -149,6 +151,24 @@
149151
<% end_loop %>
150152
</div>
151153
</div>
154+
<div class="col-md-12 help-ambassadors">
155+
<h4>Global OpenStack Ambassadors</h4>
156+
<div class="row">
157+
<% loop $Ambassadors.Sort(Order) %>
158+
<div class="col-md-2 col-sm-3 col-xs-6 ambassador">
159+
<div class="profile-pic">
160+
$ProfilePhoto(130, true)
161+
</div>
162+
<p><strong>$FullName</strong><br/>
163+
$City, $Top.CountryName($Country)</p>
164+
<div class="ambassador-twitter-veil">
165+
<i class="fa fa-twitter" aria-hidden="true"></i><br>
166+
<span> @$TwitterName </span>
167+
</div>
168+
</div>
169+
<% end_loop %>
170+
</div>
171+
</div>
152172
</div>
153173
</div>
154174
</div>
@@ -172,9 +192,10 @@
172192
IRC channels (on Freenode)
173193
</div>
174194
<div>
175-
<a href="https://webchat.freenode.net/?channels=openstack">#openstack</a> (usage questions)<br/>
176-
<a href="https://webchat.freenode.net/?channels=openstack-dev">#openstack-dev</a> (development questions)<br/>
177-
<a href="https://webchat.freenode.net/?channels=openstack-infra">#openstack-infra</a> (project infrastructure)<br/>
195+
<a href="https://docs.openstack.org/contributors/common/irc.html" target="_blank">How to set up IRC</a>
196+
<a href="https://webchat.freenode.net/?channels=openstack" target="_blank">#openstack</a> (usage questions)<br/>
197+
<a href="https://webchat.freenode.net/?channels=openstack-dev" target="_blank">#openstack-dev</a> (development questions)<br/>
198+
<a href="https://webchat.freenode.net/?channels=openstack-infra" target="_blank">#openstack-infra</a> (project infrastructure)<br/>
178199
<a href="http://eavesdrop.openstack.org/">List of IRC meetings and channel logs</a>
179200
</div>
180201
</div>
@@ -183,11 +204,11 @@
183204
Mailing lists
184205
</div>
185206
<div>
186-
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack">OpenStack general list</a><br>
187-
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev">OpenStack development list</a><br>
188-
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-operators">OpenStack operators list</a><br>
189-
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-sigs">OpenStack Special Interest Groups list</a><br>
190-
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo">List of all available mailing-lists</a>
207+
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack" target="_blank">OpenStack general list</a><br>
208+
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev" target="_blank">OpenStack development list</a><br>
209+
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-operators" target="_blank">OpenStack operators list</a><br>
210+
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-sigs" target="_blank">OpenStack Special Interest Groups list</a><br>
211+
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo" target="_blank">List of all available mailing-lists</a>
191212
</div>
192213
</div>
193214
<div class="col-md-4 col-sm-6 communicate-item">
@@ -236,36 +257,6 @@
236257
</div>
237258
</div>
238259

239-
<div class="help">
240-
<div class="container">
241-
<div class="row">
242-
<div class="col-md-12 help-header">
243-
<div class="help-title">Don't worry! We're here to help.</div>
244-
<p>
245-
Our global volunteer ambassadors are here to help you get plugged in and make an impact.
246-
</p>
247-
</div>
248-
<div class="col-md-12 help-ambassadors">
249-
<h4>Global OpenStack Ambassadors</h4>
250-
<div class="row">
251-
<% loop $Ambassadors.Sort(Order) %>
252-
<div class="col-md-2 col-sm-3 col-xs-6 ambassador">
253-
<div class="profile-pic">
254-
$ProfilePhoto(130, true)
255-
</div>
256-
<p><strong>$FullName</strong><br/>
257-
$City, $Top.CountryName($Country)</p>
258-
<div class="ambassador-twitter-veil">
259-
<i class="fa fa-twitter" aria-hidden="true"></i><br>
260-
<span> @$TwitterName </span>
261-
</div>
262-
</div>
263-
<% end_loop %>
264-
</div>
265-
</div>
266-
</div>
267-
</div>
268-
</div>
269260

270261
<div class="quick-links">
271262
<div class="quick-links-banner">
@@ -310,7 +301,7 @@
310301
<a href="https://docs.openstack.org/project-team-guide/" target="_blank">Project team guide</a><br>
311302
<a href="https://governance.openstack.org/tc/goals/" target="_blank">Community-wide goals</a><br>
312303
<a href="http://specs.openstack.org/" target="_blank">Specs</a> and <a href="https://review.openstack.org/" target="_blank">Code reviews</a><br>
313-
<a href="http://codesearch.openstack.org/ target="_blank">Search all OpenStack code</a>
304+
<a href="http://codesearch.openstack.org/" target="_blank">Search all OpenStack code</a>
314305
</div>
315306
</div>
316307
<div class="col-md-3 col-sm-3 quick-links-item">

themes/openstack/templates/Layout/Includes/CommunityPageBisCode.ss

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,17 @@
3838
<% loop $OpenStackComponents() %>
3939
<div class="col-md-4 col-sm-6">
4040
<a class="project-button btn btn-success" href="https://docs.openstack.org/{$Slug}" >
41-
<div class="col-md-2 col-sm-2 col-xs-2">
42-
<img src="$Top.MascotImage($Slug)" />
43-
</div>
44-
<div class="col-md-8 col-sm-8 col-xs-8">
45-
<span class="code-name"> $CodeName </span><br>
46-
<span class="name"> $Name </span>
47-
</div>
48-
<div class="col-md-2 col-sm-2 col-xs-2">
49-
<i class="fa fa-angle-right" aria-hidden="true"></i>
41+
<div class="row">
42+
<div class="col-xs-3">
43+
<img src="$Top.MascotImage($Slug)" />
44+
</div>
45+
<div class="col-xs-7">
46+
<span class="code-name"> $CodeName </span><br>
47+
<span class="name"> $Name </span>
48+
</div>
49+
<div class="col-xs-2">
50+
<i class="fa fa-angle-right" aria-hidden="true"></i>
51+
</div>
5052
</div>
5153
</a>
5254
</div>
Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,40 @@
11
<div class="nav-first-group project-events row">
22
<div class="line"><div class="triangle"></div></div>
3-
<div class="col-md-12">
4-
<h4>Plug into the vibrant operators community:</h4>
3+
<div class="row">
4+
<div class="col-md-12">
5+
<h4>Plug into the vibrant operators community:</h4>
6+
</div>
57
</div>
6-
<div class="col-md-4 col-sm-4 nav-first-group-btn">
7-
<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.">
8-
Operator’s Mailing List
9-
<p>Join the conversation for those who are currently running OpenStack infrastructure.</p>
10-
</a>
8+
<div class="row">
9+
<div class="col-md-4 col-sm-4 nav-first-group-btn">
10+
<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.">
11+
Operator’s Mailing List
12+
<p>Join the conversation for those who are currently running OpenStack infrastructure.</p>
13+
</a>
14+
</div>
15+
<div class="col-md-4 col-sm-4 nav-first-group-btn">
16+
<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.">
17+
OpenStack Special Interest Groups
18+
<p>SIGs are teams that collaborate around common interests, whether it’s sharing knowledge or advocating for features upstream.</p>
19+
</a>
20+
</div>
21+
<div class="col-md-4 col-sm-4 nav-first-group-btn">
22+
<a class="btn btn-success" href="https://www.openstack.org/user-survey">
23+
OpenStack User Survey
24+
<p>This survey provides users an opportunity to influence the community and software direction.</p>
25+
</a>
26+
</div>
1127
</div>
12-
<div class="col-md-4 col-sm-4 nav-first-group-btn">
13-
<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.">
14-
OpenStack Special Interest Groups
15-
<p>SIGs are teams that collaborate around common interests, whether it’s sharing knowledge or advocating for features upstream.</p>
16-
</a>
28+
<div class="row">
29+
<div class="col-md-12">
30+
<h4>Resources for operators:</h4>
31+
</div>
32+
</div>
33+
<div class="row">
34+
<div class="col-md-4 col-sm-4 nav-first-group-btn">
35+
<a class="btn btn-success" href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-operators">
36+
Operators Mailing List
37+
</a>
38+
</div>
1739
</div>
1840
</div>

0 commit comments

Comments
 (0)