[dw-free] Layout: EasyRead

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/315ec856e3ab]

http://bugs.dwscoalition.org/show_bug.cgi?id=1768

One more theme, High Contrast White (high contrast theme with a white
background), by zvi. Some additional tweaks and fixes to add a
base layout and fix attribution.

Patch and screenshot by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/easyread/layout.s2
• bin/upgrading/s2layers/easyread/themes.s2
• cgi-bin/LJ/S2Theme.pm
• cgi-bin/LJ/S2Theme/easyread.pm
• htdocs/img/customize/previews/easyread/hcwhite.png

--------------------------------------------------------------------------------
diff -r 8a90962b580e -r 315ec856e3ab bin/upgrading/s2layers/easyread/layout.s2
--- a/bin/upgrading/s2layers/easyread/layout.s2	Thu Mar 04 07:30:24 2010 -0800
+++ b/bin/upgrading/s2layers/easyread/layout.s2	Mon Mar 08 00:53:48 2010 +0800
@@ -4,6 +4,7 @@ layerinfo author_name = "Ricky Buchanan"
 layerinfo author_name = "Ricky Buchanan";
 layerinfo "des" = "A journal layout which is friendly to low vision users who need a large font, and to screen reader users. Accessibility is paramount.";
 layerinfo author_email = "ricky@notdoneliving.net";
+
 set layout_authors = [ { "name" => "rb", "type" => "user" }];
 
 ##===============================
diff -r 8a90962b580e -r 315ec856e3ab bin/upgrading/s2layers/easyread/themes.s2
--- a/bin/upgrading/s2layers/easyread/themes.s2	Thu Mar 04 07:30:24 2010 -0800
+++ b/bin/upgrading/s2layers/easyread/themes.s2	Mon Mar 08 00:53:48 2010 +0800
@@ -14,13 +14,13 @@ set color_entry_text = "#000000";
 set color_entry_text = "#000000";
 set color_entry_background = "#ffffff";
 
+
 #NEWLAYER: easyread/green
 layerinfo "type" = "theme";
 layerinfo "name" = "Green";
 layerinfo redist_uniq = "easyread/green";
 layerinfo author_name = "Ricky Buchanan";
 layerinfo author_email = "ricky@notdoneliving.net";
-set layout_authors = [ { "name" => "rb", "type" => "user" }];
 
 set color_page_background = "#bdedc3";
 set color_page_text = "#000000";
@@ -31,6 +31,7 @@ set color_entry_text = "#000000";
 set color_entry_text = "#000000";
 set color_header_background = "#117f09";
 set color_page_title = "#fff";
+
 
 #NEWLAYER: easyread/hcblack
 layerinfo "type" = "theme";
@@ -49,6 +50,7 @@ set color_page_text = "#ffffff";
 set color_page_text = "#ffffff";
 set color_entry_background = "#000000";
 
+
 #NEWLAYER: easyread/hcblackandyellow
 layerinfo "type" = "theme";
 layerinfo "name" = "High Contrast Black and Yellow";
@@ -66,6 +68,7 @@ set color_page_text = "#ffff00";
 set color_page_text = "#ffff00";
 set color_entry_background = "#000000";
 
+
 #NEWLAYER: easyread/hcblueyellow
 layerinfo "type" = "theme";
 layerinfo "name" = "High Contrast Blue and Yellow";
@@ -79,6 +82,25 @@ set color_entry_text = "#FFFF00";
 set color_entry_text = "#FFFF00";
 set color_page_text = "#FFFF00";
 set color_page_link_visited = "#FFFF00";
+
+
+#NEWLAYER: easyread/hcwhite
+layerinfo "type" = "theme";
+layerinfo "name" = "High Contrast White";
+layerinfo redist_uniq = "easyread/hcwhite";
+layerinfo author_name = "zvi";
+set layout_authors = [ { "name" => "zvi", "type" => "user" } ];
+
+set color_page_link_visited = "#FF0000";
+set color_page_link_active = "#800080";
+set color_page_background = "#ffffff";
+set color_header_background = "#ffffff";
+set color_page_link = "#0000FF";
+set color_page_title = "#000000";
+set color_entry_text = "#000000";
+set color_page_text = "#000000";
+set color_entry_background = "#ffffff";
+
 
 #NEWLAYER: easyread/lcorange
 layerinfo "type" = "theme";
@@ -96,6 +118,7 @@ set color_entry_text = "#d19152";
 set color_entry_text = "#d19152";
 set color_page_text = "#ffefa6";
 set color_entry_background = "#ffefa6";
+
 
 #NEWLAYER: easyread/nnwm2009    
 layerinfo "type" = "theme"; 
@@ -130,6 +153,7 @@ function print_stylesheet () {
 """
 ;}
 
+
 #NEWLAYER: easyread/toros
 layerinfo "type" = "theme";
 layerinfo "name" = "Toros!";
diff -r 8a90962b580e -r 315ec856e3ab cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm	Thu Mar 04 07:30:24 2010 -0800
+++ b/cgi-bin/LJ/S2Theme.pm	Mon Mar 08 00:53:48 2010 +0800
@@ -55,7 +55,7 @@ sub default_theme {
         core2base => 'core2base/testing',
         crossroads => 'crossroads/lettuce',
         drifting => 'drifting/blue',
-        easyread => 'easyread/easyreadgreen',
+        easyread => 'easyread/green',
         fluidmeasure => 'fluidmeasure/spice',
         funkycircles => 'funkycircles/darkpurple',
         negatives => 'negatives/black',
diff -r 8a90962b580e -r 315ec856e3ab cgi-bin/LJ/S2Theme/easyread.pm
--- a/cgi-bin/LJ/S2Theme/easyread.pm	Thu Mar 04 07:30:24 2010 -0800
+++ b/cgi-bin/LJ/S2Theme/easyread.pm	Mon Mar 08 00:53:48 2010 +0800
@@ -1,37 +1,43 @@ package LJ::S2Theme::easyread::clovers;
+package LJ::S2Theme::easyread;
+use base qw( LJ::S2Theme );
+
+sub layouts { ( "1" => "one-column" ) }
+sub layout_prop { "layout_type" }
+
+sub designer { "rb" }
+
 package LJ::S2Theme::easyread::clovers;
 use base qw( LJ::S2Theme::easyread );
 sub cats { qw() }
-
 sub designer { "zvi" }
 
-package LJ::S2Theme::easyread::easyreadgreen;
+package LJ::S2Theme::easyread::green;
 use base qw( LJ::S2Theme::easyread );
-sub cats { qw() }
-
-sub designer { "rb" }
+sub cats { qw( base ) }
 
 package LJ::S2Theme::easyread::hcblack;
 use base qw( LJ::S2Theme::easyread );
 sub cats { qw() }
-
 sub designer { "zvi" }
 
 package LJ::S2Theme::easyread::hcblackandyellow;
 use base qw( LJ::S2Theme::easyread );
 sub cats { qw() }
-
 sub designer { "zvi" }
 
 package LJ::S2Theme::easyread::hcblueyellow;
 use base qw( LJ::S2Theme::easyread );
 sub cats { qw() }
+sub designer { "zvi" }
 
+package LJ::S2Theme::easyread::hcwhite;
+use base qw( LJ::S2Theme::easyread );
+sub cats { qw( ) }
 sub designer { "zvi" }
 
 package LJ::S2Theme::easyread::lcorange;
 use base qw( LJ::S2Theme::easyread );
 sub cats { qw() }
-
 sub designer { "zvi" }
 
 package LJ::S2Theme::easyread::nnwm2009;
@@ -42,6 +48,6 @@ package LJ::S2Theme::easyread::toros;
 package LJ::S2Theme::easyread::toros;
 use base qw( LJ::S2Theme::easyread );
 sub cats { qw() }
+sub designer { "zvi" }
 
-sub designer { "zvi" }
 1;
\ No newline at end of file
diff -r 8a90962b580e -r 315ec856e3ab htdocs/img/customize/previews/easyread/hcwhite.png
Binary file htdocs/img/customize/previews/easyread/hcwhite.png has changed
--------------------------------------------------------------------------------