From 0e896bbb836c218caea265072949b123b3bb0159 Mon Sep 17 00:00:00 2001 From: Seth Woodworth Date: Fri, 25 Jan 2013 16:52:43 -0500 Subject: [PATCH] re-add school leader board by writing an AboutView TemplateView --- karmaworld/apps/courses/views.py | 13 +++++++++++++ karmaworld/templates/about.html | 15 +++++++-------- karmaworld/urls.py | 4 +++- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/karmaworld/apps/courses/views.py b/karmaworld/apps/courses/views.py index f8fab63..a9dd145 100644 --- a/karmaworld/apps/courses/views.py +++ b/karmaworld/apps/courses/views.py @@ -3,8 +3,10 @@ # Copyright (C) 2012 FinalsClub Foundation from django.views.generic import DetailView +from django.views.generic import TemplateView from karmaworld.apps.courses.models import Course +from karmaworld.apps.courses.models import School class CourseDetailView(DetailView): """ Class-based view for the course html page """ @@ -12,3 +14,14 @@ class CourseDetailView(DetailView): model = Course # name passed to template context_object_name = u"course" + + +class AboutView(TemplateView): + """ Display the About page with the Schools leaderboard """ + template_name = "about.html" + + def get_context_data(self, **kwargs): + """ get the list of schools with the most files for leaderboard """ + context = { 'params': kwargs, \ + 'schools': School.objects.all()[:3] } + return context diff --git a/karmaworld/templates/about.html b/karmaworld/templates/about.html index af11f7b..da15b1e 100644 --- a/karmaworld/templates/about.html +++ b/karmaworld/templates/about.html @@ -81,26 +81,25 @@ -
- {{ school.karma|intcomma }} -
/leaderboard_score - /leaderboard_item + {{ school.file_count }} + + {% endfor %} - /leaderboard_table + ---> {% endblock %} diff --git a/karmaworld/urls.py b/karmaworld/urls.py index 07b8fc8..7b597d9 100644 --- a/karmaworld/urls.py +++ b/karmaworld/urls.py @@ -9,6 +9,7 @@ from django.views.generic.simple import direct_to_template from karmaworld.apps.ajaxuploader.views import ajax_uploader from karmaworld.apps.courses.models import Course +from karmaworld.apps.courses.views import AboutView from karmaworld.apps.courses.views import CourseDetailView from karmaworld.apps.notes.views import NoteView from karmaworld.apps.notes.views import raw_file @@ -22,9 +23,10 @@ urlpatterns = patterns('', url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/', include(admin.site.urls)), - url(r'^about/$', direct_to_template, { 'template': 'about.html' }, name='about'), url(r'^terms/$', direct_to_template, { 'template': 'terms.html' }, name='terms'), + url(r'^about/$', AboutView.as_view(), name='about'), + url(r'^raw/(?P\d+)$', raw_file, name='note_raw'), url(r'^(?P[^/]+)/(?P[^/]+)$', \ CourseDetailView.as_view(), name='course_detail'), -- 2.25.1