diff --git a/app/assets/javascripts/mobile/orbit.mobile.js.erb b/app/assets/javascripts/mobile/orbit.mobile.js.erb index 2a567730..90531899 100644 --- a/app/assets/javascripts/mobile/orbit.mobile.js.erb +++ b/app/assets/javascripts/mobile/orbit.mobile.js.erb @@ -25,8 +25,8 @@ $('#index').live('pageinit',function(){ $(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)}); $(this).find(".newpic img").muImageResize({width: 280, height: 200}); $('.slideshow').cycle({ - fx:'scrollLeft', - timeout: 6000, + fx: $effect, + timeout: $timeout }); $(".newlist").css({ "width" : $(".newitem").outerWidth()*(Math.floor($globalW/$(".newitem").outerWidth()))+30, @@ -40,8 +40,9 @@ $('#index').live('pageinit',function(){ $('#announcement_content').live('pageinit',function(){ $(this).find(".newpic img").muImageResize({width: 320, height: 220}); }); -var mobileDemo = { 'center': '24.987449, 121.576117', 'zoom': 17 }; + $('#map').live('pageinit', function() { + var mobileDemo = { 'center': $map_center, 'zoom': $map_zoom }; var $windowH = $(window).height(); $("#map_canvas").css({ 'height' : $windowH, @@ -50,7 +51,7 @@ $('#map').live('pageinit', function() { $('#map_canvas').gmap({'center': mobileDemo.center, 'zoom': mobileDemo.zoom, 'disableDefaultUI':false, 'callback': function() { var self = this; self.addMarker({'position': this.get('map').getCenter() }).click(function() { - self.openInfoWindow({ 'content': "<%= I18n.t('mobile.location_description') %>" }, this); + self.openInfoWindow({ 'content': $info }, this); }); }}); }).load('basic_map'); diff --git a/app/views/mobile/index.mobile.erb b/app/views/mobile/index.mobile.erb index 7bbf2607..b91bc35b 100644 --- a/app/views/mobile/index.mobile.erb +++ b/app/views/mobile/index.mobile.erb @@ -23,4 +23,5 @@ diff --git a/app/views/mobile/map.mobile.erb b/app/views/mobile/map.mobile.erb index ba969acb..51e69dbf 100644 --- a/app/views/mobile/map.mobile.erb +++ b/app/views/mobile/map.mobile.erb @@ -2,4 +2,9 @@ <%= render 'header_map' %> <% end %> -
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/config/locales/mobile.en.yml b/config/locales/mobile.en.yml index b72ca7c0..0452e38c 100644 --- a/config/locales/mobile.en.yml +++ b/config/locales/mobile.en.yml @@ -7,5 +7,5 @@ en: home: Home language: Language location: Location - location_description: '

國立政治大學

11605 臺北市文山區指南路二段64號' + location_description: '

National Chengchi University

NO.64,Sec.2,ZhiNan Rd.,Wenshan District,Taipei City 11605,Taiwan (R.O.C)' page: Page \ No newline at end of file