developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for banner link

This commit is contained in:
Christophe Vilayphiou 2012-08-13 11:03:11 +08:00
parent 33fc96ac7c
commit 2ea3193879
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/ad_image.rb
View File

@ -27,7 +27,7 @@ class AdImage
attr_reader :parse_post_date,:parse_unpost_date
before_validation :add_http
validates :out_link, :presence => true, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix
validates :out_link, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix, :allow_blank => true
def parse_post_date=(att)
self.post_date = (Date.parse att.gsub(/\s+/, "") rescue nil)
@ -59,7 +59,7 @@ class AdImage
protected
def add_http
unless self.out_link[/^http:\/\//] || self.out_link[/^https:\/\//]
unless self.out_link[/^http:\/\//] || self.out_link[/^https:\/\//] || self.out_link.blank?
self.out_link = 'http://' + self.out_link
end
end

3
lib/parsers/parser_common.rb
View File

@ -73,7 +73,8 @@ module ParserCommon
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 || ' ')}' "
res << "link_url='#{(ad_image.out_link)}' "
res << "style='cursor:pointer'" if !ad_image.out_link.blank?
res << "/>"
end
res << "</div>"

13
public/static/kernel.js
View File

@ -26,14 +26,17 @@ function getTimeout() {
$(document).ready(function() {
$('.slideshow').children('img').click(function()
{
if($(this).attr('link_open')=='new_window')
if($(this).attr('link_url')!='')
{
window.open($(this).attr('link_url'));
if($(this).attr('link_open')=='new_window')
{
window.open($(this).attr('link_url'));
}
else
{
document.location.href=$(this).attr('link_url')
else
{
document.location.href=$(this).attr('link_url')
}
}
})
});
// Ad Banner FX code [end]