aboutsummaryrefslogtreecommitdiffstats
path: root/page
diff options
context:
space:
mode:
authorWeitian LI <liweitianux@gmail.com>2014-04-23 01:44:31 +0800
committerWeitian LI <liweitianux@gmail.com>2014-04-23 01:44:31 +0800
commit05e9bd166404ba3306cbcec335c4ad88dd44ddc2 (patch)
treed89f3ace50fe4bfa68ed344f1f665e8604493652 /page
parent062131495d2a319fcbb58bbdfd2b09626646dea9 (diff)
downloaddjango-skaschool-05e9bd166404ba3306cbcec335c4ad88dd44ddc2.tar.bz2
* added urls and template for 'introduction' in app page
* fixed page/views.py
Diffstat (limited to 'page')
-rw-r--r--page/templates/page/introduction.html20
-rw-r--r--page/urls.py6
-rw-r--r--page/views.py1
3 files changed, 23 insertions, 4 deletions
diff --git a/page/templates/page/introduction.html b/page/templates/page/introduction.html
new file mode 100644
index 0000000..9c89e0d
--- /dev/null
+++ b/page/templates/page/introduction.html
@@ -0,0 +1,20 @@
+{% extends 'base.html' %}
+{% load staticfiles %}
+{% load url from future %}
+{% load bootstrap3 %}
+
+{# introduction template #}
+
+{% block title %}
+介绍 | 2014 SKA Summer School
+{% endblock %}
+
+{% block content %}
+ <div class="container">
+ <h2>2014 SKA 暑期学校介绍</h2>
+ <br>
+ TODO
+ </div>
+{% endblock %}
+
+{# vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #}
diff --git a/page/urls.py b/page/urls.py
index 8c195e9..d8825e5 100644
--- a/page/urls.py
+++ b/page/urls.py
@@ -8,10 +8,10 @@ from django.views.generic.base import TemplateView, RedirectView
from django.core.urlresolvers import reverse_lazy
urlpatterns = patterns('',
- # test page
- url(r'^test/$', TemplateView.as_view(template_name='test.html'),
- name='test'),
# index page
url(r'^$', RedirectView.as_view(url=reverse_lazy('index'))),
+ # introduction page
+ url(r'^introduction/$', TemplateView.as_view(template_name='page/introduction.html'),
+ name='introduction'),
)
diff --git a/page/views.py b/page/views.py
index 15b7575..3af87bb 100644
--- a/page/views.py
+++ b/page/views.py
@@ -9,7 +9,6 @@ from django.views.generic.base import TemplateView
###### class-based views ######
-## IndexView: used in 'django_skaschool/urls' as index