From 8c68c54a57b4d862b2f8114170f4198332f6711f Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Fri, 13 Sep 2013 12:36:41 +0800
Subject: [PATCH] ad_banner banner load fixed for test site

Conflicts:

	app/views/front/show_banner.html.erb
---
 app/views/front/show_banner.html.erb | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/views/front/show_banner.html.erb b/app/views/front/show_banner.html.erb
index 491dbe729..c35dd3647 100644
--- a/app/views/front/show_banner.html.erb
+++ b/app/views/front/show_banner.html.erb
@@ -1,5 +1,16 @@
-<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>
+<script type='text/javascript' src='/assets/jquery.cycle.all.latest.js'></script>
+<div style='position:relative'>
+  <ul id='banner_nav' class='clear banner_nav-<%= @ad_banner.title.dehumanize %>'></ul>
+  <div id='slideshow-<%= @ad_banner.title.dehumanize %>' class='slideshow'>
+    <% (images = @ad_banner.ad_images).shuffle.each do |ad_image| %>
+      <% if ad_image.display? %>
+        <img src='<%= ad_image.file %>' alt='<%= ad_image.title || ' ' %>' title='<%= ad_image.title || ' ' %>' time_to_next='<%= @ad_banner.transition_msec %>' link_open='<%= ad_image.link_open %>' link_url='<%= ad_image_link(ad_image) %>' style=' <%= 'cursor:pointer;' if !ad_image_link(ad_image).blank? %>'/>  
+      <% end %>
+    <% end %>
+  </div>
+</div>
 <script type='text/javascript'>
+$(document).ready(function(){
   jQuery(function( $ ){     
 
       $('#slideshow-<%= @ad_banner.title.dehumanize %>').cycle({
@@ -12,15 +23,5 @@
         }
       });
   });
+});
 </script>
-
-<div style='position:relative'>
-  <ul id='banner_nav' class='clear banner_nav-<%= @ad_banner.title.dehumanize %>'></ul>
-  <div id='slideshow-<%= @ad_banner.title.dehumanize %>' class='slideshow'>
-    <% (images = @ad_banner.ad_images).shuffle.each do |ad_image| %>
-      <% if ad_image.display? %>
-        <img src='<%= ad_image.file %>' alt='<%= ad_image.title || ' ' %>' title='<%= ad_image.title || ' ' %>' time_to_next='<%= @ad_banner.transition_msec %>' link_open='<%= ad_image.link_open %>' link_url='<%= ad_image_link(ad_image) %>' style=' <%= 'cursor:pointer;' if !ad_image_link(ad_image).blank? %>'/>  
-      <% end %>
-    <% end %>
-  </div>
-</div>
\ No newline at end of file