* moved 'introduction.js' -> 'sidebar.js'

* moved 'introduction.css' -> 'sidebar.css'
* updated page introduction.html
* updated index.html and navbar.html

6 files changed, 13 insertions, 6 deletions

diff --git a/page/templates/page/introduction.html b/page/templates/page/introduction.html
index fb22398..9a40b29 100644
--- a/page/templates/page/introduction.html
+++ b/page/templates/page/introduction.html
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block css_extra %}
-  <link href="{% static 'css/introduction.css' %}" rel="stylesheet">
+  <link href="{% static 'css/sidebar.css' %}" rel="stylesheet">
 {% endblock %}
 
 {% block content %}
@@ -102,7 +102,7 @@
 {% endblock %}
 
 {% block js_extra %}
-  <script src="{% static 'js/introduction.js' %}" type="text/javascript"></script>
+  <script src="{% static 'js/sidebar.js' %}" type="text/javascript"></script>
 {% endblock %}
 
 
diff --git a/static/css/index.css b/static/css/index.css
index 344ff07..6a2d573 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -31,7 +31,7 @@
 .masthead-links {
     list-style: none outside none;
     margin-top: 10px;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     padding: 0 15px;
     text-align: center;
 }
diff --git a/page/static/css/introduction.css b/static/css/sidebar.css
index 58a6220..8208983 100644
--- a/page/static/css/introduction.css
+++ b/static/css/sidebar.css
@@ -1,5 +1,5 @@
 /*
- * css for introduction template
+ * css for sidebar
  */
 
 .navbar-bright {
diff --git a/page/static/js/introduction.js b/static/js/sidebar.js
index b0ff02c..4bfc7a7 100644
--- a/page/static/js/introduction.js
+++ b/static/js/sidebar.js
@@ -1,5 +1,5 @@
 /*
- * js for introduction page
+ * js for sidebar
  */
 
 $(document).ready(function() {
diff --git a/templates/index.html b/templates/index.html
index ba40227..17559f2 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -37,10 +37,17 @@
 {% block footer %}
   <footer class="container" role="contentinfo">
     <ul class="masthead-links">
+      <li>Links:</li>
+      <li><a href="http://www.sjtu.edu.cn/" target="_blank">上海交通大学</a></li>
+      <li><a href="http://www.physics.sjtu.edu.cn/" target="_blank">物理与天文系</a></li>
+      <li><a href="http://skatelescope.org/" target="_blank">SKA</a></li>
+    </ul>
+    <ul class="masthead-links">
       <li>Powered by:</li>
       <li><a href="https://www.djangoproject.com/" target="_blank">Django</a></li>
       <li><a href="http://getbootstrap.com/" target="_blank">Bootstrap</a></li>
     </ul>
+    <br>
   </footer>
 {% endblock %}
 
diff --git a/templates/navbar.html b/templates/navbar.html
index b607a4b..75a2c71 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -21,7 +21,7 @@
         <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><a href="{% url 'archive_all' %}">资料下载</a></li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">更多 <b class="caret"></b></a>
           <ul class="dropdown-menu">