Merge branch 'ad_banner' into ldap

This commit is contained in:
Christophe Vilayphiou committed 2012-04-26 17:15:44 +08:00
commit 7d6b82d9dd
24 files changed
+125 -114

No files matched your search

+1 -1
View File
@@ -66,7 +66,7 @@ module ParserCommon
printable_ad_images.each do |ad_image| #TODO Need Reflact
res << "<img src='#{ad_image.file}' "
res << "alt='#{ad_image.title || ' '}' "
res << "time_to_next='#{ad_banner.transition_sec}' "
res << "time_to_next='#{ad_banner.transition_msec}' "
res << "link_open='#{ad_image.link_open}' "
# res << "link_url='#{(ad_image.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' "
res << "link_url='#{(ad_image.out_link || ad_banner.context || ' ')}' "