Skip to content

Commit

Permalink
Change copies and fix links for new semester
Browse files Browse the repository at this point in the history
  • Loading branch information
sirodoht committed Dec 15, 2024
1 parent e8ae096 commit bbd2393
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 25 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# shoshincollege.org

an experimental learning co-operative
an independent experimental school

## Development

Expand Down
6 changes: 2 additions & 4 deletions main/templates/assets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ nav a:hover { text-decoration: underline; }

/* landing location section */
#london {
background: #FFFACFcc;
background: #a2cbbc;
padding: 64px 0;
display: flex;
justify-content: center;
Expand All @@ -298,7 +298,6 @@ nav a:hover { text-decoration: underline; }
#londontext {
max-width: 300px;
text-align: center;
transform: translateX(-32px);
}
@media (max-width: 650px) {
#londontext { transform: unset; }
Expand Down Expand Up @@ -329,7 +328,7 @@ nav a:hover { text-decoration: underline; }
#newsletter input { width: 80%; margin: 8px auto; }
}

/* landing values section */
/* values page */
#values { max-width: 800px; margin: 0 auto 64px; font-size: 20px; }
@media (max-width: 800px) {
#values { padding-right: 8px; font-size: 18px; }
Expand Down Expand Up @@ -372,7 +371,6 @@ nav a:hover { text-decoration: underline; }

/* footer */
#footer {
background: #FFFACFcc;
color: #888;
text-align: center;
line-height: 1.5;
Expand Down
4 changes: 2 additions & 2 deletions main/templates/main/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ <h2>Community Interest Company</h2>
on its activities.
</p>
<p>
Additionally, we plan to publish quarterly transparency reports on our
operations and financial transactions.
Additionally, we publish transparency reports per semester on our operations and
financial transactions.
</p>
<p>
Shoshin College CIC is registered in England and Wales under company number 15760817.
Expand Down
21 changes: 10 additions & 11 deletions main/templates/main/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<h1>
Shoshin College is an
<span id="heroheader-largeletters">
experimental&nbsp; &nbsp;learning
independent&nbsp; &nbsp;experimental
</span>
<span id="heroheader-smallletters">
experimental learning
independent experimental
</span>
co&#8209;operative
school
</h1>
<div style="margin-top: 64px;">
<a href="{% url 'courses' %}" class="cta">Check out our Courses »</a>
Expand Down Expand Up @@ -42,10 +42,10 @@ <h1>
</div>

<div id="newsletter" style="border: none;">
<p style="box-sizing: border-box; max-width: 520px; margin: 32px auto 32px; font-size: 22px; line-height: 1.5;">
Our first semester of
<a href="{% url 'courses' %}">Courses</a>
will take place in east London in&nbsp;October to December 2024.
<p style="box-sizing: border-box; max-width: 560px; margin: 32px auto 32px; font-size: 22px; line-height: 1.5;">
Our <a href="{% url 'courses' %}">next semester</a>
will take place in <span style="white-space: nowrap;">central/east</span>
London between February and April 2025.
</p>
<iframe src="https://shoshincollege.substack.com/embed" width="375" height="150" style="background:transparent;" frameborder="0" scrolling="no"></iframe>
</div>
Expand All @@ -58,7 +58,7 @@ <h2>
Learning With Us
</h2>
<p>
Shoshin College is an experimental learning co-operative that’s
Shoshin College is an independent experimental school that’s
positioning itself outside of the existing way of how learning and
teaching works.
</p>
Expand Down Expand Up @@ -110,7 +110,7 @@ <h2>
<div id="london">
<div style="display: flex;">
<div>
<img src="{% static '/img/ben.svg' %}" alt="london landmark" width="300px">
<img src="{% static '/img/bigben.jpeg' %}" alt="london landmark" width="300px" style="border-radius: 16px;">
</div>
<div style="display: flex; align-items: center;">
<div id="londontext">
Expand Down Expand Up @@ -146,8 +146,7 @@ <h2>
<div id="newsletter">
<h2>Subscribe To Updates</h2>
<p style="box-sizing: border-box; max-width: 600px; margin: auto auto 16px;">
We will announce our first courses during the summer. They will take place
in east London in&nbsp;October to December 2024.
Sign up to our Substack publication to receive the latest news and updates.
</p>
<iframe src="https://shoshincollege.substack.com/embed" width="375" height="150" style="background:transparent;" frameborder="0" scrolling="no"></iframe>
</div>
Expand Down
5 changes: 3 additions & 2 deletions main/templates/main/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
<nav>
<a href="{% url 'index' %}" style="color: #3D6D75;">Shoshin College</a>
<a href="{% url 'about' %}">About</a>
<a href="{% url 'values' %}">Values</a>
<a href="{% url 'courses' %}">Courses</a>
<a href="{% url 'philosophy' %}">Philosophy</a>
<a href="{% url 'courses_2024_fall' %}">Courses 2024</a>
<a href="{% url 'courses' %}">Courses 2025</a>
<a href="{% url 'news_list' %}">News</a>

{% if messages %}
Expand Down
4 changes: 3 additions & 1 deletion main/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
RedirectView.as_view(url=FEEDBACK_URL),
name="classes",
),
path("values/", views.values, name="values"),
path("philosophy/", views.philosophy, name="philosophy"),
path("courses/2024-fall/", views.courses, name="courses_2024_fall"),
path("courses/2025-spring/", views.courses, name="courses_2025_spring"),
path("courses/", views.courses, name="courses"),
path("code-of-conduct/", views.coc, name="coc"),
path("about/", views.about, name="about"),
Expand Down
13 changes: 9 additions & 4 deletions main/views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.shortcuts import render
from django.shortcuts import redirect, render
from django.utils import timezone
from django.views.generic import DetailView, ListView

Expand All @@ -10,7 +10,12 @@ def index(request):


def courses(request):
return render(request, "main/courses.html")
if request.path == "/courses/2024-fall/":
return render(request, "main/courses_2024_fall.html")
elif request.path == "/courses/2025-spring/":
return render(request, "main/courses_2025_spring.html")
else:
return redirect("courses_2025_spring")


def coc(request):
Expand All @@ -21,8 +26,8 @@ def about(request):
return render(request, "main/about.html")


def values(request):
return render(request, "main/values.html")
def philosophy(request):
return render(request, "main/philosophy.html")


class NewsList(ListView):
Expand Down

0 comments on commit bbd2393

Please sign in to comment.