From a64eb136b0d8710ff132551f149a39b3a45da1f9 Mon Sep 17 00:00:00 2001 From: Weitian LI Date: Mon, 23 Jun 2014 23:38:55 +0800 Subject: Updated traffic and introduction pages. * Small updates to introduction page. * Updated traffic page: - traffic routes - new metro map * Used bootstrap modal plugin to view images for traffic page - traffic.js - traffic.css --- page/static/css/traffic.css | 16 +++++++++ page/static/images/map-dongchuan-route.png | Bin 0 -> 569035 bytes page/static/images/shmetro_map2014.jpg | Bin 0 -> 529992 bytes page/static/js/traffic.js | 25 +++++++++++++ page/templates/page/introduction.html | 4 +-- page/templates/page/traffic.html | 55 ++++++++++++++++++++++------- 6 files changed, 86 insertions(+), 14 deletions(-) create mode 100644 page/static/css/traffic.css create mode 100644 page/static/images/map-dongchuan-route.png create mode 100644 page/static/images/shmetro_map2014.jpg create mode 100644 page/static/js/traffic.js diff --git a/page/static/css/traffic.css b/page/static/css/traffic.css new file mode 100644 index 0000000..8b21f7a --- /dev/null +++ b/page/static/css/traffic.css @@ -0,0 +1,16 @@ +/* + * traffic.css + * used with 'traffic.html' page + * + * 2014/06/23 + */ + +img.modal-images { + cursor: pointer; +} + +// modal style +@media (min-width: 768px) { + // +} + diff --git a/page/static/images/map-dongchuan-route.png b/page/static/images/map-dongchuan-route.png new file mode 100644 index 0000000..bca9a0c Binary files /dev/null and b/page/static/images/map-dongchuan-route.png differ diff --git a/page/static/images/shmetro_map2014.jpg b/page/static/images/shmetro_map2014.jpg new file mode 100644 index 0000000..59756a4 Binary files /dev/null and b/page/static/images/shmetro_map2014.jpg differ diff --git a/page/static/js/traffic.js b/page/static/js/traffic.js new file mode 100644 index 0000000..34400c5 --- /dev/null +++ b/page/static/js/traffic.js @@ -0,0 +1,25 @@ +/* + * traffic.js + * used with 'traffic.html' page + * + * 2014/06/23 + */ + +/* bootstrap 3 built-in modal plugin */ +$(document).ready(function() { + $("img.modal-images").on("click", function() { + var src = $(this).attr('src'); + var img_html = ''; + var orig_html = $('#imageviewer-modal .modal-body').html(); + // modal + $('#imageviewer-modal').modal('toggle'); + // action + $('#imageviewer-modal').on('shown.bs.modal', function() { + $('#imageviewer-modal .modal-body').html(img_html); + }); + $('#imageviewer-modal').on('hidden.bs.modal', function() { + $('#imageviewer-modal .modal-body').html(orig_html); + }); + }); +}); + diff --git a/page/templates/page/introduction.html b/page/templates/page/introduction.html index ccc1a1a..a205095 100644 --- a/page/templates/page/introduction.html +++ b/page/templates/page/introduction.html @@ -35,7 +35,7 @@

基本信息

注：
- 1、除虹桥机场（火车站）外，不推荐乘坐公交车。若实在不方便乘坐出租车或地铁、可使用百度地图查看可用公交线路。
- 2、出租车费用仅供参考。 + 1. 除"虹桥机场/虹桥火车站"外，不推荐乘坐公交。推荐乘坐地铁，价格合适，时间容易把握。
+ 2. 上海地铁有一些车站需要"出站换乘"，因此使用单程票时需要分段购买。使用交通卡则无需担心。

地图

-

上海交通闵行校区地图

- SJTU Minhang Campus Map +
+
+

上海交通闵行校区地图

+ SJTU Minhang Campus Map +
+
+

上海轨迹交通网络示意图

+ Shanghai Metro Network Map +
+


+ + + {% endblock %} +{% block js_extra %} + +{% endblock %} + {# vim: set ts=8 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #} -- cgit v1.2.2