diff options
13 files changed, 60 insertions, 50 deletions
diff --git a/pydis_site/templates/events/_base.html b/pydis_site/templates/events/_base.html new file mode 100644 index 00000000..08fd8ae1 --- /dev/null +++ b/pydis_site/templates/events/_base.html @@ -0,0 +1,33 @@ +{% extends "base/base.html" %} +{% load static %} + +{% block head %} + <link rel="stylesheet" href="{% static "css/events/base.css" %}"> + <link rel="stylesheet" + href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/styles/atom-one-dark-reasonable.min.css"> + <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/highlight.min.js"></script> + <script>hljs.initHighlightingOnLoad();</script> +{% endblock %} + +{% block content %} + {% include "base/navbar.html" %} + + <section class="breadcrumb-section section"> + <div class="container"> + <nav class="breadcrumb is-pulled-left" aria-label="breadcrumbs"> + <ul> + {% block breadcrumb %}{% endblock %} + </ul> + </nav> + </div> + </section> + + <section class="section"> + <div class="container"> + <div class="content"> + <h1>{% block title %}{% endblock %}</h1> + <div>{% block event_base_content %}{% endblock %}</div> + </div> + </div> + </section> +{% endblock %} diff --git a/pydis_site/templates/events/base.html b/pydis_site/templates/events/base.html index 2c33b563..c9a963e7 100644 --- a/pydis_site/templates/events/base.html +++ b/pydis_site/templates/events/base.html @@ -1,42 +1,7 @@ -{% extends "base/base.html" %} -{% load static %} +{% extends "events/_base.html" %} -{% block head %} - <link rel="stylesheet" href="{% static "css/events/base.css" %}"> - <link rel="stylesheet" - href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/styles/atom-one-dark-reasonable.min.css"> - <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/10.4.0/highlight.min.js"></script> - <script>hljs.initHighlightingOnLoad();</script> -{% endblock %} - -{% block content %} - {% include "base/navbar.html" %} - - <section class="breadcrumb-section section"> - <div class="container"> - <nav class="breadcrumb is-pulled-left" aria-label="breadcrumbs"> - <ul> - {% block breadcrumb %}{% endblock %} - </ul> - </nav> - </div> - </section> - - <section class="section"> - <div class="container"> - <div class="content"> - <h1>{% block title %}{% endblock %}</h1> - <div> - <div class="columns is-variable is-8"> - <div class="column is-two-thirds"> - {% block event_content %}{% endblock %} - </div> - <div class="column"> - {% block sidebar %}{% endblock %} - </div> - </div> - </div> - </div> - </div> - </section> +{% block event_base_content %} +<div> + {% block event_content %}{% endblock %} +</div> {% endblock %} diff --git a/pydis_site/templates/events/base_sidebar.html b/pydis_site/templates/events/base_sidebar.html new file mode 100644 index 00000000..8ce6ad65 --- /dev/null +++ b/pydis_site/templates/events/base_sidebar.html @@ -0,0 +1,12 @@ +{% extends "events/base.html" %} + +{% block event_base_content %} +<div class="columns is-variable is-8"> + <div class="column is-two-thirds"> + {% block event_content %}{% endblock %} + </div> + <div class="column"> + {% block sidebar %}{% endblock %} + </div> +</div> +{% endblock %} diff --git a/pydis_site/templates/events/index.html b/pydis_site/templates/events/index.html index 5d9a60ef..024e7fdc 100644 --- a/pydis_site/templates/events/index.html +++ b/pydis_site/templates/events/index.html @@ -1,4 +1,4 @@ -{% extends "events/base.html" %} +{% extends "events/base_sidebar.html" %} {% block title %}Events{% endblock %} diff --git a/pydis_site/templates/events/pages/code-jams/6/_index.html b/pydis_site/templates/events/pages/code-jams/6/_index.html index 592a68dd..256914b6 100644 --- a/pydis_site/templates/events/pages/code-jams/6/_index.html +++ b/pydis_site/templates/events/pages/code-jams/6/_index.html @@ -1,4 +1,4 @@ -{% extends "events/base.html" %} +{% extends "events/base_sidebar.html" %} {% block title %}Winter Code Jam 2020: Ancient Technology{% endblock %} diff --git a/pydis_site/templates/events/pages/code-jams/6/rules.html b/pydis_site/templates/events/pages/code-jams/6/rules.html index e9f2d434..727d98be 100644 --- a/pydis_site/templates/events/pages/code-jams/6/rules.html +++ b/pydis_site/templates/events/pages/code-jams/6/rules.html @@ -1,4 +1,4 @@ -{% extends "events/base.html" %} +{% extends "events/base_sidebar.html" %} {% block title %}Rules{% endblock %} diff --git a/pydis_site/templates/events/pages/code-jams/7/_index.html b/pydis_site/templates/events/pages/code-jams/7/_index.html index 62469417..1f0b0909 100644 --- a/pydis_site/templates/events/pages/code-jams/7/_index.html +++ b/pydis_site/templates/events/pages/code-jams/7/_index.html @@ -1,4 +1,4 @@ -{% extends "events/base.html" %} +{% extends "events/base_sidebar.html" %} {% block title %}Summer Code Jam 2020: Early Internet{% endblock %} diff --git a/pydis_site/templates/events/pages/code-jams/7/rules.html b/pydis_site/templates/events/pages/code-jams/7/rules.html index f77d7129..5979fbe6 100644 --- a/pydis_site/templates/events/pages/code-jams/7/rules.html +++ b/pydis_site/templates/events/pages/code-jams/7/rules.html @@ -1,4 +1,4 @@ -{% extends "events/base.html" %} +{% extends "events/base_sidebar.html" %} {% block title %}Rules{% endblock %} diff --git a/pydis_site/templates/events/pages/code-jams/_index.html b/pydis_site/templates/events/pages/code-jams/_index.html index fb227923..fcbfa4d9 100644 --- a/pydis_site/templates/events/pages/code-jams/_index.html +++ b/pydis_site/templates/events/pages/code-jams/_index.html @@ -1,4 +1,4 @@ -{% extends "events/base.html" %} +{% extends "events/base_sidebar.html" %} {% block breadcrumb %} <li><a href="{% url "events:index" %}">Events</a></li> diff --git a/pydis_site/templates/events/pages/code-jams/judging.html b/pydis_site/templates/events/pages/code-jams/judging.html index 4c8b89ed..6c6531d9 100644 --- a/pydis_site/templates/events/pages/code-jams/judging.html +++ b/pydis_site/templates/events/pages/code-jams/judging.html @@ -1,4 +1,4 @@ -{% extends "events/base.html" %} +{% extends "events/base_sidebar.html" %} {% block breadcrumb %} <li><a href="{% url "events:index" %}">Events</a></li> diff --git a/pydis_site/templates/events/pages/code-jams/pull-request.html b/pydis_site/templates/events/pages/code-jams/pull-request.html index 85b4c944..c276fd12 100644 --- a/pydis_site/templates/events/pages/code-jams/pull-request.html +++ b/pydis_site/templates/events/pages/code-jams/pull-request.html @@ -1,4 +1,4 @@ -{% extends "events/base.html" %} +{% extends "events/base_sidebar.html" %} {% block breadcrumb %} <li><a href="{% url "events:index" %}">Events</a></li> diff --git a/pydis_site/templates/events/pages/code-jams/using-git.html b/pydis_site/templates/events/pages/code-jams/using-git.html index 8ceb36f0..19c4a08f 100644 --- a/pydis_site/templates/events/pages/code-jams/using-git.html +++ b/pydis_site/templates/events/pages/code-jams/using-git.html @@ -1,4 +1,4 @@ -{% extends "events/base.html" %} +{% extends "events/base_sidebar.html" %} {% block breadcrumb %} <li><a href="{% url "events:index" %}">Events</a></li> diff --git a/pydis_site/templates/events/pages/game-jams/2020/_index.html b/pydis_site/templates/events/pages/game-jams/2020/_index.html index 83cd7092..136c9f4d 100644 --- a/pydis_site/templates/events/pages/game-jams/2020/_index.html +++ b/pydis_site/templates/events/pages/game-jams/2020/_index.html @@ -1,4 +1,4 @@ -{% extends "events/base.html" %} +{% extends "events/base_sidebar.html" %} {% block title %}Game Jam 2020: Three of a Kind{% endblock %} |