Merge branch 'upstream' into debian/sid

9 files changed, 92 insertions, 0 deletions

diff --git a/data/v2/samples/_sisu/image/di_evh.png b/data/v2/samples/_sisu/image/di_evh.png
new file mode 100644
index 0000000..9938981
--- /dev/null
+++ b/data/v2/samples/_sisu/image/di_evh.png
diff --git a/data/v2/samples/_sisu/image/di_evh_f1-1.png b/data/v2/samples/_sisu/image/di_evh_f1-1.png
new file mode 100644
index 0000000..eb884e9
--- /dev/null
+++ b/data/v2/samples/_sisu/image/di_evh_f1-1.png
diff --git a/data/v2/samples/_sisu/image/di_evh_f10-1.png b/data/v2/samples/_sisu/image/di_evh_f10-1.png
new file mode 100644
index 0000000..ce41d83
--- /dev/null
+++ b/data/v2/samples/_sisu/image/di_evh_f10-1.png
diff --git a/data/v2/samples/_sisu/image/di_evh_f11-1.png b/data/v2/samples/_sisu/image/di_evh_f11-1.png
new file mode 100644
index 0000000..4534358
--- /dev/null
+++ b/data/v2/samples/_sisu/image/di_evh_f11-1.png
diff --git a/data/v2/samples/_sisu/image/di_evh_f11-2.png b/data/v2/samples/_sisu/image/di_evh_f11-2.png
new file mode 100644
index 0000000..7f17b42
--- /dev/null
+++ b/data/v2/samples/_sisu/image/di_evh_f11-2.png
diff --git a/data/v2/samples/_sisu/image/di_evh_f5-1.png b/data/v2/samples/_sisu/image/di_evh_f5-1.png
new file mode 100644
index 0000000..caab88f
--- /dev/null
+++ b/data/v2/samples/_sisu/image/di_evh_f5-1.png
diff --git a/data/v2/samples/_sisu/skin/doc/skin_di_von_hippel.rb b/data/v2/samples/_sisu/skin/doc/skin_di_von_hippel.rb
new file mode 100644
index 0000000..4eb873f
--- /dev/null
+++ b/data/v2/samples/_sisu/skin/doc/skin_di_von_hippel.rb
@@ -0,0 +1,78 @@
+# coding: utf-8
+=begin
+ * Name: SiSU - Simple information Structuring Universe - Structured information, Serialized Units
+ * Author: Ralph Amissah
+   * http://www.jus.uio.no/sisu
+   * http://www.jus.uio.no/sisu/SiSU/download
+ * Description: Skin prepared for Democratizing Innovation, Eric von Hippel
+ * License: Same as SiSU see http://www.jus.uio.no/sisu
+ * Notes: Site default appearance variables set in defaults.rb
+     Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
+=end
+module SiSU_Viz
+  require SiSU_lib + '/defaults'
+  class Skin
+    #def path_root                                                                     # the only parameter that cannot be changed here
+    #  './sisu/'
+    #end
+    #def rel
+    #  '../'
+    #end
+    def url_home
+      'http://web.mit.edu/evhippel/www/'
+      #'http://web.mit.edu/evhippel/www/democ1.htm'
+    end
+    def url_txt                                                                      # text to go with url usually stripped url
+      'web.mit.edu/evhippel/www/'
+    end
+    def color_band1
+      '"#ffffff"'
+    end
+    def txt_hp
+      'web.mit.edu/evhippel/www/'
+    end
+    def txt_home
+      'Eric von Hippel'
+    end
+    def icon_home_button
+      'di_evh.png'
+    end
+    def icon_home_banner
+      icon_home_button
+    end
+    def banner_home_button
+      %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_white}><a href="#{url_home}">#{png_home}</a></td></tr></table>\n}
+    end
+    def banner_home_and_index_buttons
+      %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_white}><a href="#{url_home}" target="_top">#{png_home}</a></td><td width="40%"><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc.html" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></td><td width="20%">&nbsp;#{table_close}}
+    end
+    def banner_band
+      %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_white}><a href="#{url_home}" target="_top">#{png_home}</a>#{table_close}}
+    end
+    def credits_splash
+      %{<table summary="credits" align="center" bgcolor="#ffffff"><tr><td><font color="black"><center>
+<a href="http://web.mit.edu/evhippel/www/democ1.htm">The original pdf is available online</a> at<br /><a href="http://web.mit.edu/evhippel/www/">web.mit.edu/evhippel/www/</a><br />
+<a href="http://web.mit.edu/evhippel/www/democ1.htm"><img border="0" align="center" src="../_sisu/image_local/di_evh.png" alt=""></a><br />
+available at<br /><a href="http://www.amazon.com/exec/obidos/tg/detail/-/0262720477/">Amazon.com</a> and <br />
+<a href="http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0262720477">Barnes & Noble</a><br />
+This book is Copyright Eric von Hippel © 2005<br />
+Under a Creative Commons License, License: Attribution-Noncommercial-No Derivative Works (CC-BY-NC-ND) 2.0 
+<a href="http://creativecommons.org/licenses/by-nc-nd/2.0/">http://creativecommons.org/licenses/by-nc-nd/2.0/</a></center></font></td></tr></table>}
+    end
+  end
+  class TeX
+    def header_center
+	    "\\chead{\\href{#{@vz.url_home}}{web.mit.edu/evhippel/www/}}"
+    end
+    def home_url
+	    "\\href{#{@vz.url_home}}{web.mit.edu/evhippel/www/}"
+    end
+    def home
+	    "\\href{#{@vz.url_home}}{Eric von Hippel}"
+    end
+    def owner_chapter
+      "Document owner details"
+    end
+  end
+end
+__END__
diff --git a/data/v2/samples/_sisu/skin/yml/list.yml b/data/v2/samples/_sisu/skin/yml/list.yml
index 512bc17..9b49f2e 100644
--- a/data/v2/samples/_sisu/skin/yml/list.yml
+++ b/data/v2/samples/_sisu/skin/yml/list.yml
@@ -6,6 +6,8 @@ open_society:
   - twon
   - fc
   - content
+  - di
+  - ffa
   - faif
   - twobits
   - ffa
diff --git a/data/v2/samples/_sisu/skin/yml/promo.yml b/data/v2/samples/_sisu/skin/yml/promo.yml
index 2bb8b20..32297d6 100644
--- a/data/v2/samples/_sisu/skin/yml/promo.yml
+++ b/data/v2/samples/_sisu/skin/yml/promo.yml
@@ -67,6 +67,18 @@ site:
     -
       title:    Source
       url:      http://www.free-culture.cc/
+  di:
+    title:      Democratizing Innovation
+    author:     Eric von Hippel 
+    year:       2005
+    url:        democratizing_innovation.eric_von_hippel
+    links:
+    -
+      title:    Wikipedia entry
+      url:      http://en.wikipedia.org/wiki/Democratizing_Innovation
+    -
+      title:    Source
+      url:      http://web.mit.edu/evhippel/www/democ1.htm
   faif:
     title:      Free As In Freedom
     subtitle:   Richard Stallman's Crusade for Free Software