From ddf7931123b2b0fe69ba473b5932c2432c19a690 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Wed, 25 Apr 2012 11:38:45 +0800
Subject: [PATCH] Change ad_banner preview from using title to id

---
 app/assets/javascripts/inc/modal-preview.js   |  2 --
 .../admin/ad_banners_controller.rb            |  4 +--
 .../admin/ad_banners/_ad_banner_tab.html.erb  |  2 +-
 .../admin/ad_banners/_modal_preview.html.erb  | 36 ++++++++++---------
 config/routes.rb                              |  2 +-
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/inc/modal-preview.js b/app/assets/javascripts/inc/modal-preview.js
index 35195999..44fa62a3 100644
--- a/app/assets/javascripts/inc/modal-preview.js
+++ b/app/assets/javascripts/inc/modal-preview.js
@@ -7,9 +7,7 @@ $(document).ready(function() {
 		$(this).after("<span id='show_preview'></span>");
 		$.ajax({
 			type: 'PUT',
-			//async : true,
 			url:$(this).attr("href"),
-			contentType: 'application/javascript; charset=utf-8',
 			data:$(this).parents("form").serialize(),
 			success: function (msg) {
 					$("#"+start_modal_with_id).modal('show'); },
diff --git a/app/controllers/admin/ad_banners_controller.rb b/app/controllers/admin/ad_banners_controller.rb
index 1e96907f..a21693aa 100644
--- a/app/controllers/admin/ad_banners_controller.rb
+++ b/app/controllers/admin/ad_banners_controller.rb
@@ -45,8 +45,8 @@ class Admin::AdBannersController < ApplicationController
   end
   
   def realtime_preview
-    @ad_banner = AdBanner.first(conditions: { title: params[:title] }).preview_clone
-    #@ad_banner.update_attributes(params[:ad_banner]).update_attributes(params[:ad_images])
+    @ad_banner = AdBanner.find( params[:id] ).preview_clone
+    @ad_banner.update_attributes(params[:ad_banner])#.update_attributes(params[:ad_images])
   end
   
   def index
diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb
index c1e406db..79dc647c 100644
--- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb
+++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb
@@ -11,7 +11,7 @@
 	<div class="adbanner-list">
 		<div class="adbanner-action">
 			<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
-			<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%>
+			<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab) , :class=>'preview_trigger btn btn-success'%>
 		</div>
 		<ul class="clear">
 			<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab}  %>
diff --git a/app/views/admin/ad_banners/_modal_preview.html.erb b/app/views/admin/ad_banners/_modal_preview.html.erb
index 27222e57..12e95020 100644
--- a/app/views/admin/ad_banners/_modal_preview.html.erb
+++ b/app/views/admin/ad_banners/_modal_preview.html.erb
@@ -1,6 +1,6 @@
 <% if ad_banner -%>
 
-<div class="modal hide fade in banner-preview" id='slideshow-<%=ad_banner.title.dehumanize%>'>
+<div class="modal hide fade in banner-preview" id="slideshow-<%=ad_banner.title.dehumanize%>">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
     <h3><%= t("modal.preview") %></h3>
@@ -8,28 +8,30 @@
   <div class="modal-body">
     <p class="ad_banner_slideshow">
 			<% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%>
-				<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %>
+				<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %>
 			<% end -%>
     </p>
   </div>
   <div class="modal-footer">
     <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
   </div>
+  <div>
+  	<script type="text/javascript" src="/static/kernel.js"></script>
+		<script type="text/javascript">
+			$(document).ready(function() {
+	
+			$("#slideshow-<%=ad_banner.title.dehumanize%>").on("show", function () {
+				console.info("<%= ad_banner.ad_fx.nil?? "fade": ad_banner.ad_fx %>"+"   <%= ad_banner.transition_msec %>");
+  		$("#slideshow-<%=ad_banner.title.dehumanize%>").find(".ad_banner_slideshow").cycle({delay: -1000, fx: "<%= ad_banner.ad_fx.nil?? "fade": ad_banner.ad_fx %>", timeoutFn: getTimeout });
+			});
+		$(".modal").on("hidden", function () {
+	  $("#show_preview").remove();
+			});
+		});
+		</script>
+	</div>
 </div>
 
-<% end -%>
 
-<script type='text/javascript' src='/static/kernel.js'></script>
-<script type='text/javascript'>
-	$(document).ready(function() {
-	
-	$('#slideshow-<%=ad_banner.title.dehumanize%>').on('show', function () {
-  	$('#slideshow-banner_1').find(".ad_banner_slideshow").cycle({delay: -1000, fx: '<%= ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx %>', timeoutFn: getTimeout });
-	});
-	$(".modal").on('hidden', function () {
-	  $("#show_preview").remove();
-	});
-	//$('#slideshow-<%=ad_banner.title.dehumanize%>').show();
-	
-	});
-</script>
+
+<% end -%>
diff --git a/config/routes.rb b/config/routes.rb
index 3b48f300..e8695f0a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -25,7 +25,7 @@ Orbit::Application.routes.draw do
     end
 
 
-    match 'ad_banner/:title/preview' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put
+    match 'ad_banner/:id/preview' => 'ad_banners#realtime_preview',:as => :realtime_preview_ad_banner,:via => :put
     resources :ad_banners do 
         collection do
           match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get