@@ -46,7 +45,7 @@
{% for resource in resource_list %}
diff --git a/python-in-edu/resources/templates/text_includes/author_search_text.html b/python-in-edu/resources/templates/text_includes/author_search_text.html
new file mode 100644
index 0000000..9f6ae8a
--- /dev/null
+++ b/python-in-edu/resources/templates/text_includes/author_search_text.html
@@ -0,0 +1 @@
+Search for Authors
\ No newline at end of file
diff --git a/python-in-edu/resources/templates/text_includes/getting_started_intro_text.html b/python-in-edu/resources/templates/text_includes/getting_started_intro_text.html
index a1913bc..a8d1e04 100644
--- a/python-in-edu/resources/templates/text_includes/getting_started_intro_text.html
+++ b/python-in-edu/resources/templates/text_includes/getting_started_intro_text.html
@@ -3,9 +3,9 @@
{% load static %}
What Works in Teaching Python Toolkit
Evidence-based teaching strategies
-Take Action Toolkit
+Take Action Toolkit
Actions that support CS instruction at the primary and secondary levels
-Inclusive Teaching Practices Guide
-A guide to planning with cultural knowledge, linguistic diversity, and learning differences in mind
-Choosing a Programming Platform Guide
+Platforms for Teaching Python Guide
A guide to selecting the right programming platform for your educational context
+Inclusive Teaching Practices Guide - Coming Soon
+A guide to planning with cultural knowledge, linguistic diversity, and learning differences in mind
diff --git a/python-in-edu/resources/tests.py b/python-in-edu/resources/tests.py
index 398a950..be475bd 100644
--- a/python-in-edu/resources/tests.py
+++ b/python-in-edu/resources/tests.py
@@ -6,7 +6,6 @@
from django.core import mail
from .models import Profile, Resource, resource_updated
-from . import choices
class BaseTestCase(TestCase):
@@ -18,9 +17,9 @@ def create_users(self):
def create_resources(self):
self.basic_resource_data = {
"title": "A Title", "url": "www.example.com", "submitter": self.user,
- "status": choices.ResourceStatusChoices.PROPOSED,
- "resource_type": choices.ResourceTypeChoices.PLATFORM_APP,
- "audience": choices.AudienceChoices.K_THROUGH_12,
+ # "status": choices.ResourceStatusChoices.PROPOSED,
+ # "resource_type": choices.ResourceTypeChoices.PLATFORM_APP,
+ # "audience": choices.AudienceChoices.K_THROUGH_12,
"language": "English", "requirements": "none", "license": "none"
}
self.resource_a = Resource.objects.create(**self.basic_resource_data)
@@ -35,7 +34,7 @@ class ResourceViewCase(BaseTestCase):
def test_resource_list_contains_accepted_only(self):
"""The resource list contains only accepted resources."""
- self.resource_a.status = choices.ResourceStatusChoices.ACCEPTED
+ # self.resource_a.status = choices.ResourceStatusChoices.ACCEPTED
self.resource_a.save()
response = self.client.get(reverse('resource_list'))
self.assertEqual(list(response.context['resource_list']), [self.resource_a])
diff --git a/python-in-edu/resources/urls.py b/python-in-edu/resources/urls.py
index 740acae..836441c 100644
--- a/python-in-edu/resources/urls.py
+++ b/python-in-edu/resources/urls.py
@@ -4,6 +4,8 @@
urlpatterns = [
+ path('authors/new', views.AuthorCreateView.as_view(), name='author_create'),
+ path('authors/list', views.AuthorListView.as_view(), name='author_list'),
path('profile/', views.ProfileDetailView.as_view(), name='profile_detail'),
path('profile//udpate', views.ProfileUpdateView.as_view(), name='profile_update'),
path('resource/list', views.ResourceListView.as_view(), name='resource_list'),
diff --git a/python-in-edu/resources/views.py b/python-in-edu/resources/views.py
index d40bc36..834b8fd 100644
--- a/python-in-edu/resources/views.py
+++ b/python-in-edu/resources/views.py
@@ -4,11 +4,10 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.auth.models import User
from django.http import HttpResponseRedirect
+from .forms import CreateResourceForm
-from .models import Profile, Resource
-from . import choices
-
+from .models import Profile, Resource, Author
class GettingStartedView(generic.TemplateView):
template_name = 'misc/getting_started.html'
@@ -22,6 +21,24 @@ class CodeOfConductView(generic.TemplateView):
template_name = 'misc/code_of_conduct.html'
+class AuthorListView(generic.ListView):
+ model = Author
+ template_name = 'authors/author_list.html'
+
+
+class AuthorCreateView(generic.CreateView):
+ model = Author
+ fields = '__all__'
+ template_name = 'authors/author_create.html'
+
+ def get_success_url(self, instance):
+ return reverse('author_list')
+
+ def form_valid(self, form):
+ instance = form.save()
+ return HttpResponseRedirect(self.get_success_url(instance=instance))
+
+
class ResourceDetailView(generic.DetailView):
model = Resource
template_name = 'resources/resource_detail.html'
@@ -34,14 +51,13 @@ class ResourceListView(generic.ListView):
def get_context_data(self, **kwargs):
# overrides default to get only accepted resources
context = super().get_context_data(**kwargs)
- context['resource_list'] = Resource.objects.filter(status=choices.ResourceStatusChoices.ACCEPTED)
+ context['resource_list'] = Resource.objects.all()
return context
class ResourceCreateView(LoginRequiredMixin, generic.CreateView):
model = Resource
- fields = ['title', 'url1', 'url_description1', 'url2', 'url_description2', 'url3', 'url_description3', 'resource_type', 'audience', 'devices', 'requires_signup', 'use_type', 'python_related',
- 'description', 'attribution', 'language', 'license', 'contact']
+ form_class = CreateResourceForm
template_name = 'resources/add_resource.html'
def get_success_url(self, instance):
@@ -56,8 +72,8 @@ def form_valid(self, form):
class ResourceUpdateView(LoginRequiredMixin, generic.UpdateView):
model = Resource
- fields = ['title', 'url1', 'url_description1', 'url2', 'url_description2', 'url3', 'url_description3', 'resource_type', 'audience', 'devices', 'requires_signup', 'use_type', 'python_related',
- 'description', 'attribution', 'language', 'license', 'contact']
+ fields = ['title', 'audience', 'devices', 'requires_signup', 'use_type',
+ 'description', 'author', 'license']
template_name = 'resources/update_resource.html'
def get_success_url(self):
diff --git a/python-in-edu/static_source/guides/Python-Platform-Comparison.pdf b/python-in-edu/static_source/guides/Python-Platform-Comparison.pdf
new file mode 100644
index 0000000..d3ee873
Binary files /dev/null and b/python-in-edu/static_source/guides/Python-Platform-Comparison.pdf differ
diff --git a/python-in-edu/static_source/guides/Take-Action-Toolkit.pdf b/python-in-edu/static_source/guides/Take-Action-Toolkit.pdf
new file mode 100644
index 0000000..6bdacd4
Binary files /dev/null and b/python-in-edu/static_source/guides/Take-Action-Toolkit.pdf differ
diff --git a/python-in-edu/static_source/images/Zen-of-OER.png b/python-in-edu/static_source/images/Zen-of-OER.png
new file mode 100644
index 0000000..2185f88
Binary files /dev/null and b/python-in-edu/static_source/images/Zen-of-OER.png differ