Skip to content

WEB: Restructuring pages and navigation, styling and new footer #28582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 26, 2019
Merged

WEB: Restructuring pages and navigation, styling and new footer #28582

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de3d9d4
More restructuring and styling
datapythonista Sep 23, 2019
358d5bc
Updating links to install
datapythonista Sep 23, 2019
66bec72
Fix typo in contribute.md
datapythonista Sep 26, 2019
cbc3a41
PR comments, adding Tidelift and renaming about/about to about/index
datapythonista Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 55 additions & 33 deletions web/pandas/_templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,41 +20,44 @@
<link rel="stylesheet"
href="{{ base_url }}{{ stylesheet }}">
{% endfor %}
<script src="https://kit.fontawesome.com/79e5369384.js" crossorigin="anonymous"></script>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My understanding is that loading stylesheets and JS should go at the bottom of the page, to not slow down the loading of the page content. Is that accurate?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I followed fontawesome instructions, I don't know if there is a reason to have it in the header, or it doesn't matter, but it's where they ask to add it.

Not an expert, but I'd say browsers load those asynchronously. I assumed that they were placed at the end to have the dom loaded when the code is executed. But my knowledge about web is outdated 10 years, so don't really know.

Thanks for catching the broken link, just fixed them.

</head>
<body>
<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#nav-content" aria-controls="nav-content" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="container">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#nav-content" aria-controls="nav-content" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

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

<div class="collapse navbar-collapse" id="nav-content">
<ul class="navbar-nav">
{% for item in navbar %}
{% if not item.has_subitems %}
<li class="nav-item">
<a class="nav-link" href="{% if not item.target.startswith("http") %}{{ base_url }}{% endif %}{{ item.target }}">{{ item.name }}</a>
</li>
{% else %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle"
data-toggle="dropdown"
id="{{ item.slug }}"
href="#"
role="button"
aria-haspopup="true"
aria-expanded="false">{{ item.name }}</a>
<div class="dropdown-menu" aria-labelledby="{{ item.slug }}">
{% for subitem in item.target %}
<a class="dropdown-item" href="{% if not subitem.target.startswith("http") %}{{ base_url }}{% endif %}{{ subitem.target }}">{{ subitem.name }}</a>
{% endfor %}
</div>
</li>
{% endif %}
{% endfor %}
</ul>
<div class="collapse navbar-collapse" id="nav-content">
<ul class="navbar-nav ml-auto">
{% for item in navbar %}
{% if not item.has_subitems %}
<li class="nav-item">
<a class="nav-link" href="{% if not item.target.startswith("http") %}{{ base_url }}{% endif %}{{ item.target }}">{{ item.name }}</a>
</li>
{% else %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle"
data-toggle="dropdown"
id="{{ item.slug }}"
href="#"
role="button"
aria-haspopup="true"
aria-expanded="false">{{ item.name }}</a>
<div class="dropdown-menu" aria-labelledby="{{ item.slug }}">
{% for subitem in item.target %}
<a class="dropdown-item" href="{% if not subitem.target.startswith("http") %}{{ base_url }}{% endif %}{{ subitem.target }}">{{ subitem.name }}</a>
{% endfor %}
</div>
</li>
{% endif %}
{% endfor %}
</ul>
</div>
</div>
</nav>
</header>
Expand All @@ -64,11 +67,30 @@
</div>
</main>
<footer class="container pt-4 pt-md-5 border-top">
<p class="float-right">
<a href="#">Back to top</a>
</p>
<ul class="list-inline social-buttons float-right">
<li class="list-inline-item">
<a href="https://twitter.com/pandas_dev/">
<i class="fab fa-twitter"></i>
</a>
</li>
<li class="list-inline-item">
<a href="https://github.com/pandas-dev/pandas/">
<i class="fab fa-github"></i>
</a>
</li>
<li class="list-inline-item">
<a href="https://stackoverflow.com/questions/tagged/pandas">
<i class="fab fa-stack-overflow"></i>
</a>
</li>
<li class="list-inline-item">
<a href="https://pandas.discourse.group">
<i class="fab fa-discourse"></i>
</a>
</li>
</ul>
<p>
© 2009 - 2019, pandas team
pandas is a fiscally sponsored project of <a href="https://numfocus.org">NumFOCUS</a>
</p>
</footer>

Expand Down
0 web/pandas/community/about.md → web/pandas/about/about.md
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions web/pandas/community/citing.md → web/pandas/about/citing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Citing pandas
# Citing and logo

## Citing
## Citing pandas

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

Expand Down
0 web/pandas/community/roadmap.md → web/pandas/about/roadmap.md
View file
Open in desktop
File renamed without changes.
33 changes: 33 additions & 0 deletions web/pandas/about/sponsors.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Sponsors

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is currently no mention of Tidelift? (here or on the donate or contribute pages)

(the current website has a very brief one: "You can support pandas by becoming a Tidelift subscriber." on the donate page

## NumFOCUS

![](https://numfocus.org/wp-content/uploads/2018/01/optNumFocus_LRG.png)

_pandas_ is a Sponsored Project of [NumFOCUS](https://numfocus.org/), a 501(c)(3) nonprofit charity in the United States.
NumFOCUS provides _pandas_ with fiscal, legal, and administrative support to help ensure the
health and sustainability of the project. Visit numfocus.org for more information.

Donations to _pandas_ are managed by NumFOCUS. For donors in the United States, your gift is tax-deductible
to the extent provided by law. As with any donation, you should consult with your tax adviser about your particular tax situation.

## Institutional partners

<ul>
{% for company in partners.active if company.employs %}
<li><a href="{{ company.url }}">{{ company.name }}</a> ({{ company.employs }})</li>
{% endfor %}
</ul>

## In-kind sponsors

- [OVH](https://us.ovhcloud.com/): Hosting
- [Indeed](https://opensource.indeedeng.io/): Logo and website design

## Past institutional partners

<ul>
{% for company in partners.past %}
<li><a href="{{ company.url }}">{{ company.name }}</a></li>
{% endfor %}
</ul>
36 changes: 1 addition & 35 deletions web/pandas/community/team.md → web/pandas/about/team.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,12 @@ If you want to support pandas development, you can find information in the [dona
{% endfor %}
</div>

## BDFL
## Governance

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

## Governance

The project governance is available in the [project governance documents](https://github.com/pandas-dev/pandas-governance).

## NumFOCUS

![](https://numfocus.org/wp-content/uploads/2018/01/optNumFocus_LRG.png)

_pandas_ is a Sponsored Project of [NumFOCUS](https://numfocus.org/), a 501(c)(3) nonprofit charity in the United States.
NumFOCUS provides _pandas_ with fiscal, legal, and administrative support to help ensure the
health and sustainability of the project. Visit numfocus.org for more information.

Donations to _pandas_ are managed by NumFOCUS. For donors in the United States, your gift is tax-deductible
to the extent provided by law. As with any donation, you should consult with your tax adviser about your particular tax situation.

## Code of conduct committee

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

## Institutional partners

<ul>
{% for company in partners.active if company.employs %}
<li><a href="{{ company.url }}">{{ company.name }}</a> ({{ company.employs }})</li>
{% endfor %}
</ul>

In-kind sponsors

- [Indeed](https://opensource.indeedeng.io/): Logo and website design
- Can we find a donor for the hosting (website, benchmarks,...?)

## Emeritus maintainers

<ul>
{% for person in maintainers.emeritus %}
<li>{{ person }}</li>
{% endfor %}
</ul>

## Past institutional partners

<ul>
{% for company in partners.past %}
<li><a href="{{ company.url }}">{{ company.name }}</a></li>
{% endfor %}
</ul>
0 web/pandas/blog.html → web/pandas/community/blog.html
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion web/pandas/community/coc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributor Code of Conduct
# Code of conduct

As contributors and maintainers of this project, and in the interest of
fostering an open and welcoming community, we pledge to respect all people who
Expand Down
2 changes: 1 addition & 1 deletion web/pandas/community/ecosystem.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Pandas ecosystem
# Ecosystem

Increasingly, packages are being built on top of pandas to address
specific needs in data preparation, analysis and visualization. This is
Expand Down
53 changes: 27 additions & 26 deletions web/pandas/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,59 +4,60 @@ main:
ignore:
- _templates/layout.html
- config.yml
- blog.html # blog will be added at a later stage
- try.md # the binder page will be added later
github_repo_url: pandas-dev/pandas
context_preprocessors:
- pandas_web.Preprocessors.navbar_add_info
# - pandas_web.Preprocessors.blog_add_posts
- pandas_web.Preprocessors.blog_add_posts
- pandas_web.Preprocessors.maintainers_add_info
- pandas_web.Preprocessors.home_add_releases
markdown_extensions:
- toc
- tables
- fenced_code
static:
logo: # path to the logo when it's in the repo
logo: # /static/img/pandas.svg
css:
- /static/css/pandas.css
navbar:
- name: "Install"
target: /install.html
- name: "About us"
target:
- name: "About pandas"
target: /about/about.html
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small nit: we could rename about/about.md to about/index.md? (the url would be a bit nicer I think)

- name: "Project roadmap"
target: /about/roadmap.html
- name: "Team"
target: /about/team.html
- name: "Sponsors"
target: /about/sponsors.html
- name: "Citing and logo"
target: /about/citing.html
- name: "Getting started"
target: /getting_started.html
- name: "Documentation"
target:
- name: "Getting started"
target: /docs/getting_started/index.html
- name: "User guide"
target: /docs/user_guide/index.html
- name: "API reference"
target: /docs/reference/index.html
- name: "Contributing to pandas"
target: /docs/development/index.html
- name: "Release notes"
target: /docs/whatsnew/index.html
- name: "Older versions"
target: https://pandas.pydata.org/pandas-docs/version/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this link does not work

- name: "Community"
target:
- name: "About pandas"
target: /community/about.html
- name: "Project roadmap"
target: /community/roadmap.html
- name: "Ecosystem"
target: /community/ecosystem.html
- name: "Blog"
target: /community/blog.html
- name: "Ask a question (StackOverflow)"
target: https://stackoverflow.com/questions/tagged/pandas
- name: "Discuss (mailing list)"
target: https://groups.google.com/forum/#!forum/pydata
- name: "Team"
target: /community/team.html
- name: "Code of Conduct"
- name: "Discuss"
target: https://pandas.discourse.group
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe wait until some decision is taken? (since this website is not yet officially live, also fine to keep)

- name: "Code of conduct"
target: /community/coc.html
- name: "Citing pandas"
target: /community/citing.html
# - name: "Blog"
# target: /blog.html
- name: "Donate"
target: /donate.html
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to keep some direct link in the menu to this page? (now it is only linked to from other pages)

- name: "Ecosystem"
target: /community/ecosystem.html
- name: "Contribute"
target: /contribute.html
blog:
num_posts: 8
feed:
Expand Down
12 changes: 12 additions & 0 deletions web/pandas/contribute.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Contribute to pandas

_pandas_ is and always will be **free**. To make de development sustainable, we need _pandas_ users, corporate
or individual, to support the development by providing their time and money.

You can find more information about current developers in the [team page](about/team.html),
and about current sponsors in the [sponsors page](about/sponsors.html).
Financial contributions will mainly be used to advance in the [pandas roadmap](about/roadmap.html).

- If your **company or organization** is interested in helping make pandas better, please contact us at [[email protected]](mailto:[email protected])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wondering: is this the best way to contact us? (we don't have that somewhere written now I think? But for sure we also don't have our "own" email address for pandas)

- If you want to contribute to _pandas_ with your **time**, please visit the [contributing page]({{ base_url }}/docs/development/index.html)
- If you want to support _pandas_ with a **donation**, please use the [donations page](donate.html).
11 changes: 0 additions & 11 deletions web/pandas/donate.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
# Donate to pandas

_pandas_ is and always will be **free**. To make de development sustainable, we need _pandas_ users, corporate
or individual, to support the development by providing their time and money.

You can find more information about current developers and supporters in the [team page](community/team.html).
Financial contributions will mainly be used to advance in the [pandas roadmap](community/roadmap.html).

- If your **company or organization** is interested in helping make pandas better, please contact us at [[email protected]](mailto:[email protected])
- If you want to contribute to _pandas_ with your **time**, please visit the [contributing page]({{ base_url }}/docs/development/index.html)
- If you want to support _pandas_ with a **donation**, please use the form below:


<div id="salsalabs-donate-container">
</div>
<script type="text/javascript"
Expand Down
27 changes: 25 additions & 2 deletions web/pandas/install.md → web/pandas/getting_started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Installation instructions
# Getting started

## Installation instructions

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

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

5. Now you are ready to use pandas you can write your code in the next cells.
5. Now you are ready to use pandas, and you can write your code in the next cells.

## Tutorials

You can learn more about pandas in the [tutorials](#), and more about JupyterLab
in the [JupyterLab documentation](https://jupyterlab.readthedocs.io/en/stable/user/interface.html).

## Books

The book we recommend to learn pandas is [Python for Data Analysis](https://amzn.to/2KI5JJw),
by [Wes McKinney](https://wesmckinney.com/), creator of pandas.

<a href="https://amzn.to/2KI5JJw">
<img alt="Python for Data Analysis" src="{{ base_url }}/static/img/pydata_book.gif"/>
</a>

## Videos

<iframe width="560" height="315" frameborder="0"
src="https://www.youtube.com/embed/_T8LGqJtuGc"
allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen></iframe>

## Cheat sheet

[pandas cheat sheet](https://pandas.pydata.org/Pandas_Cheat_Sheet.pdf)
4 changes: 2 additions & 2 deletions web/pandas/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h1>pandas</h1>
built on top of the <a href="http://www.python.org">Python</a> programming language.
</p>
<p>
<a class="btn btn-primary" href="{{ base_url }}/install.html">Install pandas now!</a>
<a class="btn btn-primary" href="{{ base_url }}/getting_started.html">Install pandas now!</a>
</p>
</section>

Expand All @@ -19,7 +19,7 @@ <h1>pandas</h1>
<h5>Getting started</h5>
<ul>
<!-- <li><a href="{{ base_url }}/try.html">Try pandas online</a></li> -->
<li><a href="{{ base_url }}/install.html">Install pandas</a></li>
<li><a href="{{ base_url }}/getting_started.html">Install pandas</a></li>
<li><a href="{{ base_url }}/docs/getting_started/index.html">Getting started</a></li>
</ul>
</div>
Expand Down
Loading