From 8aa8d9fdc406c7352b7713c06b7b61cc9edf84a9 Mon Sep 17 00:00:00 2001
From: Weitian LI <liweitianux@gmail.com>
Date: Sun, 27 Apr 2014 19:33:09 +0800
Subject: * added poster to 'introduction' page: skaschool-poster.jpg * removed
 'about' link in 'navbar.html' * small updates to 'index.html', 'program.html'

---
 page/templates/page/introduction.html |   4 ++--
 page/templates/page/program.html      |   4 +++-
 static/images/skaschool-poster.jpg    | Bin 0 -> 723184 bytes
 templates/index.html                  |   1 -
 templates/navbar.html                 |   2 ++
 5 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 static/images/skaschool-poster.jpg

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
Binary files /dev/null and b/static/images/skaschool-poster.jpg 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>
-- 
cgit v1.2.2