[dw-free] Remove header div element from Entry::print_wrapper_* functions

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/35b1fc86e54c]

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

Fix header div element.

Patch by av8rmike.

Files modified:

• bin/upgrading/s2layers/core2.s2
• bin/upgrading/s2layers/negatives/layout.s2

--------------------------------------------------------------------------------
diff -r aca1dde2e48b -r 35b1fc86e54c bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Tue Apr 21 07:20:07 2009 +0000
+++ b/bin/upgrading/s2layers/core2.s2	Tue Apr 21 13:20:21 2009 +0000
@@ -3184,9 +3184,11 @@ function Page::print_entry(Entry e)
 {
     ## For most styles, this will be overridden by FriendsPage::print_entry and such.
     $e->print_wrapper_start();
+    """<div class="header">\n""";
     $e->print_subject();
     $e->print_metatypes();
     $e->print_time();
+    """</div>\n""";
     """<div>\n""";
     """<div class="contents">\n""";
     """<div class="inner">\n""";
@@ -3274,7 +3276,6 @@ function Entry::print_wrapper_start() {
     """<div class="separator separator-pre"><div class="inner"></div></div>\n""";
     """<div class="entry" id="entry-$this.itemid">\n""";
     """<div class="inner">\n""";
-    """<div class="header">\n""";
 }
 function Comment::print_wrapper_start() {
     var string alternate = alternate ("comment-wrapper-a", "comment-wrapper-b");
@@ -3289,8 +3290,7 @@ function EntryLite::print_wrapper_end() 
 function EntryLite::print_wrapper_end() {
 }
 function Entry::print_wrapper_end() {
-    "</div>\n</div>\n";
-    "</div>\n</div>\n";
+    "</div>\n</div>\n</div>\n";
 }
 function Comment::print_wrapper_end() {
     "</div>\n</div>\n";
diff -r aca1dde2e48b -r 35b1fc86e54c bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Tue Apr 21 07:20:07 2009 +0000
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Tue Apr 21 13:20:21 2009 +0000
@@ -382,8 +382,9 @@ function Page::print_entry (Entry e)
 function Page::print_entry (Entry e)
 {
     $e->print_wrapper_start();
+    print "<div class=\"header\">";
     $e->print_userpic();
-print "<div class=\"subject\">&raquo;";
+    print "<div class=\"subject\">&raquo;";
             $e->print_metatypes();
             $e->print_subject();
         println "</div>";
@@ -393,7 +394,7 @@ print "<div class=\"subject\">&raquo;";
             $e->print_time();
             print ")";
         println "</div>";
-
+    println "</div>";
     $e->print_text();
     $e->print_metadata();
     $e->print_tags();
--------------------------------------------------------------------------------