[dw-free] Use new comment functions in Negatives

[afuna]

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

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

Use comment wrappers, standard core2 comment functions (negatives)

Patch by dani_the_girl.

Files modified:

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

--------------------------------------------------------------------------------
diff -r 9f5d51d29d5b -r b5229ad95bd0 bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Sun Apr 12 16:49:22 2009 +0000
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Sun Apr 12 16:58:25 2009 +0000
@@ -322,6 +322,8 @@ function print_stylesheet()
         font-size: 0.85em;
         color: #ffffff;
     }
+    
+    .entry h3 { display: inline; }
     """;
 }
 
@@ -541,11 +543,8 @@ function EntryPage::print_comment (Comme
 function EntryPage::print_comment (Comment c)
 {
     println "<div class=\"entry\">";
-    var string sub_icon;
-    if (defined $c.subject_icon and $*enable_subjecticons)
-    {
-        $sub_icon = $c.subject_icon->as_string();
-    }
+    $c->print_wrapper_start();
+
     println "<a name=\"$c.anchor\"></a>";
     $c->print_userpic();
     println "<div class='datetime'><a href='$c.permalink_url' title='Permalink'>";
@@ -560,15 +559,12 @@ function EntryPage::print_comment (Comme
     {
         println " &raquo; ";
     }
-    if ($c.metadata{"poster_ip"}) {
-        println " (" + $c.metadata{"poster_ip"} + ")";
-    }
+    $c->print_metadata();
+
     println "";
 
     $c->print_poster();
-    if (defined $c.subject_icon) {
-        print "$c.subject_icon";
-    }
+    $c->print_metatypes();
 
     $c->print_subject();
 
@@ -588,6 +584,7 @@ function EntryPage::print_comment (Comme
     println "</div>";
 
     $c->print_reply_container();
+    $c->print_wrapper_end();
 }
 
 ####################################
@@ -631,3 +628,4 @@ function Page::print()
     println "</body>";
     println "</html>";
 }
+
--------------------------------------------------------------------------------