From 4df7be1479a07f2a34d01aab7c30e42141b17f05 Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Thu, 17 May 2018 14:47:32 +0100 Subject: [Jams] More restructuring --- pysite/views/main/jams/index.py | 2 +- templates/main/jams/index.html | 103 +++++++++++++++++++++++++++++++++++++--- templates/main/jams/info.html | 79 ------------------------------ templates/main/jams/signup.html | 2 +- 4 files changed, 98 insertions(+), 88 deletions(-) diff --git a/pysite/views/main/jams/index.py b/pysite/views/main/jams/index.py index 56f079fc..1e66de4f 100644 --- a/pysite/views/main/jams/index.py +++ b/pysite/views/main/jams/index.py @@ -4,4 +4,4 @@ from pysite.base_route import TemplateView class JamsIndexView(TemplateView): path = "/jams" name = "jams.index" - template = "main/jams/info.html" + template = "main/jams/index.html" diff --git a/templates/main/jams/index.html b/templates/main/jams/index.html index e1f7e56d..18a19003 100644 --- a/templates/main/jams/index.html +++ b/templates/main/jams/index.html @@ -3,13 +3,102 @@ {% block og_title %}Home{% endblock %} {% block content %}
-
-

- Jams -

- +
+
+
+
+

+ Code Jams + + + + +

+ + +

+ Every three months or so, we aim to host a server-wide code jam, suitable for all members of the server. In + these, we announce a theme and date in advance, and users may sign up via a link provided in the + announcements channel on the server. Once the sign-up period is over, users are grouped into + teams. On the day of the code jam, we announce a task - each team will then work on a solution + to this task. +

+

+ Once the code jam is over, our staff team will review and test each submission. Once that's done, + a winner will be decided! +

+

+ If you'd like to join one of our code jams, feel free to ask a member of staff about the next one. +

+
+ +
+

+ Sponsors +

+ + + + + +
+
+ +

+ Rules and Guidelines + + + + +

+ +

+ In order to keep things fair and on-topic, the following rules must be adhered to. Failure to + follow these rules will result in disqualification. +

+
    +
  • + Projects must be strongly Python-oriented. + +
      +
    • You may mix in other languages, but the project must be Python-based.
    • +
    +
  • +
  • You may not write any code in advance.
  • +
  • You may not write any code after the deadline.
  • +
  • The work must be your own - don't copy another team's work.
  • +
+

+ Additionally, the following suggestions could be helpful for all teams. +

+
    +
  • All team members should contribute to the project in some way. Work together!
  • +
  • Open your pull request early - that way, you know it'll be there by the deadline.
  • +
  • Lint your code - we lint each pull request using Flake8, and your code should validate.
  • +
  • Communicate with your teammates - Add them as a friend, start a group DM, and work together on the problem.
  • +
+ +

+ Further Reading + + + + +

+ +

+ We're currently working on some better documentation for our code jams. In the meantime, you can always + read over our old Getting Started guide. +

+
{% endblock %} diff --git a/templates/main/jams/info.html b/templates/main/jams/info.html index 99b325ab..d855bed7 100644 --- a/templates/main/jams/info.html +++ b/templates/main/jams/info.html @@ -6,85 +6,6 @@
-
-
-

- Code Jams - - - - -

- - -

- Every three months or so, we aim to host a server-wide code jam, suitable for all members of the server. In - these, we announce a theme and date in advance, and users may sign up via a link provided in the - announcements channel on the server. Once the sign-up period is over, users are grouped into - teams. On the day of the code jam, we announce a task - each team will then work on a solution - to this task. -

-

- Once the code jam is over, our staff team will review and test each submission. Once that's done, - a winner will be decided! -

-

- If you'd like to join one of our code jams, feel free to ask a member of staff about the next one. -

-
- -
-

- Sponsors -

- - - - - -
-
- -

- Rules and Guidelines - - - - -

- -

- In order to keep things fair and on-topic, the following rules must be adhered to. Failure to - follow these rules will result in disqualification. -

-
    -
  • - Projects must be strongly Python-oriented. - -
      -
    • You may mix in other languages, but the project must be Python-based.
    • -
    -
  • -
  • You may not write any code in advance.
  • -
  • You may not write any code after the deadline.
  • -
  • The work must be your own - don't copy another team's work.
  • -
-

- Additionally, the following suggestions could be helpful for all teams. -

-
    -
  • All team members should contribute to the project in some way. Work together!
  • -
  • Open your pull request early - that way, you know it'll be there by the deadline.
  • -
  • Lint your code - we lint each pull request using Flake8, and your code should validate.
  • -
  • Communicate with your teammates - Add them as a friend, start a group DM, and work together on the problem.
  • -
-

Getting Started diff --git a/templates/main/jams/signup.html b/templates/main/jams/signup.html index d363f3a3..ddb48733 100644 --- a/templates/main/jams/signup.html +++ b/templates/main/jams/signup.html @@ -5,7 +5,7 @@

- Signup + Sign Up