From cdd44825efd4ded022ac71161f87ff758f1bcaca Mon Sep 17 00:00:00 2001 From: geraint Date: Wed, 16 Sep 2015 16:08:08 +0100 Subject: [PATCH 001/161] Moving everything so that it will be served correctly --- .gitignore | 3 +++ blog/_config.yml => _config.yml | 0 {blog/_includes => _includes}/footer.html | 0 {blog/_includes => _includes}/head.html | 0 {blog/_includes => _includes}/header.html | 0 {blog/_layouts => _layouts}/default.html | 0 {blog/_layouts => _layouts}/page.html | 0 {blog/_layouts => _layouts}/post.html | 0 {blog/_posts => _posts}/2015-09-16-welcome-to-pydiff.md | 0 {blog/_sass => _sass}/_base.scss | 0 {blog/_sass => _sass}/_layout.scss | 0 {blog/_sass => _sass}/_syntax-highlighting.scss | 0 blog/about.md => about.md | 0 blog/.gitignore | 2 -- {blog/css => css}/main.scss | 0 blog/feed.xml => feed.xml | 0 blog/index.html => index.html | 0 17 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 .gitignore rename blog/_config.yml => _config.yml (100%) rename {blog/_includes => _includes}/footer.html (100%) rename {blog/_includes => _includes}/head.html (100%) rename {blog/_includes => _includes}/header.html (100%) rename {blog/_layouts => _layouts}/default.html (100%) rename {blog/_layouts => _layouts}/page.html (100%) rename {blog/_layouts => _layouts}/post.html (100%) rename {blog/_posts => _posts}/2015-09-16-welcome-to-pydiff.md (100%) rename {blog/_sass => _sass}/_base.scss (100%) rename {blog/_sass => _sass}/_layout.scss (100%) rename {blog/_sass => _sass}/_syntax-highlighting.scss (100%) rename blog/about.md => about.md (100%) delete mode 100644 blog/.gitignore rename {blog/css => css}/main.scss (100%) rename blog/feed.xml => feed.xml (100%) rename blog/index.html => index.html (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8e81655 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.DS_Store +.sass-cache/ +_site/ diff --git a/blog/_config.yml b/_config.yml similarity index 100% rename from blog/_config.yml rename to _config.yml diff --git a/blog/_includes/footer.html b/_includes/footer.html similarity index 100% rename from blog/_includes/footer.html rename to _includes/footer.html diff --git a/blog/_includes/head.html b/_includes/head.html similarity index 100% rename from blog/_includes/head.html rename to _includes/head.html diff --git a/blog/_includes/header.html b/_includes/header.html similarity index 100% rename from blog/_includes/header.html rename to _includes/header.html diff --git a/blog/_layouts/default.html b/_layouts/default.html similarity index 100% rename from blog/_layouts/default.html rename to _layouts/default.html diff --git a/blog/_layouts/page.html b/_layouts/page.html similarity index 100% rename from blog/_layouts/page.html rename to _layouts/page.html diff --git a/blog/_layouts/post.html b/_layouts/post.html similarity index 100% rename from blog/_layouts/post.html rename to _layouts/post.html diff --git a/blog/_posts/2015-09-16-welcome-to-pydiff.md b/_posts/2015-09-16-welcome-to-pydiff.md similarity index 100% rename from blog/_posts/2015-09-16-welcome-to-pydiff.md rename to _posts/2015-09-16-welcome-to-pydiff.md diff --git a/blog/_sass/_base.scss b/_sass/_base.scss similarity index 100% rename from blog/_sass/_base.scss rename to _sass/_base.scss diff --git a/blog/_sass/_layout.scss b/_sass/_layout.scss similarity index 100% rename from blog/_sass/_layout.scss rename to _sass/_layout.scss diff --git a/blog/_sass/_syntax-highlighting.scss b/_sass/_syntax-highlighting.scss similarity index 100% rename from blog/_sass/_syntax-highlighting.scss rename to _sass/_syntax-highlighting.scss diff --git a/blog/about.md b/about.md similarity index 100% rename from blog/about.md rename to about.md diff --git a/blog/.gitignore b/blog/.gitignore deleted file mode 100644 index badbc02..0000000 --- a/blog/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -_site -.sass-cache diff --git a/blog/css/main.scss b/css/main.scss similarity index 100% rename from blog/css/main.scss rename to css/main.scss diff --git a/blog/feed.xml b/feed.xml similarity index 100% rename from blog/feed.xml rename to feed.xml diff --git a/blog/index.html b/index.html similarity index 100% rename from blog/index.html rename to index.html From 61167307382375d2d1887d55e5c013619637d404 Mon Sep 17 00:00:00 2001 From: evildmp Date: Sat, 26 Sep 2015 12:43:17 +0100 Subject: [PATCH 002/161] Added basic events configuration etc --- _config.yml | 7 ++++++- _drafts/events.md | 14 ++++++++++++++ _drafts/news.md | 15 +++++++++++++++ _events/2015-10-13.md | 19 +++++++++++++++++++ _events/2015-11-10.md | 10 ++++++++++ _includes/footer.html | 17 ++--------------- _includes/header.html | 3 ++- _posts/2015-09-16-welcome-to-pydiff.md | 2 +- _sass/_layout.scss | 2 ++ about.md | 3 ++- conduct.md | 12 ++++++++++++ css/main.scss | 4 ++-- index.html | 26 +++++++++++++++++++++----- 13 files changed, 108 insertions(+), 26 deletions(-) create mode 100644 _drafts/events.md create mode 100644 _drafts/news.md create mode 100644 _events/2015-10-13.md create mode 100644 _events/2015-11-10.md create mode 100644 conduct.md diff --git a/_config.yml b/_config.yml index aec9e06..3c057da 100644 --- a/_config.yml +++ b/_config.yml @@ -1,10 +1,15 @@ # Site settings -title: PyDiff - Python Cardiff +title: PyDiff - the Cardiff Python meetup description: PyDiff is a Python and Django user group based in Cardiff, Wales. baseurl: "" # the subpath of your site, e.g. /blog/ url: "http://yourdomain.com" # the base hostname & protocol for your site twitter_username: PyDiff github_username: PyDiff +email: "contact@pydiff.org" # Build settings markdown: kramdown + +collections: + events: + output: true \ No newline at end of file diff --git a/_drafts/events.md b/_drafts/events.md new file mode 100644 index 0000000..df9dfed --- /dev/null +++ b/_drafts/events.md @@ -0,0 +1,14 @@ +--- +layout: page +title: Events +permalink: /events/ +order: 10 +--- + + diff --git a/_drafts/news.md b/_drafts/news.md new file mode 100644 index 0000000..c2ccb21 --- /dev/null +++ b/_drafts/news.md @@ -0,0 +1,15 @@ +--- +layout: page +title: News +permalink: /news/ +order: 20 +publish: false +--- + + diff --git a/_events/2015-10-13.md b/_events/2015-10-13.md new file mode 100644 index 0000000..a388ee7 --- /dev/null +++ b/_events/2015-10-13.md @@ -0,0 +1,19 @@ +--- +layout: post +title: "Evolutionary mathematics; PyCon Namibia 2016" +date: 2015-10-13 19:00 +venue: "Cardiff University" +--- + +# Vincent Knight, Cardiff University School of Mathematics + +This talk will begin with the origin of species. More precisely with a discussion of Darwin's theory of evolution and how Game Theory has been used to explain/illustrate aspects of co-operation in complex dynamics. + +We'll introduce an open-source collaboration project in Python that uses Robert Axelrod's Tournaments to pit various strategies against each other to explore evolutionary theory. + +# Daniele Procida, Divio AG + +In February this year, with the help of the University of Namibia and Cardiff University's Phoenix Project, and with support from numerous organisations in the Django/Python community, we held Python Namibia, a four-day international software conference in the capital, Windhoek. + +This is the story of why we did it, how we did it, how it went - and what's going to happen next. + diff --git a/_events/2015-11-10.md b/_events/2015-11-10.md new file mode 100644 index 0000000..4005ad9 --- /dev/null +++ b/_events/2015-11-10.md @@ -0,0 +1,10 @@ +--- +layout: post +title: "To be confirmed" +date: 2015-11-10 19:00 +venue: "Cardiff University" +--- + +# Kristian Glass, title to be confirmed + +Kristian is a regular speaker at Python/Django events. diff --git a/_includes/footer.html b/_includes/footer.html index be3976f..7a6326f 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -7,15 +7,11 @@ - - diff --git a/_includes/header.html b/_includes/header.html index cfe381f..360be7c 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -14,7 +14,8 @@
- {% for page in site.pages %} + {% assign pages = site.pages | sort:"order" %} + {% for page in pages %} {% if page.title %} {{ page.title }} {% endif %} diff --git a/_posts/2015-09-16-welcome-to-pydiff.md b/_posts/2015-09-16-welcome-to-pydiff.md index adf4e23..6b4c7e6 100644 --- a/_posts/2015-09-16-welcome-to-pydiff.md +++ b/_posts/2015-09-16-welcome-to-pydiff.md @@ -5,4 +5,4 @@ date: 2015-09-16 12:54:36 --- PyDiff is the brand new Cardiff based Python and Django user group. We will be meeting monthly to share ideas, learn and have lots of fun! Meetings will probably be at the School of Mathematics on Senghennydd Road, Cathays, and we will keep you posted here about the date of the first meeting. -In the meantime, keep and eye on this website and follow us on twitter [@PyDiff](https://twitter.com/PyDiff). We are excited to meet you! \ No newline at end of file +In the meantime, keep and eye on this website and follow us on twitter [@PyDiff](https://twitter.com/PyDiff). We are excited to meet you. \ No newline at end of file diff --git a/_sass/_layout.scss b/_sass/_layout.scss index def56f8..65cd45b 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -234,3 +234,5 @@ } } } + +ul.inline li {display: inline;} \ No newline at end of file diff --git a/about.md b/about.md index f2f97c1..25d359b 100644 --- a/about.md +++ b/about.md @@ -2,8 +2,9 @@ layout: page title: About permalink: /about/ +order: 40 --- This is the website for PyDiff, the Cardiff based Python and Django user group. The group was formed after the successful [DjangoCon Europe](http://2015.djangocon.eu) in Cardiff in 2015. -This website, along with our twitter account [@Pydiff](https://twitter.com/PyDiff), will post meeting dates and general information for the group. \ No newline at end of file +This website, along with our twitter account [@Pydiff](https://twitter.com/PyDiff), will post meeting dates and general information for the group. diff --git a/conduct.md b/conduct.md new file mode 100644 index 0000000..521a03e --- /dev/null +++ b/conduct.md @@ -0,0 +1,12 @@ +--- +layout: page +title: Code of conduct +permalink: /conduct/ +order: 30 +--- + +PyDiff activities are governed by a formal code of conduct. In short, participants at PyDiff events +are expected to contribute to an environment that is **open** and welcoming, **considerate** and +**respectful**. + +A fuller statement of these values is given in the [Python Community Code of Conduct](https://www.python.org/psf/codeofconduct/). diff --git a/css/main.scss b/css/main.scss index beee4e3..79ce2d1 100755 --- a/css/main.scss +++ b/css/main.scss @@ -6,8 +6,8 @@ // Our variables -$base-font-family: Helvetica, Arial, sans-serif; -$base-font-size: 16px; +$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +$base-font-size: 14px; $small-font-size: $base-font-size * 0.875; $base-line-height: 1.5; diff --git a/index.html b/index.html index 83d9398..676ed05 100644 --- a/index.html +++ b/index.html @@ -4,13 +4,31 @@
-

Posts

+

PyDiff holds monthly meetups in Cardiff for anyone who uses or wants to learn about Python.

+ +

Everyone's welcome, from experienced programmers to new learners, wherever their interest lies.

+ +

We hold technical talks and workshops and occasional social events.

+ +

We're also involved in a number of international Python/Django software community conferences - we've recently held: + +

+ +and we'll be involved in PyCon Namibia 2016 in February, while PyCon UK will come to Cardiff in September 2016.

+ +

Forthcoming events

    - {% for post in site.posts %} + {% for post in site.events %}
  • - + {% if post.venue %} + at + {% endif %}

    {{ post.title }}

    @@ -18,6 +36,4 @@

    {% endfor %}

-

subscribe via RSS

-
From 494c9670455a5914323665119eda4b2754b12a5c Mon Sep 17 00:00:00 2001 From: Vince Knight Date: Sat, 26 Sep 2015 16:22:22 +0100 Subject: [PATCH 003/161] Change of wording in abstract. --- _events/2015-10-13.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_events/2015-10-13.md b/_events/2015-10-13.md index a388ee7..99dc9df 100644 --- a/_events/2015-10-13.md +++ b/_events/2015-10-13.md @@ -9,7 +9,7 @@ venue: "Cardiff University" This talk will begin with the origin of species. More precisely with a discussion of Darwin's theory of evolution and how Game Theory has been used to explain/illustrate aspects of co-operation in complex dynamics. -We'll introduce an open-source collaboration project in Python that uses Robert Axelrod's Tournaments to pit various strategies against each other to explore evolutionary theory. +We'll introduce an open-source collaboration project in Python that replicates Robert Axelrod's Tournaments to pit various strategies against each other to explore evolutionary theory. # Daniele Procida, Divio AG From 96824f6a6dd150b2fa4c0b769a98e1f596d61a68 Mon Sep 17 00:00:00 2001 From: Vince Knight Date: Sat, 26 Sep 2015 16:37:23 +0100 Subject: [PATCH 004/161] Adding gitter room --- _config.yml | 3 ++- _includes/footer.html | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 3c057da..318b5fa 100644 --- a/_config.yml +++ b/_config.yml @@ -6,10 +6,11 @@ url: "http://yourdomain.com" # the base hostname & protocol for your site twitter_username: PyDiff github_username: PyDiff email: "contact@pydiff.org" +gitter_url: "https://gitter.im/PyDiff/PyDiff.github.io" # Build settings markdown: kramdown collections: events: - output: true \ No newline at end of file + output: true diff --git a/_includes/footer.html b/_includes/footer.html index 7a6326f..9c3b0c3 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -8,6 +8,7 @@ From 8b369c5ce4167e4cc43fe90cc2e612ada8abddde Mon Sep 17 00:00:00 2001 From: evildmp Date: Sat, 26 Sep 2015 23:19:19 +0100 Subject: [PATCH 005/161] Removed email address, until we have one --- _includes/footer.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 7a6326f..edf8d99 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -4,12 +4,6 @@ -