diff options
| author | Weitian LI <liweitianux@gmail.com> | 2014-06-25 12:38:17 +0800 |
|---|---|---|
| committer | Weitian LI <liweitianux@gmail.com> | 2014-06-25 12:38:17 +0800 |
| commit | f2e55b18c6b08dd5bb7ce0d04d5f2a5ecc54b98c (patch) | |
| tree | 9a3cf4611b2361a8bc03952c0f0f4e5590bcade8 /page | |
| parent | 88c4fa2c87138d9f4707ad7193662953f9de725f (diff) | |
| download | django-skaschool-f2e55b18c6b08dd5bb7ce0d04d5f2a5ecc54b98c.tar.bz2 | |
Updated traffic page with new images
* Added sjtu_tuoxie_02.jpg and sjtu_xueshu_02.jpg images
* Small fix to schedule.html
Diffstat (limited to 'page')
| -rw-r--r-- | page/static/images/sjtu_tuoxie_02.jpg | bin | 0 -> 151693 bytes | |||
| -rw-r--r-- | page/static/images/sjtu_xueshu_02.jpg | bin | 0 -> 80080 bytes | |||
| -rw-r--r-- | page/templates/page/traffic.html | 20 |
3 files changed, 14 insertions, 6 deletions
diff --git a/page/static/images/sjtu_tuoxie_02.jpg b/page/static/images/sjtu_tuoxie_02.jpg Binary files differnew file mode 100644 index 0000000..94a20d4 --- /dev/null +++ b/page/static/images/sjtu_tuoxie_02.jpg diff --git a/page/static/images/sjtu_xueshu_02.jpg b/page/static/images/sjtu_xueshu_02.jpg Binary files differnew file mode 100644 index 0000000..153854d --- /dev/null +++ b/page/static/images/sjtu_xueshu_02.jpg diff --git a/page/templates/page/traffic.html b/page/templates/page/traffic.html index c4f8a96..21a39f3 100644 --- a/page/templates/page/traffic.html +++ b/page/templates/page/traffic.html @@ -17,11 +17,16 @@ <br> <div class="alert alert-info"> <p><strong>地点</strong>：上海交通大学闵行校区（上海市闵行区东川路800号）</p> - <p><strong>会场</strong>：学术活动中心</p> + <p><strong>会场</strong>：学术活动中心(Acadmeic Activity Center)</p> </div> - <div class="map-place"> - <img src="{% static 'images/map-place.png' %}" class="img-responsive" alt="Map of Metting Place"> + <div class="row map-place"> + <div class="col-md-6"> + <img src="{% static 'images/map-place.png' %}" class="modal-images img-responsive" alt="Map of Metting Place"> + </div> + <div class="col-md-6"> + <img src="{% static 'images/sjtu_xueshu_02.jpg' %}" class="modal-images img-responsive" alt="Acadmeic Activity Center"> + </div> </div> <h3>交通路线</h3> @@ -60,7 +65,10 @@ <li>公交：江川7路（直到交大校区内）；虹桥枢纽4路（至永平路东川路站）；闵莘线（永平路东川路站）；闵行26路（至东川路沧源路站）</li> <div class="row"> <div class="col-md-4"> - <li><img class="modal-images img-responsive" src="{% static 'images/map-dongchuan-route.png' %}" alt="Route from Dongchuan metro station to SJTU campus"></li> + <img class="modal-images img-responsive" src="{% static 'images/map-dongchuan-route.png' %}" alt="Route from Dongchuan metro station to SJTU campus"> + </div> + <div class="col-md-4"> + <img class="modal-images img-responsive" src="{% static 'images/sjtu_tuoxie_02.jpg' %}" alt="SJTU Tuoxie Door"> </div> </div> </ul> @@ -74,11 +82,11 @@ <h3>地图</h3> <div class="row"> - <div class="col-md-6"> + <div class="col-md-7"> <p><strong>上海交通闵行校区地图</strong></p> <img src="{% static 'images/sjtu_minhang_campusmap_zh.jpg' %}" class="img-responsive modal-images" alt="SJTU Minhang Campus Map"> </div> - <div class="col-md-6"> + <div class="col-md-5"> <p><strong>上海轨迹交通网络示意图</strong></p> <img src="{% static 'images/shmetro_map2014.jpg' %}" class="img-responsive modal-images" alt="Shanghai Metro Network Map"> </div> |
