Merge branch 'upstream' into debian/sid

1 files changed, 3 insertions, 14 deletions

diff --git a/conf/sisu/skin/doc/skin_sisu.rb b/conf/sisu/skin/doc/skin_sisu.rb
index ad1d42a6..ca82f4dc 100644
--- a/conf/sisu/skin/doc/skin_sisu.rb
+++ b/conf/sisu/skin/doc/skin_sisu.rb
@@ -11,65 +11,54 @@
 module SiSU_Viz
   require SiSU_lib + '/defaults'
   class Skin
-    #% widget
     def widget_search
       true
     end
     def widget_promo
-#put  s "#{__LINE__} #{__FILE__}"
       #['sisu','ruby','sisu_search_libre','ruby','open_society']
     end
-    #% path
+    #def ocn_display_off
+    #  false
+    #end
     def path_root
-#puts "#{__LINE__} #{__FILE__}"
       './sisu/'                                                                  # the only parameter that cannot be changed here
     end
     def path_rel
-#puts "#{__LINE__} #{__FILE__}"
       '../'
     end
-    #% url
     def url_home
-#puts "#{__LINE__} #{__FILE__}"
       'http://www.jus.uio.no/sisu/'
     end
     def url_site                                                                     # used in pdf header
-#puts "#{__LINE__} #{__FILE__}"
       'http://www.jus.uio.no/sisu'
     end
     def url_txt                                                                      # text to go with url usually stripped url
-#puts "#{__LINE__} #{__FILE__}"
       'www.jus.uio.no/sisu/'
     end
     def url_home_url
-#puts "#{__LINE__} #{__FILE__}"
       '../index.html'
     end
     #def url_root_http
       #root server path info, used in document information
     #end
-    #% color
     def color_band1
       '"#ffffff"'
     end
     def color_band2
       '"#ffffff"'
     end
-    #% text
     def text_hp
       ' SiSU'
     end
     def text_home
       'SiSU'
     end
-    #% icon
     def icon_home_button
       'sisu.png'
     end
     def icon_home_banner
       icon_home_button
     end
-    #% banner
     def banner_home_button
       %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
     end