diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-06-22 01:18:03 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-06-22 01:18:03 -0400 |
commit | 6bf6c320b8ad2cb5aa588575565af70b437aa322 (patch) | |
tree | b2c92c4b75de5c9dcbfb6639e56aac38cf545e67 /lib/sisu/v5/html_promo.rb | |
parent | debian/changelog (4.1.4-1) (diff) | |
parent | v5: general code cleaning (diff) |
Merge tag 'sisu_4.1.5' into debian/sid
SiSU 4.1.5
Diffstat (limited to 'lib/sisu/v5/html_promo.rb')
-rw-r--r-- | lib/sisu/v5/html_promo.rb | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/sisu/v5/html_promo.rb b/lib/sisu/v5/html_promo.rb index a76a15fa..cd57e5fd 100644 --- a/lib/sisu/v5/html_promo.rb +++ b/lib/sisu/v5/html_promo.rb @@ -175,7 +175,7 @@ module SiSU_HTML_Promo @rc['search']['sisu']['action'] else nil end - form=if action \ + if action \ and db @env.widget.search_form('sisusearch',action,db,table) else '' @@ -275,36 +275,34 @@ module SiSU_HTML_Promo end def site_link #Work area if url_link.url - <<WOK + <<-WOK <p class="pane"> #{url_link.url} #{image} #{title} #{subtitle} </a>#{nick}</p> -WOK + WOK else - <<WOK + <<-WOK <p class="pane"> #{image} #{title} #{subtitle} </p> -WOK + WOK end end self end def output_form_sponsor(type,id) cell=cell(@ad[:promo][type][id],prod_id) - prod_type=((id=~/id_(?:[0-9x]){10,13}/i) ? 'isbn' : 'id') - id_detail=%{<p class="pane">#{prod_type}: #{prod_id}</p>} - <<WOK + <<-WOK <br /> #{cell.site_link} #{cell.blurb} #{cell.links} -WOK + WOK end def output_form_link(type,id) prod_id=id.gsub(/id_/,'') @@ -404,7 +402,6 @@ WOK @ad[:promo_list][category][type].each do |i| if i id=((i.inspect =~/^\d/) ? "id_#{i.to_s.strip}" : i.to_s.strip) #watch remove .to_s ? - gbp=usd=euro=nil if defined? @ad[:promo][type][id] \ and not @ad[:promo][type][id].nil? adverts << output_form_select(type,id) |