New style with six color themes by <user name="branchandroot">.
Patch and preview pics by <user name="ninetydegrees">.
diffs (770 lines):
diff -r af4fb7de068f -r 725f0ededf80 bin/upgrading/s2layers.dat
--- a/bin/upgrading/s2layers.dat Fri Dec 17 01:20:43 2010 +0800
+++ b/bin/upgrading/s2layers.dat Fri Dec 17 01:41:36 2010 +0800
@@ -61,6 +61,9 @@ nouveauoleanders/layout layout(core2bas
nouveauoleanders/layout layout(core2base/layout) core2
nouveauoleanders/themes theme+ nouveauoleanders/layout
+paletteable/layout layout(core2base/layout) core2
+paletteable/themes theme+ paletteable/layout
+
practicality/layout layout(core2base/layout) core2
practicality/themes theme+ practicality/layout
diff -r af4fb7de068f -r 725f0ededf80
bin/upgrading/s2layers/paletteable/layout.s2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/upgrading/s2layers/paletteable/layout.s2 Fri Dec 17 01:41:36
2010 +0800
@@ -0,0 +1,462 @@
+layerinfo type = "layout";
+layerinfo name = "Paletteable";
+layerinfo redist_uniq = "paletteable/layout";
+layerinfo author_name = "branchandroot";
+layerinfo lang = "en";
+
+set layout_authors = [ { "name" => "branchandroot", "type" => "user" } ];
+set layout_type = "two-columns-left";
+
+##===============================
+## Presentation
+##===============================
+
+set userpics_position = "right";
+
+##===============================
+## Colors
+##===============================
+
+propgroup colors_child {
+ property Color color_comment_title_even { des = "Comment title alternate
color"; }
+ property Color color_comment_title_background_even { des = "Comment title
alternate background color"; }
+ }
+
+##===============================
+## Modules
+##===============================
+
+property string module_navlinks_section_override {
+ values = "none|(none)|header|Header|one|Group One|two|Group Two";
+ grouped = 1;
+ }
+
+set grouped_property_override = { "module_navlinks_section" =>
"module_navlinks_section_override" };
+
+set module_navlinks_section = "one";
+
+##===============================
+## Functions
+##===============================
+
+# Give a title to the navlinks module
+function print_module_navlinks() {
+ var Page p = get_page();
+ var string title = "Navigation";
+ open_module("navlinks", "$title", "");
+ var string[] links = [];
+ foreach var string k ($p.views_order) {
+ var string css = """ class="$k" """;
+ if ($p.view == $k) { $css = """ class="current $k" """; }
+ $links[size $links] = """<a
href="$p.view_url{$k}"$css>"""+lang_viewname($k)+"""</a>""";
+ }
+ print_module_list($links);
+ close_module();
+}
+
+# Add section for navlinks module
+function Page::print() {
+ """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>\n<html
xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">\n<head
profile="http://www.w3.org/2006/03/hcard http://purl.org/uF/hAtom/0.1/
http://gmpg.org/xfn/11";>\n""";
+ $this->print_head();
+ $this->print_stylesheets();
+ $this->print_head_title();
+ """</head>""";
+ $this->print_wrapper_start();
+ $this->print_control_strip();
+ """
+ <div id="canvas">
+ <div class="inner">
+ <div id="header">
+ <div class="inner">
+ """;
+ $this->print_module_section("header");
+ $this->print_global_title();
+ $this->print_global_subtitle();
+ $this->print_title();
+ """
+ </div><!-- end header>inner -->
+ </div><!-- end header -->
+ <div id="content">
+ <div class="inner">
+ <div id="primary"><div class="inner">
+ """;
+ $this->print_body();
+ """
+ </div></div><!-- end primary and primary>inner -->
+ <div id="secondary"><div class="inner">
+ """;
+ $this->print_module_section("one");
+ """
+ </div></div><!-- end secondary and secondary>inner -->
+ <div id="invisible-separator" style="float: left; width:
1px;"></div> <!-- this is a hack for IE7 + two-columns-right -->
+ <div id="tertiary"><div class="inner">
+ """;
+ $this->print_module_section("two");
+ """
+ </div></div><!-- end tertiary and tertiary>inner -->
+ <div id="content-footer"></div>
+ </div><!-- end content>inner -->
+ </div> <!-- end content -->
+ </div> <!-- end canvas>inner -->
+ """;
+
+ """
+ <div id="footer">
+ <div class="inner">
+ """;
+ print safe """
+ <div class="page-top"><a href="#">$*text_page_top</a></div>
+ </div><!-- end footer>inner -->
+ </div><!-- end footer -->
+
+ </div> <!-- end canvas -->
+ """;
+ $this->print_wrapper_end();
+ """</html>""";
+}
+
+##===============================
+## Stylesheet
+##===============================
+
+
+function print_stylesheet () {
+
+var string userpic_css = "";
+ if ($*userpics_position == "right") {
+ $userpic_css = """
+ .entry .userpic, .comment .userpic {
+ float: right;
+ margin-right: 0;
+ }
+ """;
+ }
+ else {
+ $userpic_css = """
+ .entry .userpic, .comment .userpic {
+ float: left;
+ margin-left: 0;
+ }
+ """;
+ }
+
+var string navlinks_css = "";
+ if ($*module_navlinks_section == "header") {
+ $navlinks_css = """
+ .module-navlinks {
+ background-color: transparent;
+ border: none;
+ margin-bottom: 0;
+ margin-top: .5em;
+ text-align: right;
+ }
+
+ .module-navlinks li {
+ border-left: 1px solid $*color_page_title;
+ display: inline;
+ padding-left: .5em;
+ }
+
+ .module-navlinks ul > li:first-child {
+ border-left: none;
+ }
+
+ .module-navlinks .module-header {
+ display: none;
+ }
+
+ .module-navlinks a, .module-navlinks a.current {
+ color: $*color_page_title;
+ }
+ """;
+ }
+ else {
+ $navlinks_css = "";
+ }
+
+ """
+
+/*--- Paletteable ---*/
+/*--- by branchandroot ---*/
+
+/*--- Main ---*/
+
+blockquote {
+ font-style: italic;
+ padding: 1em 1em .5em 2em;
+ }
+
+blockquote > p:first-child {
+ margin-top: 0;
+ }
+
+dl dt {
+ font-weight: bold;
+ }
+
+/*--- Main Containers ---*/
+
+#canvas {
+ margin: 2em 4%;
+ position: relative;
+ }
+
+#content {
+ background-color: $*color_entry_background;
+ }
+
+.column-left #content, .column-right #content {
+ border-color: $*color_module_background;
+ }
+
+.one-column #secondary, .one-column #tertiary {
+ background-color: $*color_module_background;
+ }
+
+/*--- Journal Header ---*/
+
+#header {
+ padding: .5em 1em;
+ }
+
+/*--- Journal Navigation ---*/
+
+.navigation {
+ text-align: right;
+ }
+
+.page-month .navigation {
+ text-align: center;
+ }
+
+/*--- Entries & Comments ---*/
+
+.entry-wrapper {
+ margin-bottom: 2em;
+ }
+
+.entry .userpic, .comment .userpic {
+ margin: 0 1em .5em 1em;
+ }
+
+$userpic_css
+
+.datetime, .poster-ip {
+ font-size: small;
+ }
+
+.entry .contents, .comment .contents {
+ margin: 1em 0;
+ }
+
+.entry-content, .comment-content {
+ margin-top: 1em;
+ }
+
+.entry .metadata {
+ font-style: italic;
+ }
+
+.entry .metadata.bottom-metadata {
+ margin-bottom: -1em;
+ }
+
+.entry .footer, .comment .footer {
+ clear: both;
+ padding-bottom: .5em;
+ }
+
+.entry .tag {
+ margin-bottom: .5em;
+ }
+
+ul.entry-management-links, .comment-management-links {
+ float: left;
+ margin-bottom: .5em;
+ margin-top: .5em;
+ }
+
+ul.entry-interaction-links, .comment-interaction-links {
+ text-align: right;
+ margin-bottom: .5em;
+ margin-right: .5em;
+ margin-top: .5em;
+ }
+
+.comment-wrapper .header {
+ padding: .25em .5em;
+ }
+
+.comment-wrapper-odd .header {
+ background-color: $*color_comment_title_background;
+ color: $*color_comment_title;
+ }
+
+.comment-wrapper-odd .header a {
+ background-color: transparent;
+ color: $*color_comment_title;
+ }
+
+.comment-wrapper-even .header {
+ background-color: $*color_comment_title_background_even;
+ color: $*color_comment_title_even;
+ }
+
+.comment-wrapper-even .header a {
+ background: transparent;
+ color: $*color_comment_title_even;
+ }
+
+.comment-wrapper-even .comment-title,
+.comment-wrapper-odd .comment-title {
+ background-color: transparent;
+ font-size: large;
+ margin-bottom: .25em;
+ }
+
+.multiform-checkbox {
+ clear: both;
+ display: block;
+ }
+
+.partial .comment {
+ padding: .25em .5em;
+ }
+
+.partial .comment-title {
+ display: inline;
+ font-size: medium;
+ margin-bottom: 0;
+ }
+
+.comment-wrapper-even.partial .comment-title,
+.comment-wrapper-odd.partial .comment-title,
+.comment-wrapper-even.partial .comment-title a,
+.comment-wrapper-odd.partial .comment-title a {
+ background-color: transparent;
+ color: inherit;
+ }
+
+.bottomcomment {
+ padding: .25em .5em;
+ background-color: $*color_comment_title_background;
+ color: $*color_comment_title;
+ }
+
+.bottomcomment a {
+ color: $*color_comment_title;
+ }
+
+/*--- Archive Pages ---*/
+
+.month {
+ margin-bottom: 2em;
+ }
+
+.month .contents {
+ padding: 1em .5em 0;
+ }
+
+.month .footer {
+ padding: 0 .5em 1em;
+ text-align: center;
+ }
+
+.month .header {
+ background-color: $*color_entry_title_background;
+ color: $*color_entry_title;
+ font-family: $*font_entry_title;
+ padding: 1px .25em;
+ }
+
+table.month td, table.month th {
+ vertical-align: top;
+ padding: .25em .5em;
+ }
+
+table.month caption {
+ color: $*color_entry_background;
+ }
+
+#archive-month .month {
+ padding: 0 1em;
+ }
+
+#archive-month .entry-title {
+ font-weight: bold;
+ }
+
+h3.day-date {
+ text-align: center;
+ margin-bottom: 2em;
+ }
+
+/*--- Sidebars ---*/
+
+
+.two-columns-left #tertiary .module, .two-columns-right #tertiary .module {
+ background-color: transparent;
+ }
+
+.two-columns-left #tertiary .separator-after, .two-columns-right #tertiary
.separator-after {
+ clear: both;
+ }
+
+.two-columns-left #tertiary {
+ margin-left: 0;
+ }
+
+.two-columns-right #tertiary {
+ margin-right: 0;
+ }
+
+.module {
+ border: none;
+ margin-bottom: 1em;
+ }
+
+.module-content ul, .module-list, .module-credit dl {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+ }
+
+.module-content ul ul {
+ margin-left: 1em;
+ }
+
+.module-header {
+ font-size: large;
+ }
+.module-header a {
+ color: $*color_module_title;
+ }
+
+.module .userlite-interaction-links {
+ margin-top: .5em;
+ }
+
+.module-navlinks a.current {
+ color: $*color_module_text;
+ text-decoration: none;
+ }
+
+.module-calendar .module-content {
+ text-align: left;
+ }
+
+.module-calendar table {
+ margin: 0;
+ }
+
+$navlinks_css
+
+/*--- Footer ---*/
+
+#footer {
+ text-align: center;
+ }
+
+ """;
+}
+
diff -r af4fb7de068f -r 725f0ededf80
bin/upgrading/s2layers/paletteable/themes.s2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/upgrading/s2layers/paletteable/themes.s2 Fri Dec 17 01:41:36
2010 +0800
@@ -0,0 +1,246 @@
+#NEWLAYER: paletteable/clarity
+layerinfo type = "theme";
+layerinfo name = "Clarity";
+layerinfo redist_uniq = "paletteable/clarity";
+layerinfo author_name = "branchandroot";
+
+# Uses the "Holiday" palette by artsykerly
(http://www.colourlovers.com/palette/100957/Holiday).
+set layout_resources = [ { "name" => "Holiday", "url" =>
"http://www.colourlovers.com/palette/100957/Holiday"; } ];
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#FFE1D0";
+set color_page_link = "#64A3A2";
+set color_page_link_active = "#090";
+set color_page_link_visited = "#245655";
+set color_page_text = "#000";
+set color_page_title = "#fff";
+set color_header_background = "#A37B64";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_comment_title = "#fff";
+set color_comment_title_background = "#64A3A2";
+set color_comment_title_even = "#fff";
+set color_comment_title_background_even = "#245655";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#FDF5EE";
+set color_module_text = "#000";
+set color_module_title = "#000";
+
+
+#NEWLAYER: paletteable/coffeeandink
+layerinfo type = "theme";
+layerinfo name = "Coffee and Ink";
+layerinfo redist_uniq = "paletteable/coffeeandink";
+layerinfo author_name = "branchandroot";
+
+# Uses the "one time to cry..." palette by dccanim
(http://www.colourlovers.com/palette/1272313/one_time_to_cry...).
+set layout_resources = [ { "name" => "one time to cry...", "url" =>
"http://www.colourlovers.com/palette/1272313/one_time_to_cry..."; } ];
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#45484D";
+set color_page_link = "#8B776D";
+set color_page_link_active = "#900";
+set color_page_link_visited = "#594D4D";
+set color_page_text = "#000";
+set color_page_title = "#fff";
+set color_header_background = "#BFBBA8";
+set color_footer_link = "#D9D4BA";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_comment_title = "#fff";
+set color_comment_title_background = "#8B776D";
+set color_comment_title_even = "#fff";
+set color_comment_title_background_even = "#594D4D";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#D9D4BA";
+set color_module_link = "#594D4D";
+set color_module_link_active = "#900";
+set color_module_link_visited = "#8B776D";
+set color_module_text = "#000";
+set color_module_title = "#000";
+
+
+#NEWLAYER: paletteable/deepsea
+layerinfo type = "theme";
+layerinfo name = "Deep Sea";
+layerinfo redist_uniq = "paletteable/deepsea";
+layerinfo author_name = "branchandroot";
+
+# Uses the "migraine vision" palette by Illara
(http://www.colourlovers.com/palette/1272365/migraine_vision).
+set layout_resources = [ { "name" => "migraine vision", "url" =>
"http://www.colourlovers.com/palette/1272365/migraine_vision"; } ];
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#2A2B2B";
+set color_page_link = "#DFF1F2";
+set color_page_link_active = "#9f9";
+set color_page_link_visited = "#a3bCbE";
+set color_page_text = "#fff";
+set color_header_background = "#5D7D80";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#000";
+set color_comment_title = "#000";
+set color_comment_title_background = "#DFF1F2";
+set color_comment_title_even = "#000";
+set color_comment_title_background_even = "#a3bCbE";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#40494A";
+set color_module_text = "#fff";
+set color_module_title = "#fff";
+
+
+#NEWLAYER: paletteable/descending
+layerinfo type = "theme";
+layerinfo name = "Descending";
+layerinfo redist_uniq = "paletteable/descending";
+layerinfo author_name = "branchandroot";
+
+# Uses the "Blue Jupiter" palette by memomo
(http://www.colourlovers.com/palette/965705/Blue_Jupiter).
+set layout_resources = [ { "name" => "Blue Jupiter", "url" =>
"http://www.colourlovers.com/palette/965705/Blue_Jupiter"; } ];
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#406389";
+set color_page_link = "#1F305C";
+set color_page_link_active = "#900";
+set color_page_link_visited = "#406389";
+set color_page_text = "#000";
+set color_page_title = "#fff";
+set color_header_background = "#89B3CB";
+set color_footer_link = "#C7E7F4";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_comment_title = "#fff";
+set color_comment_title_background = "#1F305C";
+set color_comment_title_even = "#fff";
+set color_comment_title_background_even = "#406389";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#C7E7F4";
+set color_module_text = "#000";
+set color_module_title = "#000";
+
+
+#NEWLAYER: paletteable/greenrain
+layerinfo type = "theme";
+layerinfo name = "Green Rain";
+layerinfo redist_uniq = "paletteable/greenrain";
+layerinfo author_name = "branchandroot";
+
+# Uses the "Mermaid Ashore" palette by dccanim
(http://www.colourlovers.com/palette/1272262/mermaid_ashore).
+set layout_resources = [ { "name" => "Mermaid Ashore", "url" =>
"http://www.colourlovers.com/palette/1272262/mermaid_ashore"; } ];
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#667368";
+set color_page_link = "#594A3E";
+set color_page_link_active = "#00b";
+set color_page_link_visited = "#40312C";
+set color_page_text = "#000";
+set color_page_title = "#fff";
+set color_header_background = "#9EA692";
+set color_footer_link = "#D6D9BF";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_comment_title = "#fff";
+set color_comment_title_background = "#594A3E";
+set color_comment_title_even = "#fff";
+set color_comment_title_background_even = "#40312C";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#D6D9BF";
+set color_module_text = "#000";
+set color_module_title = "#000";
+
+
+#NEWLAYER: paletteable/redspruce
+layerinfo type = "theme";
+layerinfo name = "Red Spruce";
+layerinfo redist_uniq = "paletteable/redspruce";
+layerinfo author_name = "branchandroot";
+
+# Uses the "Getting so stressed" palette by Sruoloc
(http://www.colourlovers.com/palette/1272420/Getting_so_stressed).
+set layout_resources = [ { "name" => "Getting so stressed", "url" =>
"http://www.colourlovers.com/palette/1272420/Getting_so_stressed"; } ];
+
+##===============================
+## Page Colors
+##===============================
+
+set color_page_background = "#542119";
+set color_page_link = "#6E6558";
+set color_page_link_active = "#00b";
+set color_page_link_visited = "#9E9588";
+set color_page_text = "#000";
+set color_page_title = "#fff";
+set color_header_background = "#75372E";
+
+##===============================
+## Entry Colors
+##===============================
+
+set color_entry_background = "#fff";
+set color_comment_title = "#fff";
+set color_comment_title_background = "#6E6558";
+set color_comment_title_even = "#fff";
+set color_comment_title_background_even = "#9E9588";
+
+##===============================
+## Module Colors
+##===============================
+
+set color_module_background = "#C4AB87";
+set color_module_link = "#3E3528";
+set color_module_link_active = "#00b";
+set color_module_link_visited = "#6E6558";
+set color_module_text = "#000";
+set color_module_title = "#000";
diff -r af4fb7de068f -r 725f0ededf80 cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm Fri Dec 17 01:20:43 2010 +0800
+++ b/cgi-bin/LJ/S2Theme.pm Fri Dec 17 01:41:36 2010 +0800
@@ -49,6 +49,7 @@ sub default_themes {
modular => 'modular/mediterraneanpeach',
negatives => 'negatives/black',
nouveauoleanders => 'nouveauoleanders/sienna',
+ paletteable => 'paletteable/descending',
practicality => 'practicality/warmth',
refriedtablet => 'refriedtablet/refriedclassic',
skittlishdreams => 'skittlishdreams/orange',
diff -r af4fb7de068f -r 725f0ededf80 cgi-bin/LJ/S2Theme/paletteable.pm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/cgi-bin/LJ/S2Theme/paletteable.pm Fri Dec 17 01:41:36 2010 +0800
@@ -0,0 +1,14 @@
+package LJ::S2Theme::paletteable;
+use base qw( LJ::S2Theme );
+use strict;
+
+sub layouts { ( "1" => "one-column", "2l" => "two-columns-left", "2r" =>
"two-columns-right", "3" => "three-columns-sides", "3r" =>
"three-columns-right", "3l" => "three-columns-left" ) }
+sub layout_prop { "layout_type" }
+
+sub comment_props {
+ my $self = shift;
+ my @props = qw(color_comment_title_even
color_comment_title_background_even );
+ return $self->_append_props( "comment_props", @props );
+}
+
+1;
diff -r af4fb7de068f -r 725f0ededf80
htdocs/img/customize/previews/paletteable/clarity.png
Binary file htdocs/img/customize/previews/paletteable/clarity.png has changed
diff -r af4fb7de068f -r 725f0ededf80
htdocs/img/customize/previews/paletteable/coffeeandink.png
Binary file htdocs/img/customize/previews/paletteable/coffeeandink.png has
changed
diff -r af4fb7de068f -r 725f0ededf80
htdocs/img/customize/previews/paletteable/deepsea.png
Binary file htdocs/img/customize/previews/paletteable/deepsea.png has changed
diff -r af4fb7de068f -r 725f0ededf80
htdocs/img/customize/previews/paletteable/descending.png
Binary file htdocs/img/customize/previews/paletteable/descending.png has changed
diff -r af4fb7de068f -r 725f0ededf80
htdocs/img/customize/previews/paletteable/greenrain.png
Binary file htdocs/img/customize/previews/paletteable/greenrain.png has changed
diff -r af4fb7de068f -r 725f0ededf80
htdocs/img/customize/previews/paletteable/redspruce.png
Binary file htdocs/img/customize/previews/paletteable/redspruce.png has changed
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
