changelog | [dw-free] Add clearing element to Tabula Rasa

[commit: http://hg.dwscoalition.org/dw-free/rev/4af523013a87]

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

Adds clearing content-footer element to Tabula Rasa, and removes now-
redundant code from Colorside layout.

Patch by
afuna.

Files modified:
bin/upgrading/s2layers/colorside/layout.s2
bin/upgrading/s2layers/core2.s2
bin/upgrading/s2layers/core2base/layout.s2
--------------------------------------------------------------------------------
diff -r 2a240f4f8cb7 -r 4af523013a87 bin/upgrading/s2layers/colorside/layout.s2
--- a/bin/upgrading/s2layers/colorside/layout.s2	Thu Nov 12 12:17:12 2009 -0600
+++ b/bin/upgrading/s2layers/colorside/layout.s2	Thu Nov 12 12:41:30 2009 -0600
@@ -6,66 +6,6 @@ layerinfo lang = "en";
 
 set layout_authors = [ { "name" => "branchandroot", "type" => "user" } ];
 set layout_type = "two-columns-right";
-
-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_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="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>""";
-}
-
 
 function print_stylesheet() {
     var string canvas_colors = generate_color_css( new Color, $*color_page_background, new Color );
@@ -113,8 +53,6 @@ width: 96% !important; }
 width: 96% !important; }
 
 .one-column #canvas { display: block; }
-
-#content-footer { clear: both; }
 
 
 /* header */
diff -r 2a240f4f8cb7 -r 4af523013a87 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Thu Nov 12 12:17:12 2009 -0600
+++ b/bin/upgrading/s2layers/core2.s2	Thu Nov 12 12:41:30 2009 -0600
@@ -3850,6 +3850,7 @@ function Page::print()
                         $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 --> 
diff -r 2a240f4f8cb7 -r 4af523013a87 bin/upgrading/s2layers/core2base/layout.s2
--- a/bin/upgrading/s2layers/core2base/layout.s2	Thu Nov 12 12:17:12 2009 -0600
+++ b/bin/upgrading/s2layers/core2base/layout.s2	Thu Nov 12 12:41:30 2009 -0600
@@ -352,6 +352,12 @@ a:active { $page_link_active_colors }
 	border-right: $*sidebar_width_doubled solid transparent;
 }
 
+#content-footer {
+    height: 0;
+    font-size: 0; /*to make IE happy*/
+    clear: both;
+}
+
 #header, #footer { 
 	margin: 0;
     clear: both;
--------------------------------------------------------------------------------