diff options
| author | Weitian LI <liweitianux@gmail.com> | 2014-04-24 00:50:44 +0800 | 
|---|---|---|
| committer | Weitian LI <liweitianux@gmail.com> | 2014-04-24 00:50:44 +0800 | 
| commit | 92507b3dcd7671f6e61d9aade1b4e862a6b4ccb3 (patch) | |
| tree | 0e99e2162712330b5f7d90318ee5f48da2693756 | |
| parent | ce26313905fa5d5c141cc7a871d37e1740765df1 (diff) | |
| download | django-skaschool-92507b3dcd7671f6e61d9aade1b4e862a6b4ccb3.tar.bz2 | |
* added blank templates of needed pages
* added urls in pages.urls
* updated links in navbar.html
| -rw-r--r-- | page/templates/page/about.html | 20 | ||||
| -rw-r--r-- | page/templates/page/accommodation.html | 20 | ||||
| -rw-r--r-- | page/templates/page/committee.html | 20 | ||||
| -rw-r--r-- | page/templates/page/contact.html | 20 | ||||
| -rw-r--r-- | page/templates/page/program.html | 20 | ||||
| -rw-r--r-- | page/templates/page/sponsor.html | 20 | ||||
| -rw-r--r-- | page/templates/page/traffic.html | 20 | ||||
| -rw-r--r-- | page/urls.py | 31 | ||||
| -rw-r--r-- | templates/navbar.html | 15 | 
9 files changed, 178 insertions, 8 deletions
| diff --git a/page/templates/page/about.html b/page/templates/page/about.html new file mode 100644 index 0000000..2f6369e --- /dev/null +++ b/page/templates/page/about.html @@ -0,0 +1,20 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load url from future %} +{% load bootstrap3 %} + +{# about template #} + +{% block title %} +关于 | 2014 SKA Summer School +{% endblock %} + +{% block content %} +  <div class="container"> +    <h2>关于</h2> +    <br> +    TODO +  </div> +{% endblock %} + +{# vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #} diff --git a/page/templates/page/accommodation.html b/page/templates/page/accommodation.html new file mode 100644 index 0000000..8d8f61e --- /dev/null +++ b/page/templates/page/accommodation.html @@ -0,0 +1,20 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load url from future %} +{% load bootstrap3 %} + +{# accommodation template #} + +{% block title %} +住宿 | 2014 SKA Summer School +{% endblock %} + +{% block content %} +  <div class="container"> +    <h2>住宿情况</h2> +    <br> +    TODO +  </div> +{% endblock %} + +{# vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #} diff --git a/page/templates/page/committee.html b/page/templates/page/committee.html new file mode 100644 index 0000000..733735c --- /dev/null +++ b/page/templates/page/committee.html @@ -0,0 +1,20 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load url from future %} +{% load bootstrap3 %} + +{# committee template #} + +{% block title %} +组委会 | 2014 SKA Summer School +{% endblock %} + +{% block content %} +  <div class="container"> +    <h2>组委会</h2> +    <br> +    TODO ... style similar to 'notice' page +  </div> +{% endblock %} + +{# vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #} diff --git a/page/templates/page/contact.html b/page/templates/page/contact.html new file mode 100644 index 0000000..ca347d5 --- /dev/null +++ b/page/templates/page/contact.html @@ -0,0 +1,20 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load url from future %} +{% load bootstrap3 %} + +{# contact template #} + +{% block title %} +联系我们 | 2014 SKA Summer School +{% endblock %} + +{% block content %} +  <div class="container"> +    <h2>联系我们</h2> +    <br> +    TODO +  </div> +{% endblock %} + +{# vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #} diff --git a/page/templates/page/program.html b/page/templates/page/program.html new file mode 100644 index 0000000..3ac31a9 --- /dev/null +++ b/page/templates/page/program.html @@ -0,0 +1,20 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load url from future %} +{% load bootstrap3 %} + +{# program 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/templates/page/sponsor.html b/page/templates/page/sponsor.html new file mode 100644 index 0000000..aabad56 --- /dev/null +++ b/page/templates/page/sponsor.html @@ -0,0 +1,20 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load url from future %} +{% load bootstrap3 %} + +{# sponsor template #} + +{% block title %} +赞助方 | 2014 SKA Summer School +{% endblock %} + +{% block content %} +  <div class="container"> +    <h2>赞助方</h2> +    <br> +    TODO +  </div> +{% endblock %} + +{# vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #} diff --git a/page/templates/page/traffic.html b/page/templates/page/traffic.html new file mode 100644 index 0000000..372b1c1 --- /dev/null +++ b/page/templates/page/traffic.html @@ -0,0 +1,20 @@ +{% extends 'base.html' %} +{% load staticfiles %} +{% load url from future %} +{% load bootstrap3 %} + +{# traffic template #} + +{% block title %} +交通 | 2014 SKA Summer School +{% endblock %} + +{% block content %} +  <div class="container"> +    <h2>交通情况</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 d8825e5..79ae696 100644 --- a/page/urls.py +++ b/page/urls.py @@ -11,7 +11,36 @@ urlpatterns = patterns('',      # index page      url(r'^$', RedirectView.as_view(url=reverse_lazy('index'))),      # introduction page -    url(r'^introduction/$', TemplateView.as_view(template_name='page/introduction.html'), +    url(r'^introduction/$', +        TemplateView.as_view(template_name='page/introduction.html'),          name='introduction'), +    # program page +    url(r'^program/$', +        TemplateView.as_view(template_name='page/program.html'), +        name='program'), +    # committee page +    url(r'^committee/$', +        TemplateView.as_view(template_name='page/committee.html'), +        name='committee'), +    # sponsor page +    url(r'^sponsor/$', +        TemplateView.as_view(template_name='page/sponsor.html'), +        name='sponsor'), +    # traffic page +    url(r'^traffic/$', +        TemplateView.as_view(template_name='page/traffic.html'), +        name='traffic'), +    # accommodation page +    url(r'^accommodation/$', +        TemplateView.as_view(template_name='page/accommodation.html'), +        name='accommodation'), +    # contact page +    url(r'^contact/$', +        TemplateView.as_view(template_name='page/contact.html'), +        name='contact'), +    # about page +    url(r'^about/$', +        TemplateView.as_view(template_name='page/about.html'), +        name='about'),  ) diff --git a/templates/navbar.html b/templates/navbar.html index 98423f9..d8cce99 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -18,18 +18,19 @@        <ul class="nav navbar-nav">          <li><a href="{% url 'introduction' %}">介绍</a></li>          <li><a href="{% url 'list_notice' %}">通知</a></li> -        <li><a href="#">日程</a></li> -        <li><a href="#">组委会</a></li> -        <li><a href="#">交通/食宿</a></li> +        <li><a href="{% url 'program' %}">日程</a></li> +        <li><a href="{% url 'committee' %}">组委会</a></li> +        <li><a href="{% url 'sponsor' %}">赞助方</a></li> +        <li><a href="#">资料下载</a></li>          <li class="dropdown">            <a href="#" class="dropdown-toggle" data-toggle="dropdown">更多 <b class="caret"></b></a>            <ul class="dropdown-menu">              <li><a href="{% url 'list_approved' %}">审定名单</a></li> -            <li><a href="#">资料下载</a></li> -            <li><a href="#">赞助方</a></li> -            <li><a href="#">联系方式</a></li> +            <li><a href="{% url 'traffic' %}">交通</a></li> +            <li><a href="{% url 'accommodation' %}">住宿</a></li> +            <li><a href="{% url 'contact' %}">联系我们</a></li>              <li class="divider"></li> -            <li><a href="#">关于</a></li> +            <li><a href="{% url 'about' %}">关于</a></li>            </ul>          </li>        </ul> | 
