diff options
Diffstat (limited to 'lib/sisu/v0/html_promo.rb')
| -rw-r--r-- | lib/sisu/v0/html_promo.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/sisu/v0/html_promo.rb b/lib/sisu/v0/html_promo.rb index 1f31b3b9..43040c25 100644 --- a/lib/sisu/v0/html_promo.rb +++ b/lib/sisu/v0/html_promo.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -98,7 +101,7 @@ module SiSU_HTML_promo end ads_array end - adverts(ads) + adverts(ads.join) #else no_adverts end end @@ -189,7 +192,7 @@ module SiSU_HTML_promo links_a << %{<p class="pane_link"><a href="#{url_}">#{x['title']}#{subtitle}</a></p>\n} end end - links_a.to_s + links_a.join else '' end end @@ -379,7 +382,7 @@ WOK @ad[:promo_list][category].keys.each do |type| @ad[:promo_list][category][type].each do |i| if i - id=i.to_s =~/^\d/ ? "id_#{i.to_s.strip}" : i.to_s.strip + 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? @@ -392,7 +395,7 @@ WOK tell=SiSU_Screen::Ansi.new(@md.cmd,"category not found: #{category}") tell.warn unless @md.cmd =~/q/ end - adverts.to_s + adverts.join end def advert_extract_all #extracts all products from list (which is broken down into categories) adverts=[] |