aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeitian LI <liweitianux@gmail.com>2014-04-27 19:33:09 +0800
committerWeitian LI <liweitianux@gmail.com>2014-04-27 19:33:09 +0800
commit8aa8d9fdc406c7352b7713c06b7b61cc9edf84a9 (patch)
tree791efe4f8f7731bf65f4be00827ddfb7c7377127
parentce1c277ee1904fb30df82f75a024822bd3411892 (diff)
downloaddjango-skaschool-8aa8d9fdc406c7352b7713c06b7b61cc9edf84a9.tar.bz2
* added poster to 'introduction' page: skaschool-poster.jpg
* removed 'about' link in 'navbar.html' * small updates to 'index.html', 'program.html'
-rw-r--r--page/templates/page/introduction.html4
-rw-r--r--page/templates/page/program.html4
-rw-r--r--static/images/skaschool-poster.jpgbin0 -> 723184 bytes
-rw-r--r--templates/index.html1
-rw-r--r--templates/navbar.html2
5 files changed, 7 insertions, 4 deletions
diff --git a/page/templates/page/introduction.html b/page/templates/page/introduction.html
index 4474094..fb22398 100644
--- a/page/templates/page/introduction.html
+++ b/page/templates/page/introduction.html
@@ -81,8 +81,8 @@
</ul>
<h3 id="poster">宣传海报</h3>
- TODO
-
+ <img src="{% static 'images/skaschool-poster.jpg' %}" class="img-responsive" alt="2014 SKA Summer School Poster">
+ <br>
</div> <!-- col-md-9, content-col -->
<div class="col-md-3" id="sidebar-col" role="complementary">
diff --git a/page/templates/page/program.html b/page/templates/page/program.html
index 3ac31a9..bff6de0 100644
--- a/page/templates/page/program.html
+++ b/page/templates/page/program.html
@@ -13,7 +13,9 @@
<div class="container">
<h2>2014 SKA 暑期学校日程安排</h2>
<br>
- TODO
+ <div class="alert alert-info">
+ 日程安排尚未确定,请等待后续通知和更新……
+ </div>
</div>
{% endblock %}
diff --git a/static/images/skaschool-poster.jpg b/static/images/skaschool-poster.jpg
new file mode 100644
index 0000000..11aad70
--- /dev/null
+++ b/static/images/skaschool-poster.jpg
Binary files differ
diff --git a/templates/index.html b/templates/index.html
index 891be41..c646f32 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -36,7 +36,6 @@
{% block footer %}
<footer class="container" role="contentinfo">
- <p>Brought to you by: <strong>Weitian LI</strong>.</p>
<ul class="masthead-links">
<li>Powered by:</li>
<li><a href="https://www.djangoproject.com/">Django</a></li>
diff --git a/templates/navbar.html b/templates/navbar.html
index d8cce99..b607a4b 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -29,8 +29,10 @@
<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="{% url 'about' %}">关于</a></li>
+ -->
</ul>
</li>
</ul>