diff options
| author | Weitian LI <liweitianux@gmail.com> | 2014-05-18 15:36:09 +0800 |
|---|---|---|
| committer | Weitian LI <liweitianux@gmail.com> | 2014-05-18 15:36:09 +0800 |
| commit | ce61677ea556749f810954ccd6704eaff70c75e7 (patch) | |
| tree | e6aa5ee0244b5fe8a0cbc55ca97f8e7dc03d75b6 | |
| parent | e4bfdf788035ab68e024df5522a308acfde8d386 (diff) | |
| download | django-skaschool-ce61677ea556749f810954ccd6704eaff70c75e7.tar.bz2 | |
* updated 'robots.txt'
* updated template 'base.html' to include 'metainfo.html' and 'sitetitle.txt'
* updated navbar.html main button text
| -rw-r--r-- | static/robots.txt | 4 | ||||
| -rw-r--r-- | templates/base.html | 9 | ||||
| -rw-r--r-- | templates/metainfo.html | 6 | ||||
| -rw-r--r-- | templates/navbar.html | 2 | ||||
| -rw-r--r-- | templates/sitetitle.txt | 1 |
5 files changed, 20 insertions, 2 deletions
diff --git a/static/robots.txt b/static/robots.txt index f25ee0a..a0a6fc6 100644 --- a/static/robots.txt +++ b/static/robots.txt @@ -1,2 +1,6 @@ user-agent: AhrefsBot disallow: / + +user-agent: * +disallow: /media/account/ + diff --git a/templates/base.html b/templates/base.html index 81766a4..c080043 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,7 +14,10 @@ Weitian LI <liweitianux@gmail.com> {# title #} {% block bootstrap3_title %} - {% block title %}(title){% endblock %} + {% block title %} + {% block pagetitle %}(pagetitle){% endblock %} | + {% block sitetitle %}{% include 'sitetitle.txt' %}{% endblock %} + {% endblock %} {% endblock %} {# bootstrap3_extra_head #} @@ -29,6 +32,10 @@ Weitian LI <liweitianux@gmail.com> {% block favicon %} {% include 'favicon.html' %} {% endblock %} + {# add meta information #} + {% block metainfo %} + {% include 'metainfo.html' %} + {% endblock %} {% endblock %} {# body #} diff --git a/templates/metainfo.html b/templates/metainfo.html new file mode 100644 index 0000000..19f2bbc --- /dev/null +++ b/templates/metainfo.html @@ -0,0 +1,6 @@ +{# Meta infomation: to be included in 'base.html' #} +<meta name="keywords" content="SKA summer school,SKA暑期学校,skaschool,skaschool2014,SKA,summer school,暑期学校,中国SKA暑期学校,联合SKA暑期学校"> +<meta name="description" content="平方公里阵(SKA)是计划中的下一代巨型射电望远镜阵，该项目由全球十多个国家共同出资建造，中国是创始成员国之一。作为中国SKA人才培养计划的一个重要环节，中国SKA暑期学校将每年举办一届，面向在校学校（尤其是有志于天文与物理事业的本科生）和青年学者。2014年6月28日至7月5日将于上海交通大学（闵行校区）举办第二届SKA暑期学校，自本届起，暑期学校将由中国和新西兰联合举办。"> +<meta name="author" content="2014第二届中国SKA暑期学校"> +<meta name="application-name" content="skaschool2014"> +{# vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #} diff --git a/templates/navbar.html b/templates/navbar.html index 75a2c71..e78e2cf 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -11,7 +11,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="{% url 'index' %}">SKA暑期学校</a> + <a class="navbar-brand" href="{% url 'index' %}">2014 SKA暑期学校</a> </div> <!-- navbar-header --> <!-- Collect the nav links, forms, and other content for toggling --> <div class="collapse navbar-collapse" id="ska-navbar-collapse"> diff --git a/templates/sitetitle.txt b/templates/sitetitle.txt new file mode 100644 index 0000000..bd5cad4 --- /dev/null +++ b/templates/sitetitle.txt @@ -0,0 +1 @@ +2014 第二届 中国SKA暑期学校 | 上海交通大学 | China-New Zealand Joint SKA Summer School |