Skip to content
This repository was archived by the owner on Feb 7, 2023. It is now read-only.

Commit ac788d5

Browse files
kallewesterlingkallewesterling
authored
Merge pull request #75 from DHRI-Curriculum/kallewesterling/issue68
Addresses #68 and beyond
2 parents f1b98d3 + 99476a8 commit ac788d5

File tree

19 files changed

+160
-63
lines changed

19 files changed

+160
-63
lines changed

‎app/frontmatter/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def __str__(self):
1717

1818

1919
class LearningObjective(models.Model):
20-
frontmatter = models.ForeignKey(Frontmatter, on_delete=models.CASCADE)
20+
frontmatter = models.ForeignKey(Frontmatter, on_delete=models.CASCADE, related_name="learning_objectives")
2121
label = models.TextField(max_length=500)
2222

2323
def __str__(self):

‎app/website/admin.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
from django.contrib import admin
2+
from .models import Page
23

3-
# Register your models here.
4+
admin.site.register(Page)

‎app/website/context_processors.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
from workshop.models import Workshop
2+
from website.models import Page
23

34
from pathlib import Path
45

56
def add_to_all_contexts(request):
67
context_data = dict()
78

8-
context_data['footer'] = dict()
9-
context_data['footer']['workshops'] = Workshop.objects.all()
9+
context_data['website'] = dict()
10+
context_data['website']['workshops'] = Workshop.objects.all()
11+
context_data['website']['pages'] = Page.objects.all()
1012

1113
return context_data

‎app/website/models.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
from django.db import models
22

3-
# Create your models here.
3+
class Page(models.Model):
4+
name = models.CharField(max_length=200)
5+
slug = models.CharField(max_length=200, blank=True)
6+
text = models.TextField()
7+
is_homepage = models.BooleanField(default=False)
8+
9+
def __str__(self):
10+
return str(self.name)

‎app/website/urls.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88

99
urlpatterns = [
1010
path('', views.index, name='index'),
11+
path('<str:page_slug>/', views.page, name='page'),
1112
]

‎app/website/views.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
from django.shortcuts import render
1+
from django.shortcuts import render, get_object_or_404
2+
from .models import Page
23

34
def index(request):
4-
return render(request, 'website/index.html', {})
5+
print('index!')
6+
page = Page.objects.filter(is_homepage=True).last()
7+
return render(request, 'website/index.html', {'page': page})
8+
9+
def page(request, page_slug):
10+
print('page!')
11+
page = get_object_or_404(Page, slug=page_slug)
12+
return render(request, 'website/index.html', {'page': page})

‎app/workshop/static/website/css/main.css

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,39 @@ blockquote {
3232

3333
.dhri-hero:hover {
3434
color: #d1d6d7 !important;
35+
}
36+
37+
.special-link {
38+
background-color: #2C3E50 !important;
39+
}
40+
41+
.special-link:hover {
42+
background-color: #2c3e5097 !important;
43+
}
44+
45+
.special-link-disabled {
46+
background-color: #2c3e5097 !important;
47+
}
48+
49+
.uppercase {
50+
text-transform: uppercase;
51+
}
52+
53+
.lesson-text {
54+
font-size:1.2rem;
55+
line-height:2rem;
56+
}
57+
58+
.lesson-text code {
59+
padding-left: 0.15em;
60+
padding-right: 0.15em;
61+
padding-top: 0em;
62+
padding-bottom: 0em;
63+
margin: 0;
64+
display: inline-block;
65+
background-color: rgba(255, 0, 255, 0.01) !important;
66+
}
67+
68+
.lesson-text kbd {
69+
background-color: rgba(17, 45, 45, 0.529);
3570
}

‎app/workshop/templates/lesson/lesson-elements/pagination.html

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
1-
<nav aria-label="Page navigation example">
1+
<nav aria-label="Lesson navigation">
22
<ul class="pagination justify-content-center justify-content-sm-end">
33
<li class="page-item disabled">
4-
<a class="page-link" href="#" tabindex="-1" aria-disabled="true">Previous</a>
4+
<a class="page-link special-link-disabled" href="#" tabindex="-1" aria-disabled="true">Previous</a>
55
</li>
6-
<li class="page-item"><a class="page-link" href="#">1</a></li>
7-
<li class="page-item"><a class="page-link" href="#">2</a></li>
8-
<li class="page-item"><a class="page-link" href="#">3</a></li>
96
<li class="page-item">
10-
<a class="page-link" href="#">Next</a>
7+
<a class="page-link special-link" href="#">1</a></li>
8+
<li class="page-item">
9+
<a class="page-link special-link" href="#">2</a></li>
10+
<li class="page-item">
11+
<a class="page-link special-link" href="#">3</a></li>
12+
<li class="page-item">
13+
<a class="page-link special-link" href="#">4</a></li>
14+
<li class="page-item">
15+
<a class="page-link special-link" href="#">5</a></li>
16+
<li class="page-item">
17+
<a class="page-link special-link" href="#">6</a></li>
18+
<li class="page-item">
19+
<a class="page-link special-link" href="#">7</a></li>
20+
<li class="page-item">
21+
<a class="page-link special-link" href="#">8</a></li>
22+
<li class="page-item">
23+
<a class="page-link special-link" href="#">Next</a>
1124
</li>
1225
</ul>
1326
</nav>

‎app/workshop/templates/lesson/lesson.html

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,64 @@
1010

1111
{% block main %}
1212
<div class="row pt-5">
13-
<div class="col-12">
14-
<h2>Contents for lesson here!</h2>
1513

16-
<p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</p>
17-
<p>But I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete account of the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?</p>
14+
<div class="col-12 py-3">
15+
<h2>Conditionals</h2>
16+
17+
<div class="lesson-text py-3">
18+
<p>Conditionals allow programs to change their behavior based on whether some statement is true or false. Let's try this out by writing a script that will give different outputs based on the weather:</p>
19+
20+
<blockquote>
21+
<code>
22+
<p>weather = "sunny"</p>
23+
24+
<p>if weather == "sunny":</p>
25+
<p>&nbsp;&nbsp;print("Bring your shades")</p>
26+
<p>else:</p>
27+
<p>&nbsp;&nbsp;print("I don't know what you should bring! I'm just a little program...")</p>
28+
</code>
29+
</blockquote>
30+
31+
<p>In our first line, we set a variable <kbd>weather</kbd> to the string "sunny," representing what the weather is like outside. The <kbd>if</kbd> statement checks whether the variable weather is set to "sunny." If it is, the code in the block beneath is executed, so the text "Bring your shades" will be printed.</p>
32+
33+
<p>The <kbd>else</kbd> statement handles any inputs that aren't "sunny"—the program merely prints out that it doesn't know what you should bring. Try this script out both with the variable set to "sunny" and the variable set to some other value.</p>
34+
35+
<p>What if we want our program to handle other kinds of weather, giving different messages for each one? Other cases after the first <kbd>if</kbd> statement are handled with <kbd>elif</kbd>:</p>
36+
37+
<blockquote>
38+
<code>
39+
<p>weather = "sunny"</p>
40+
41+
<p>if weather == "sunny":</p>
42+
<p>&nbsp;&nbsp;print("Bring your shades")
43+
<p>elif weather == "rainy":</p>
44+
<p>&nbsp;&nbsp;print("Bring your umbrella")
45+
<p>elif weather == "snowy":</p>
46+
<p>&nbsp;&nbsp;print("Bring your wooly muffler")
47+
<p>else:</p>
48+
<p>&nbsp;&nbsp;print("I don't know what you should bring! I'm just a little program...")</p>
49+
</code>
50+
</blockquote>
51+
52+
<p>You can add as many <kbd>elif</kbd> statements as you need, meaning that conditionals in Python have one <kbd>if</kbd> statement, any number of <kbd>elif</kbd> statements, and one <kbd>else</kbd> statement that catches any input not covered by <kbd>if</kbd> or <kbd>elif</kbd>. Over the next sections, we'll work on improving this little application, making it able to handle user input directly.</p>
53+
54+
<h3 class="pt-4">Challenge</h3>
55+
56+
<p>Add two more <kbd>elif</kbd> statements to this program to make it better able to handle different kinds of weather.</p>
57+
</div>
1858
</div>
59+
1960
</div>
2061

2162
{% include 'lesson/lesson-elements/pagination.html' %}
63+
<div class="row pt-5">
64+
65+
<div class="col-12 py-3">
66+
<h4 class="small uppercase">Workshop overall progress</h4>
67+
<div class="progress">
68+
<div class="progress-bar progress-bar-striped" role="progressbar" style="width: 10%" aria-valuenow="10" aria-valuemin="0" aria-valuemax="100"></div>
69+
</div>
70+
</div>
71+
</div>
2272

2373
{% endblock %}

‎app/workshop/templates/website/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
<title>Digital Humanities Research Institute - Curriculum Website</title>
1111
<link href="https://fonts.googleapis.com/css?family=Titillium+Web:400,600,700" rel="stylesheet">
12+
<link rel="stylesheet" href="{% static 'website/css/main.css' %}">
1213
<link rel="stylesheet" href="{% static 'website/css/bootstrap-style.min.css' %}">
1314
<link rel="stylesheet" href="{% static 'website/css/icons.css' %}">
14-
<link rel="stylesheet" href="{% static 'website/css/main.css' %}">
1515
</head>
1616
<body>
1717

0 commit comments

Comments
 (0)