From b4364d8e8192d2316ab860323992681f0e8215b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sta=C5=84czak?= Date: Thu, 5 Jul 2018 18:19:19 +0200 Subject: [PATCH 1/7] Fix contribute link on About page closes #23 --- .gitignore | 3 +++ web/pages/about.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a8934f3fe..2e31a9c2a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ output/ id_rsa id_rsa.pub __pycache__ +web/.doit.db.bak +web/.doit.db.dat +web/.doit.db.dir diff --git a/web/pages/about.html b/web/pages/about.html index 8846dc753..5d8fa0c83 100644 --- a/web/pages/about.html +++ b/web/pages/about.html @@ -46,7 +46,7 @@

Get PlasmaPy

Get Involved

We need your help, every contribution is appreciated! - Check out our contribution guide to PlasmaPy. + Check out our contribution guide to PlasmaPy.

From 8df744f553cddf3a4db490c6a5783db2619219d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sta=C5=84czak?= Date: Thu, 5 Jul 2018 18:28:32 +0200 Subject: [PATCH 2/7] Add GitHub link --- web/conf.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/conf.py b/web/conf.py index 8d991bfc0..dec90a8e4 100644 --- a/web/conf.py +++ b/web/conf.py @@ -134,11 +134,12 @@ NAVIGATION_LINKS = { DEFAULT_LANG: ( + (PROJECT_REPOSITORY, "GitHub repository"), (( - ("/about", "About PlasmaPy"), - # ("/acknowledging", "Acknowledging"), - ("/conduct", "Code of Conduct") - ), "About"), + ("/about", "About PlasmaPy"), + # ("/acknowledging", "Acknowledging"), + ("/conduct", "Code of Conduct") + ), "About"), ("http://docs.plasmapy.org/", "Documentation"), # ("/quickstart", "Quickstart guide"), ("/contribute", "Contribute"), From 95c20b126c2937a29c7ba32273e6dc2026294e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sta=C5=84czak?= Date: Thu, 5 Jul 2018 18:39:49 +0200 Subject: [PATCH 3/7] Add chat, twitter and mailing list links --- web/conf.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/web/conf.py b/web/conf.py index dec90a8e4..dcbbb96b1 100644 --- a/web/conf.py +++ b/web/conf.py @@ -28,6 +28,11 @@ PROJECT_REPOSITORY = "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/PlasmaPy/PlasmaPy" BLOG_DESCRIPTION = "Webpage for PlasmaPy." # (translatable) +DOCS = "http://docs.plasmapy.org/" +RIOT = "https://riot.im/app/#/room/#plasmapy:openastronomy.org" +TWITTER = "https://twitter.com/plasmapy" +MAILING_LIST = "https://groups.google.com/forum/#!forum/plasmapy" + # Nikola is multilingual! # # Currently supported languages are: @@ -140,9 +145,15 @@ # ("/acknowledging", "Acknowledging"), ("/conduct", "Code of Conduct") ), "About"), - ("http://docs.plasmapy.org/", "Documentation"), + (DOCS, "Documentation"), # ("/quickstart", "Quickstart guide"), ("/contribute", "Contribute"), + + (( + (RIOT, "Chat"), + (TWITTER, "Twitter"), + (MAILING_LIST, "Mailing list"), + ), "Contact us!"), # ("/team", "Team"), ) } @@ -944,7 +955,7 @@ # A small copyright notice for the page footer (in HTML). # (translatable) -CONTENT_FOOTER = 'Contents © {date} {author} - {license} - Powered by Nikola' +CONTENT_FOOTER = 'Contents © {date} {author} - {license} - Twitter - Chat - Powered by Nikola' # Things that will be passed to CONTENT_FOOTER.format(). This is done # for translatability, as dicts are not formattable. Nikola will @@ -966,7 +977,9 @@ "repo": PROJECT_REPOSITORY, "author": BLOG_AUTHOR, "date": time.gmtime().tm_year, - "license": LICENSE + "license": LICENSE, + "twitter": TWITTER, + "riot": RIOT, } ) } From 7e069e572998b16a01b186a2fefca6cbdccde718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sta=C5=84czak?= Date: Thu, 5 Jul 2018 18:44:02 +0200 Subject: [PATCH 4/7] Add Acknowledging page as per main repository Closes #19 --- web/conf.py | 2 +- web/pages/acknowledging.md | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 web/pages/acknowledging.md diff --git a/web/conf.py b/web/conf.py index dcbbb96b1..8ee8fb9b0 100644 --- a/web/conf.py +++ b/web/conf.py @@ -142,7 +142,7 @@ (PROJECT_REPOSITORY, "GitHub repository"), (( ("/about", "About PlasmaPy"), - # ("/acknowledging", "Acknowledging"), + ("/acknowledging", "Acknowledging"), ("/conduct", "Code of Conduct") ), "About"), (DOCS, "Documentation"), diff --git a/web/pages/acknowledging.md b/web/pages/acknowledging.md new file mode 100644 index 000000000..774432643 --- /dev/null +++ b/web/pages/acknowledging.md @@ -0,0 +1,23 @@ +title: Acknowledging PlasmaPy +slug: acknowledging + +If you use PlasmaPy for a project resulting in a publication, we ask +that you cite the following reference +([BibTeX](https://zenodo.org/record/1238132/export/hx#.WvMkQK0cChc)): + +* PlasmaPy Community, Nicholas A. Murphy, Andrew J. Leonard, Dominik + Stańczak, Pawel M. Kozlowski, Samuel J. Langendorf, Colby C. Haggerty, + Jasper P. Beckers, Stuart J. Mumford, Tulasi N. Parashar, and Yi-Min + Huang. (2018, April). PlasmaPy: an open source community-developed + Python package for plasma physics. Zenodo. + http://doi.org/10.5281/zenodo.1238132 + +We provide the following standard acknowledgment with this citation that +you may use instead of a citation in the body of a paper. + +* This research made use of PlasmaPy, a community-developed open source + core Python package for plasma physics (PlasmaPy Community 2018). + +We highly encourage researchers to acknowledge the packages that +PlasmaPy depends on, including but not limited to Astropy, NumPy, and +SciPy. From 8c9d5b8b04fa284153a8b32a173b59a416952f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sta=C5=84czak?= Date: Thu, 5 Jul 2018 18:57:26 +0200 Subject: [PATCH 5/7] Add link to Ritiek website --- web/conf.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/web/conf.py b/web/conf.py index 8ee8fb9b0..a1a3c2083 100644 --- a/web/conf.py +++ b/web/conf.py @@ -32,6 +32,7 @@ RIOT = "https://riot.im/app/#/room/#plasmapy:openastronomy.org" TWITTER = "https://twitter.com/plasmapy" MAILING_LIST = "https://groups.google.com/forum/#!forum/plasmapy" +RITIEK = "https://ritiek.github.io/posts/" # Nikola is multilingual! # @@ -150,11 +151,15 @@ ("/contribute", "Contribute"), (( - (RIOT, "Chat"), - (TWITTER, "Twitter"), - (MAILING_LIST, "Mailing list"), + (RIOT, "Chat"), + (TWITTER, "Twitter"), + (MAILING_LIST, "Mailing list"), ), "Contact us!"), # ("/team", "Team"), + (( + (RITIEK, "GSoC 2018"), + ), "Google Summer of Code"), + ) } From 7cbc9ddd8cd9495331826f63d93d935c01337496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sta=C5=84czak?= Date: Thu, 5 Jul 2018 19:05:05 +0200 Subject: [PATCH 6/7] Link to newspage --- web/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/conf.py b/web/conf.py index a1a3c2083..ec4559796 100644 --- a/web/conf.py +++ b/web/conf.py @@ -143,6 +143,7 @@ (PROJECT_REPOSITORY, "GitHub repository"), (( ("/about", "About PlasmaPy"), + ("/", "PlasmaPy News"), ("/acknowledging", "Acknowledging"), ("/conduct", "Code of Conduct") ), "About"), From aed18ac68222c5a84206a7549fd9268887178144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sta=C5=84czak?= Date: Thu, 5 Jul 2018 19:38:17 +0200 Subject: [PATCH 7/7] Fix link to CoC --- web/pages/contribute.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/pages/contribute.md b/web/pages/contribute.md index 4223b1014..052c8bb58 100644 --- a/web/pages/contribute.md +++ b/web/pages/contribute.md @@ -66,7 +66,7 @@ one if necessary) to make sure there is no work duplication. You can find most of what you should know in the [Contributing Guide](http://docs.plasmapy.org/en/master/development/index.html). -Please note that PlasmaPy has a [Code of Conduct](CODE_OF_CONDUCT.md). +Please note that PlasmaPy has a [Code of Conduct](/conduct). Issues marked by the community as *help wanted* mean just that - either they're good contributions for outsiders or there's an issue in the ongoing work that