Skip to content

Commit d5fa16b

Browse files
datapythonistajorisvandenbossche
datapythonista
authored and
jorisvandenbossche
committed
WEB: Restructuring pages and navigation, styling and new footer (#28582)
1 parent ddba6cf commit d5fa16b

File tree

15 files changed

+206
-114
lines changed

15 files changed

+206
-114
lines changed

‎web/pandas/_templates/layout.html

+55-33
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,44 @@
2020
<link rel="stylesheet"
2121
href="{{ base_url }}{{ stylesheet }}">
2222
{% endfor %}
23+
<script src="https://kit.fontawesome.com/79e5369384.js" crossorigin="anonymous"></script>
2324
</head>
2425
<body>
2526
<header>
2627
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
27-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#nav-content" aria-controls="nav-content" aria-expanded="false" aria-label="Toggle navigation">
28-
<span class="navbar-toggler-icon"></span>
29-
</button>
28+
<div class="container">
29+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#nav-content" aria-controls="nav-content" aria-expanded="false" aria-label="Toggle navigation">
30+
<span class="navbar-toggler-icon"></span>
31+
</button>
3032

31-
{% if static.logo %}<a class="navbar-brand" href="{{ base_url }}/"><img alt="" src="{{ base_url }}{{ static.logo }}"/></a>{% endif %}
33+
{% if static.logo %}<a class="navbar-brand" href="{{ base_url }}/"><img alt="" src="{{ base_url }}{{ static.logo }}"/></a>{% endif %}
3234

33-
<div class="collapse navbar-collapse" id="nav-content">
34-
<ul class="navbar-nav">
35-
{% for item in navbar %}
36-
{% if not item.has_subitems %}
37-
<li class="nav-item">
38-
<a class="nav-link" href="{% if not item.target.startswith("http") %}{{ base_url }}{% endif %}{{ item.target }}">{{ item.name }}</a>
39-
</li>
40-
{% else %}
41-
<li class="nav-item dropdown">
42-
<a class="nav-link dropdown-toggle"
43-
data-toggle="dropdown"
44-
id="{{ item.slug }}"
45-
href="#"
46-
role="button"
47-
aria-haspopup="true"
48-
aria-expanded="false">{{ item.name }}</a>
49-
<div class="dropdown-menu" aria-labelledby="{{ item.slug }}">
50-
{% for subitem in item.target %}
51-
<a class="dropdown-item" href="{% if not subitem.target.startswith("http") %}{{ base_url }}{% endif %}{{ subitem.target }}">{{ subitem.name }}</a>
52-
{% endfor %}
53-
</div>
54-
</li>
55-
{% endif %}
56-
{% endfor %}
57-
</ul>
35+
<div class="collapse navbar-collapse" id="nav-content">
36+
<ul class="navbar-nav ml-auto">
37+
{% for item in navbar %}
38+
{% if not item.has_subitems %}
39+
<li class="nav-item">
40+
<a class="nav-link" href="{% if not item.target.startswith("http") %}{{ base_url }}{% endif %}{{ item.target }}">{{ item.name }}</a>
41+
</li>
42+
{% else %}
43+
<li class="nav-item dropdown">
44+
<a class="nav-link dropdown-toggle"
45+
data-toggle="dropdown"
46+
id="{{ item.slug }}"
47+
href="#"
48+
role="button"
49+
aria-haspopup="true"
50+
aria-expanded="false">{{ item.name }}</a>
51+
<div class="dropdown-menu" aria-labelledby="{{ item.slug }}">
52+
{% for subitem in item.target %}
53+
<a class="dropdown-item" href="{% if not subitem.target.startswith("http") %}{{ base_url }}{% endif %}{{ subitem.target }}">{{ subitem.name }}</a>
54+
{% endfor %}
55+
</div>
56+
</li>
57+
{% endif %}
58+
{% endfor %}
59+
</ul>
60+
</div>
5861
</div>
5962
</nav>
6063
</header>
@@ -64,11 +67,30 @@
6467
</div>
6568
</main>
6669
<footer class="container pt-4 pt-md-5 border-top">
67-
<p class="float-right">
68-
<a href="#">Back to top</a>
69-
</p>
70+
<ul class="list-inline social-buttons float-right">
71+
<li class="list-inline-item">
72+
<a href="https://twitter.com/pandas_dev/">
73+
<i class="fab fa-twitter"></i>
74+
</a>
75+
</li>
76+
<li class="list-inline-item">
77+
<a href="https://github.com/pandas-dev/pandas/">
78+
<i class="fab fa-github"></i>
79+
</a>
80+
</li>
81+
<li class="list-inline-item">
82+
<a href="https://stackoverflow.com/questions/tagged/pandas">
83+
<i class="fab fa-stack-overflow"></i>
84+
</a>
85+
</li>
86+
<li class="list-inline-item">
87+
<a href="https://pandas.discourse.group">
88+
<i class="fab fa-discourse"></i>
89+
</a>
90+
</li>
91+
</ul>
7092
<p>
71-
© 2009 - 2019, pandas team
93+
pandas is a fiscally sponsored project of <a href="https://numfocus.org">NumFOCUS</a>
7294
</p>
7395
</footer>
7496

‎web/pandas/community/citing.md renamed to ‎web/pandas/about/citing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Citing pandas
1+
# Citing and logo
22

3-
## Citing
3+
## Citing pandas
44

55
If you use _pandas_ for a scientific publication, we would appreciate citations to one of the following papers:
66

‎web/pandas/community/about.md renamed to ‎web/pandas/about/index.html

File renamed without changes.

‎web/pandas/community/roadmap.md renamed to ‎web/pandas/about/roadmap.md

File renamed without changes.

‎web/pandas/about/sponsors.md

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Sponsors
2+
3+
## NumFOCUS
4+
5+
![](https://numfocus.org/wp-content/uploads/2018/01/optNumFocus_LRG.png)
6+
7+
_pandas_ is a Sponsored Project of [NumFOCUS](https://numfocus.org/), a 501(c)(3) nonprofit charity in the United States.
8+
NumFOCUS provides _pandas_ with fiscal, legal, and administrative support to help ensure the
9+
health and sustainability of the project. Visit numfocus.org for more information.
10+
11+
Donations to _pandas_ are managed by NumFOCUS. For donors in the United States, your gift is tax-deductible
12+
to the extent provided by law. As with any donation, you should consult with your tax adviser about your particular tax situation.
13+
14+
## Tidelift
15+
16+
_pandas_ is part of the [Tidelift subscription](https://tidelift.com/subscription/pkg/pypi-pandas?utm_source=pypi-pandas&utm_medium=referral&utm_campaign=readme).
17+
You can support pandas by becoming a Tidelift subscriber.
18+
19+
## Institutional partners
20+
21+
Institutional Partners are companies and universities that support the project by employing contributors.
22+
Current Institutional Partners include:
23+
24+
<ul>
25+
{% for company in partners.active if company.employs %}
26+
<li><a href="{{ company.url }}">{{ company.name }}</a> ({{ company.employs }})</li>
27+
{% endfor %}
28+
</ul>
29+
30+
## In-kind sponsors
31+
32+
- [OVH](https://us.ovhcloud.com/): Hosting
33+
- [Indeed](https://opensource.indeedeng.io/): Logo and website design
34+
35+
## Past institutional partners
36+
37+
<ul>
38+
{% for company in partners.past %}
39+
<li><a href="{{ company.url }}">{{ company.name }}</a></li>
40+
{% endfor %}
41+
</ul>

‎web/pandas/community/team.md renamed to ‎web/pandas/about/team.md

+1-35
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,12 @@ If you want to support pandas development, you can find information in the [dona
3636
{% endfor %}
3737
</div>
3838

39-
## BDFL
39+
## Governance
4040

4141
Wes McKinney is the Benevolent Dictator for Life (BDFL).
4242

43-
## Governance
44-
4543
The project governance is available in the [project governance documents](https://github.com/pandas-dev/pandas-governance).
4644

47-
## NumFOCUS
48-
49-
![](https://numfocus.org/wp-content/uploads/2018/01/optNumFocus_LRG.png)
50-
51-
_pandas_ is a Sponsored Project of [NumFOCUS](https://numfocus.org/), a 501(c)(3) nonprofit charity in the United States.
52-
NumFOCUS provides _pandas_ with fiscal, legal, and administrative support to help ensure the
53-
health and sustainability of the project. Visit numfocus.org for more information.
54-
55-
Donations to _pandas_ are managed by NumFOCUS. For donors in the United States, your gift is tax-deductible
56-
to the extent provided by law. As with any donation, you should consult with your tax adviser about your particular tax situation.
57-
5845
## Code of conduct committee
5946

6047
<ul>
@@ -71,31 +58,10 @@ to the extent provided by law. As with any donation, you should consult with you
7158
{% endfor %}
7259
</ul>
7360

74-
## Institutional partners
75-
76-
<ul>
77-
{% for company in partners.active if company.employs %}
78-
<li><a href="{{ company.url }}">{{ company.name }}</a> ({{ company.employs }})</li>
79-
{% endfor %}
80-
</ul>
81-
82-
In-kind sponsors
83-
84-
- [Indeed](https://opensource.indeedeng.io/): Logo and website design
85-
- Can we find a donor for the hosting (website, benchmarks,...?)
86-
8761
## Emeritus maintainers
8862

8963
<ul>
9064
{% for person in maintainers.emeritus %}
9165
<li>{{ person }}</li>
9266
{% endfor %}
9367
</ul>
94-
95-
## Past institutional partners
96-
97-
<ul>
98-
{% for company in partners.past %}
99-
<li><a href="{{ company.url }}">{{ company.name }}</a></li>
100-
{% endfor %}
101-
</ul>

‎web/pandas/blog.html renamed to ‎web/pandas/community/blog.html

File renamed without changes.

‎web/pandas/community/coc.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Contributor Code of Conduct
1+
# Code of conduct
22

33
As contributors and maintainers of this project, and in the interest of
44
fostering an open and welcoming community, we pledge to respect all people who

‎web/pandas/community/ecosystem.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Pandas ecosystem
1+
# Ecosystem
22

33
Increasingly, packages are being built on top of pandas to address
44
specific needs in data preparation, analysis and visualization. This is

‎web/pandas/config.yml

+27-26
Original file line numberDiff line numberDiff line change
@@ -4,59 +4,60 @@ main:
44
ignore:
55
- _templates/layout.html
66
- config.yml
7-
- blog.html # blog will be added at a later stage
87
- try.md # the binder page will be added later
98
github_repo_url: pandas-dev/pandas
109
context_preprocessors:
1110
- pandas_web.Preprocessors.navbar_add_info
12-
# - pandas_web.Preprocessors.blog_add_posts
11+
- pandas_web.Preprocessors.blog_add_posts
1312
- pandas_web.Preprocessors.maintainers_add_info
1413
- pandas_web.Preprocessors.home_add_releases
1514
markdown_extensions:
1615
- toc
1716
- tables
1817
- fenced_code
1918
static:
20-
logo: # path to the logo when it's in the repo
19+
logo: # /static/img/pandas.svg
2120
css:
2221
- /static/css/pandas.css
2322
navbar:
24-
- name: "Install"
25-
target: /install.html
23+
- name: "About us"
24+
target:
25+
- name: "About pandas"
26+
target: /about/index.html
27+
- name: "Project roadmap"
28+
target: /about/roadmap.html
29+
- name: "Team"
30+
target: /about/team.html
31+
- name: "Sponsors"
32+
target: /about/sponsors.html
33+
- name: "Citing and logo"
34+
target: /about/citing.html
35+
- name: "Getting started"
36+
target: /getting_started.html
2637
- name: "Documentation"
2738
target:
28-
- name: "Getting started"
29-
target: /docs/getting_started/index.html
3039
- name: "User guide"
3140
target: /docs/user_guide/index.html
3241
- name: "API reference"
3342
target: /docs/reference/index.html
34-
- name: "Contributing to pandas"
35-
target: /docs/development/index.html
3643
- name: "Release notes"
3744
target: /docs/whatsnew/index.html
45+
- name: "Older versions"
46+
target: https://pandas.pydata.org/pandas-docs/version/
3847
- name: "Community"
3948
target:
40-
- name: "About pandas"
41-
target: /community/about.html
42-
- name: "Project roadmap"
43-
target: /community/roadmap.html
44-
- name: "Ecosystem"
45-
target: /community/ecosystem.html
49+
- name: "Blog"
50+
target: /community/blog.html
4651
- name: "Ask a question (StackOverflow)"
4752
target: https://stackoverflow.com/questions/tagged/pandas
48-
- name: "Discuss (mailing list)"
49-
target: https://groups.google.com/forum/#!forum/pydata
50-
- name: "Team"
51-
target: /community/team.html
52-
- name: "Code of Conduct"
53+
- name: "Discuss"
54+
target: https://pandas.discourse.group
55+
- name: "Code of conduct"
5356
target: /community/coc.html
54-
- name: "Citing pandas"
55-
target: /community/citing.html
56-
# - name: "Blog"
57-
# target: /blog.html
58-
- name: "Donate"
59-
target: /donate.html
57+
- name: "Ecosystem"
58+
target: /community/ecosystem.html
59+
- name: "Contribute"
60+
target: /contribute.html
6061
blog:
6162
num_posts: 8
6263
feed:

‎web/pandas/contribute.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Contribute to pandas
2+
3+
_pandas_ is and always will be **free**. To make the development sustainable, we need _pandas_ users, corporate
4+
or individual, to support the development by providing their time and money.
5+
6+
You can find more information about current developers in the [team page](about/team.html),
7+
and about current sponsors in the [sponsors page](about/sponsors.html).
8+
Financial contributions will mainly be used to advance in the [pandas roadmap](about/roadmap.html).
9+
10+
- If your **company or organization** is interested in helping make pandas better, please contact us at [[email protected]](mailto:[email protected])
11+
- If you want to contribute to _pandas_ with your **time**, please visit the [contributing page]({{ base_url }}/docs/development/index.html)
12+
- If you want to support _pandas_ with a **donation**, please use the [donations page](donate.html).

‎web/pandas/donate.md

-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
# Donate to pandas
22

3-
_pandas_ is and always will be **free**. To make de development sustainable, we need _pandas_ users, corporate
4-
or individual, to support the development by providing their time and money.
5-
6-
You can find more information about current developers and supporters in the [team page](community/team.html).
7-
Financial contributions will mainly be used to advance in the [pandas roadmap](community/roadmap.html).
8-
9-
- If your **company or organization** is interested in helping make pandas better, please contact us at [[email protected]](mailto:[email protected])
10-
- If you want to contribute to _pandas_ with your **time**, please visit the [contributing page]({{ base_url }}/docs/development/index.html)
11-
- If you want to support _pandas_ with a **donation**, please use the form below:
12-
13-
143
<div id="salsalabs-donate-container">
154
</div>
165
<script type="text/javascript"

‎web/pandas/install.md renamed to ‎web/pandas/getting_started.md

+25-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Installation instructions
1+
# Getting started
2+
3+
## Installation instructions
24

35
The next steps provides the easiest and recommended way to set up your
46
environment to use pandas. Other installation options can be found in
@@ -21,8 +23,29 @@ the [advanced installation page]({{ base_url}}/docs/install.html).
2123

2224
<img class="img-fluid" alt="" src="{{ base_url }}/static/img/install/pandas_import_and_version.png"/>
2325

24-
5. Now you are ready to use pandas you can write your code in the next cells.
26+
5. Now you are ready to use pandas, and you can write your code in the next cells.
2527

28+
## Tutorials
2629

2730
You can learn more about pandas in the [tutorials](#), and more about JupyterLab
2831
in the [JupyterLab documentation](https://jupyterlab.readthedocs.io/en/stable/user/interface.html).
32+
33+
## Books
34+
35+
The book we recommend to learn pandas is [Python for Data Analysis](https://amzn.to/2KI5JJw),
36+
by [Wes McKinney](https://wesmckinney.com/), creator of pandas.
37+
38+
<a href="https://amzn.to/2KI5JJw">
39+
<img alt="Python for Data Analysis" src="{{ base_url }}/static/img/pydata_book.gif"/>
40+
</a>
41+
42+
## Videos
43+
44+
<iframe width="560" height="315" frameborder="0"
45+
src="https://www.youtube.com/embed/_T8LGqJtuGc"
46+
allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
47+
allowfullscreen></iframe>
48+
49+
## Cheat sheet
50+
51+
[pandas cheat sheet](https://pandas.pydata.org/Pandas_Cheat_Sheet.pdf)

0 commit comments

Comments
 (0)