From f870a56e6f03feb1b447a563600ad4154184099c Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 1 Jul 2007 03:58:55 +0100
Subject: adjustment to skins after cosmetic changes, and on intro of use of
gpl3
---
CHANGELOG | 18 +++++++++++++-----
.../non-free/_sisu/skin/dir/skin_sisu.rb | 15 ++++++---------
.../non-free/_sisu/skin/doc/skin_gnu.rb | 12 ++++--------
.../non-free/_sisu/skin/doc/skin_gutenberg.rb | 8 ++++----
.../non-free/_sisu/skin/doc/skin_lessig.rb | 6 +++---
.../non-free/_sisu/skin/doc/skin_wayner.rb | 8 ++++----
.../non-free/_sisu/skin/doc/skin_won_benkler.rb | 4 ++--
.../non-free/_sisu/skin/site/skin_sisu.rb | 15 ++++++---------
8 files changed, 42 insertions(+), 44 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 73f5688..9bcc720 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,12 +6,20 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu-markup-samples_1.0.7.orig.tar.gz (2007w26/7 - 2007-07-01)
+http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.7.orig.tar.gz
+ sisu-sample-markup_1.0.7.orig.tar.gz
+ sisu-sample-markup_1.0.7-1.dsc
+ sisu-sample-markup_1.0.7-1.diff.gz
+
+ *
+
%% sisu-markup-samples_1.0.6.orig.tar.gz (2007w14/6 - 2007-04-07)
http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.6.orig.tar.gz
- sisu-sample-markup_1.0.6.orig.tar.gz
- sisu-sample-markup_1.0.6-1.dsc
- sisu-sample-markup_1.0.6-1.diff.gz
-
+ feb20a8fcab83403f547aba7abe1c25b 3449753 sisu-sample-markup_1.0.6.orig.tar.gz
+ 828dde02b5a8b3784b555d7b3ea5c0cf 606 sisu-sample-markup_1.0.6-1.dsc
+ 167717d740dddc4784e2a73657a84c66 3394 sisu-sample-markup_1.0.6-1.diff.gz
+
* declared document type, markup version identifier added
%% sisu-markup-samples_1.0.5.orig.tar.gz (2007w13/6 - 2007-03-31)
@@ -79,7 +87,7 @@ http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-mark
f9a56e76400fdf5d470f64d02f4e1033 610 sisu-sample-markup_1.0.1-1.dsc
2998d82e2417f45aa795ca7fbf1a890b 3058 sisu-sample-markup_1.0.1-1.diff.gz
- * minor markup fix
+ * minor markup fix
%% sisu-markup-samples_1.0.0.orig.tar.gz (2006w19/6 - 20060514)
http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_1.0.0.orig.tar.gz
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/dir/skin_sisu.rb b/data/sisu_markup_samples/non-free/_sisu/skin/dir/skin_sisu.rb
index 66786ce..6dbc2c4 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/dir/skin_sisu.rb
+++ b/data/sisu_markup_samples/non-free/_sisu/skin/dir/skin_sisu.rb
@@ -3,7 +3,7 @@
* Author: Ralph@Amissah.com
* http://www.jus.uio.no/sisu
* http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin for SiSU descriptive pages, ...
+ * Description: Document skin for SiSU descriptive pages, ...
* 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
@@ -35,7 +35,7 @@ module SiSU_Viz
end
def url_site # used in pdf header
#puts "#{__LINE__} #{__FILE__}"
- 'http://www.jus.uio.no/sisu'
+ 'http://www.jus.uio.no/sisu'
end
def url_txt # text to go with url usually stripped url
#puts "#{__LINE__} #{__FILE__}"
@@ -50,7 +50,7 @@ module SiSU_Viz
#end
#% color
def color_band1
- '"#ffffff"'
+ '"#ffffff"'
end
def color_band2
'"#ffffff"'
@@ -60,7 +60,7 @@ module SiSU_Viz
' SiSU'
end
def text_home
- 'SiSU'
+ 'SiSU'
end
#% icon
def icon_home_button
@@ -79,13 +79,9 @@ module SiSU_Viz
def banner_band
%{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
end
- #% credits
- def credits_splash
- %{<center><table summary="credits" align="center"bgcolor="#ffffff"><tr><td>#{widget_sisu}#{widget_wayBetter}#{widget_browsers}#{widget_pdfviewers}</td></tr></table></center>}
- end
#% stamp
def stamp_stmp
- "\\copyright Ralph Amissah, released under the GPL \\\\\n ralph@amissah.com \\\\\n www.jus.uio.no/sisu/"
+ "\\copyright Ralph Amissah; license GPL 3 or later \\\\\n ralph@amissah.com \\\\\n www.jus.uio.no/sisu/"
end
end
class TeX
@@ -103,3 +99,4 @@ module SiSU_Viz
end
end
end
+__END__
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gnu.rb b/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gnu.rb
index 4c35120..e3ea3c2 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gnu.rb
+++ b/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gnu.rb
@@ -13,7 +13,7 @@ module SiSU_Viz
class Skin
#% widget
def widget_promo
- ['sisu_icon','sisu','sisu_search_libre','open_society','fsf','ruby']
+ # ['sisu_icon','sisu','sisu_search_libre','open_society','fsf','ruby']
end
#% home
def home_index
@@ -42,14 +42,14 @@ module SiSU_Viz
end
# color
def color_band1
- '"#000070"'
+ '"#000070"'
end
#% txt
def txt_hp
'Free Software Foundation'
end
def txt_home # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ...
- #"www.jus.uio.no/sisu/"
+ #"www.jus.uio.no/sisu/"
'Free Software Foundation'
end
#% icon
@@ -69,10 +69,6 @@ module SiSU_Viz
def banner_band
%{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
end
- #% credits
- def credits_splash
- %{<center><table summary="credits" align="center"bgcolor="#ffffff"><tr><td>#{widget_sisu}#{widget_wayBetter}#{widget_browsers}#{widget_pdfviewers}#{table_close}</center>}
- end
end
class TeX
def header_center
@@ -90,7 +86,7 @@ module SiSU_Viz
end
class Stamp
def stmp
- "\\copyright Ralph Amissah to be released under the GPL (or QT License equivalent as to be decided) \\\\\n ralph@amissah.com \\\\\n www.jus.uio.no/sisu/"
+ "\\copyright Ralph Amissah; license GPL v3 or later \\\\\n ralph@amissah.com \\\\\n www.jus.uio.no/sisu/"
end
end
end
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gutenberg.rb b/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gutenberg.rb
index 0df9c7f..752712c 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gutenberg.rb
+++ b/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_gutenberg.rb
@@ -3,7 +3,7 @@
* Author: Ralph Amissah
* http://www.jus.uio.no/sisu
* http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin sample prepared for Gutenberg Project (first used with "War and Peace")
+ * Description: Document skin sample prepared for Gutenberg Project (first used with "War and Peace")
* 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
@@ -13,7 +13,7 @@ module SiSU_Viz
class Skin
#% path
def path_root # the only parameter that cannot be changed here
- './sisu/'
+ './sisu/'
end
def path_rel
'../'
@@ -51,7 +51,7 @@ module SiSU_Viz
end
#% credits
def credits_splash
- %{<table summary="credits" align="center"bgcolor="#ffffff"><tr><td><font color="black"><center><a href="http://www.gutenberg.net/"><img border="0" align="center" src="../_sisu/image_local/gutenberg_icon.png" alt="Gutenberg Project"><br />Courtesy of The Gutenberg Project</a><br />#{widget_sisu}</center></font></td></tr></table>}
+ %{<table summary="credits" align="center"bgcolor="#ffffff"><tr><td><font color="black"><center><a href="http://www.gutenberg.net/"><img border="0" align="center" src="../_sisu/image_local/gutenberg_icon.png" alt="Gutenberg Project"><br />Courtesy of The Gutenberg Project</a></center></font></td></tr></table>}
end
end
class TeX
@@ -68,7 +68,7 @@ module SiSU_Viz
"Document owner details"
end
def stmp
- "\\copyright Ralph Amissah, licence GPL \\\\\n www.jus.uio.no/sisu/"
+ "\\copyright Ralph Amissah; licence GPL v3 or later \\\\\n www.jus.uio.no/sisu/"
end
end
class Inserts
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_lessig.rb b/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_lessig.rb
index 0a61c70..1ab879b 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_lessig.rb
+++ b/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_lessig.rb
@@ -3,7 +3,7 @@
* Author: Ralph Amissah
* http://www.jus.uio.no/sisu
* http://www.jus.uio.no/sisu/SiSU/download
- * Description: Skin prepared for Free Culture, Lawrence Lessig
+ * Description: Skin prepared for Free Culture, Lawrence Lessig
* arch-tag: skin for an individual document set (lessig - freeculture)
* License: Same as SiSU see http://www.jus.uio.no/sisu
* $Date$
@@ -33,7 +33,7 @@ module SiSU_Viz
#root server path info, used in document information
#end
def color_band1
- '"#000000"'
+ '"#000000"'
end
def txt_hp
'www.lessig.org'
@@ -57,7 +57,7 @@ module SiSU_Viz
%{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_black}><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><img border="0" align="center" src="../_sisu/image_local/freeculture_bcode.png" alt="Free Culture Bar Code"><br />Available at Amazon.com<br /><a href="http://www.amazon.com/exec/obidos/tg/detail/-/1594200068/"><img border="0" align="center" src="../_sisu/image_local/freeculture_book.png" alt="Free Culture at Amazon.com"></a><br />This book is Copyright Lawrence Lessig © 2004<br />Under a Creative Commons License, that permits non-commercial use of this work, provided attribution is given.<br />See <a href="http://www.free-culture.cc/">http://www.free-culture.cc/</a><br /><a href="mailto://lessig@pobox.com">lessig@pobox.com</a><br />#{widget_sisu}</center></font></td></tr></table>}
+ %{<table summary="credits" align="center" bgcolor="#ffffff"><tr><td><font color="black"><center><img border="0" align="center" src="../_sisu/image_local/freeculture_bcode.png" alt="Free Culture Bar Code"><br />Available at Amazon.com<br /><a href="http://www.amazon.com/exec/obidos/tg/detail/-/1594200068/"><img border="0" align="center" src="../_sisu/image_local/freeculture_book.png" alt="Free Culture at Amazon.com"></a><br />This book is Copyright Lawrence Lessig © 2004<br />Under a Creative Commons License, that permits non-commercial use of this work, provided attribution is given.<br />See <a href="http://www.free-culture.cc/">http://www.free-culture.cc/</a><br /><a href="mailto://lessig@pobox.com">lessig@pobox.com</a></center></font></td></tr></table>}
end
end
class TeX
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_wayner.rb b/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_wayner.rb
index a1d1541..21a1dcf 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_wayner.rb
+++ b/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_wayner.rb
@@ -3,7 +3,7 @@
* Author: Ralph Amissah
* http://www.jus.uio.no/sisu
* http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin for "Free For All"
+ * Description: Document skin for "Free For All"
* arch-tag: skin for an individual document set (wayner)
* License: Same as SiSU see http://www.jus.uio.no/sisu
* $Date$
@@ -36,7 +36,7 @@ module SiSU_Viz
#end
#% color
def color_band1
- '"#000070"'
+ '"#000070"'
end
#% txt
def txt_hp
@@ -60,7 +60,7 @@ module SiSU_Viz
end
def icon_up
'arrow_up_blue.png'
- end
+ end
#% banner
def banner_home_button
%{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_yellow_dark}><a href="#{url_home}">#{png_home}</a></td></tr></table>\n}
@@ -73,7 +73,7 @@ module SiSU_Viz
end
#% credits
def credits_splash
- %{<table summary="credits" align="center"bgcolor="#ffffff"><tr><td><font color="black"><center>Available at Amazon.com<br /><a href="http://www.amazon.com/exec/obidos/tg/detail/-/0066620503/"><img border="0" align="center" src="../_sisu/image/free.for.all.png" alt="Free For All at Amazon.com"></a><br />This book is Copyright © 2000 by Peter Wayner.<br />See <a href="http://www.wayner.org/books/ffa/">http://www.wayner.org/books/ffa/</a><br /><a href="mailto://p3@wayner.org">p3@wayner.org</a><br />#{widget_sisu}</center></font></td></tr></table>}
+ %{<table summary="credits" align="center"bgcolor="#ffffff"><tr><td><font color="black"><center>Available at Amazon.com<br /><a href="http://www.amazon.com/exec/obidos/tg/detail/-/0066620503/"><img border="0" align="center" src="../_sisu/image/free.for.all.png" alt="Free For All at Amazon.com"></a><br />This book is Copyright © 2000 by Peter Wayner.<br />See <a href="http://www.wayner.org/books/ffa/">http://www.wayner.org/books/ffa/</a><br /><a href="mailto://p3@wayner.org">p3@wayner.org</a></center></font></td></tr></table>}
end
end
class TeX
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_won_benkler.rb b/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_won_benkler.rb
index 75c1f7d..f9d16cb 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_won_benkler.rb
+++ b/data/sisu_markup_samples/non-free/_sisu/skin/doc/skin_won_benkler.rb
@@ -24,7 +24,7 @@ module SiSU_Viz
'www.benkler.org'
end
def color_band1
- '"#ffffff"'
+ '"#ffffff"'
end
def txt_hp
'www.benkler.org'
@@ -55,7 +55,7 @@ available at<br /><a href="http://www.amazon.com/exec/obidos/tg/detail/-/0300110
<a href="http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0300110561">Barnes & Noble</a><br />
This book is Copyright Yochai Benkler © 2006<br />
Under a Creative Commons License, that permits non-commercial use of this work, provided attribution is given.<br />
-<a href="http://creativecommons.org/licenses/by-nc-sa/2.5/">http://creativecommons.org/licenses/by-nc-sa/2.5/</a><br />#{widget_sisu}</center></font></td></tr></table>}
+<a href="http://creativecommons.org/licenses/by-nc-sa/2.5/">http://creativecommons.org/licenses/by-nc-sa/2.5/</a></center></font></td></tr></table>}
end
end
class TeX
diff --git a/data/sisu_markup_samples/non-free/_sisu/skin/site/skin_sisu.rb b/data/sisu_markup_samples/non-free/_sisu/skin/site/skin_sisu.rb
index 66786ce..6dbc2c4 100644
--- a/data/sisu_markup_samples/non-free/_sisu/skin/site/skin_sisu.rb
+++ b/data/sisu_markup_samples/non-free/_sisu/skin/site/skin_sisu.rb
@@ -3,7 +3,7 @@
* Author: Ralph@Amissah.com
* http://www.jus.uio.no/sisu
* http://www.jus.uio.no/sisu/SiSU/download
- * Description: Document skin for SiSU descriptive pages, ...
+ * Description: Document skin for SiSU descriptive pages, ...
* 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
@@ -35,7 +35,7 @@ module SiSU_Viz
end
def url_site # used in pdf header
#puts "#{__LINE__} #{__FILE__}"
- 'http://www.jus.uio.no/sisu'
+ 'http://www.jus.uio.no/sisu'
end
def url_txt # text to go with url usually stripped url
#puts "#{__LINE__} #{__FILE__}"
@@ -50,7 +50,7 @@ module SiSU_Viz
#end
#% color
def color_band1
- '"#ffffff"'
+ '"#ffffff"'
end
def color_band2
'"#ffffff"'
@@ -60,7 +60,7 @@ module SiSU_Viz
' SiSU'
end
def text_home
- 'SiSU'
+ 'SiSU'
end
#% icon
def icon_home_button
@@ -79,13 +79,9 @@ module SiSU_Viz
def banner_band
%{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
end
- #% credits
- def credits_splash
- %{<center><table summary="credits" align="center"bgcolor="#ffffff"><tr><td>#{widget_sisu}#{widget_wayBetter}#{widget_browsers}#{widget_pdfviewers}</td></tr></table></center>}
- end
#% stamp
def stamp_stmp
- "\\copyright Ralph Amissah, released under the GPL \\\\\n ralph@amissah.com \\\\\n www.jus.uio.no/sisu/"
+ "\\copyright Ralph Amissah; license GPL 3 or later \\\\\n ralph@amissah.com \\\\\n www.jus.uio.no/sisu/"
end
end
class TeX
@@ -103,3 +99,4 @@ module SiSU_Viz
end
end
end
+__END__
--
cgit v1.2.3