Fix ad_banner

app/assets/javascripts/inc/modal-preview.js

@@ -6,10 +6,17 @@ $(document).ready(function() {
 	$("a.preview_trigger").click(function(){
 		$(this).after("<span id='show_preview'></span>");
 		$.ajax({
-			type:"put",
+			type: 'PUT',
+			//async : true,
 			url:$(this).attr("href"),
-			data:$(this).parents("form").serialize()
-			}).done(function(){ $("#"+start_modal_with_id).modal('show');});  
-			return false;}
-		);
+			contentType: 'application/javascript; charset=utf-8',
+			data:$(this).parents("form").serialize(),
+			success: function (msg) {
+					$("#"+start_modal_with_id).modal('show'); },
+			error: function(){
+				alert("ERROR");
+				}
+			});  
+			return false;
+		});
 });

app/models/ad_banner.rb

@@ -4,7 +4,7 @@ class AdBanner
   include Mongoid::MultiParameterAttributes
   
   field :title
-  field :transition_sec,type: Integer
+  field :transition_msec,type: Integer
   field :ad_fx  #TODO Design should explain
 
   before_save :save_or_destroy
@@ -13,6 +13,14 @@ class AdBanner
   has_many :ad_images , dependent: :delete
   
   FX_TYPES = ["blindX","blindY","blindZ","cover","curtainX","curtainY","fade","fadeZoom","growX","growY","scrollUp","scrollDown","scrollLeft","scrollRight","scrollHorz","scrollVert","shuffle","slideX","slideY","toss","turnUp","turnDown","turnLeft","turnRight","uncover","wipe","zoom"]
+attr_writer :transition_sec
+  def transition_sec
+    self.transition_msec/1000
+  end
+  
+  def transition_sec=(sec)
+    self.transition_msec = sec.to_i*1000
+  end
   
   def preview_clone
     preview_banner = self.clone

app/views/admin/ad_banners/_ad_banner_tab.html.erb

@@ -5,7 +5,7 @@
 		<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
 		<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
 		<%= f.label :transition_sec, t('admin.ad.transition_sec') %>
-		<%= f.text_field :transition_sec,:placeholder=>"3秒請輸入3000",:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
+		<%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
 		<%= f.submit t("admin.ad.update_banner") %>
 		<%= f.submit t("cancel"),:type=>'reset' %>
 	<div class="adbanner-list">

app/views/admin/ad_banners/_modal_ad_banner_form.html.erb

@@ -40,11 +40,13 @@ $('#new_ad_banner_tab_but').on('shown', function (e) {
 			$('#new-a-banner').modal({show: true});
 });
 
-<% if params[:action] == "new"  -%>
-		 $('#new-a-banner').modal({show: true});
-<% end -%>
+
 $('#new-a-banner').on('hidden', function (e) {
-	$(".nav.nav-tabs  a[id!='new_ad_banner_tab_but']:last").tab('show');
+	$('#post-body-content').find(".nav.nav-tabs").children('li.active').removeClass("active");
+	
+	$('#post-body-content').find(".nav.nav-tabs").children('li[id!="new_ad_banner_tab_but"]').last().addClass("active");
+	$('.tab-pane').find(".nav.nav-tabs").children('li[id!="new_ad_banner_tab_but"]').last().addClass("active");
+	
 });
 </script>