yokcel (yokcel) wrote in changelog,
yokcel
yokcel
changelog

[ljcom] r11957: LJSUP-12199: Page with comments

Committer: ybuhvalova
LJSUP-12199: Page with comments
U   trunk/bin/upgrading/s2layers/sup/themes.s2
Modified: trunk/bin/upgrading/s2layers/sup/themes.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/themes.s2	2012-05-15 14:57:31 UTC (rev 11956)
+++ trunk/bin/upgrading/s2layers/sup/themes.s2	2012-05-15 14:59:08 UTC (rev 11957)
@@ -3025,6 +3025,44 @@
     _Footer();
 }
 
+function EntryPage::print_comment (Comment c) {
+    var Page p = get_page();
+    var int indent = ($c.depth - 1) * 25;
+
+	var string class_arrow = " comment-arrow";
+	if ($c.depth == 1){
+		$class_arrow = "";
+		}
+
+    var string comment_classes = "comment-wrap$class_arrow";
+    if ($c.deleted) { $comment_classes = $comment_classes + " deleted"; }
+    if ($c.screened) { $comment_classes = $comment_classes + " screened"; }
+    if ($c.edited) { $comment_classes = $comment_classes + " edited"; }
+    if ($c.frozen) { $comment_classes = $comment_classes + " frozen"; }
+    if ($c.spam) { $comment_classes = $comment_classes + " spam"; }
+    if (not $c.full) { $comment_classes = $comment_classes + " partial"; }
+	if ($this.multiform_on) { $comment_classes = $comment_classes + " multycheckbox"; }
+
+    """<div id="$c.dom_id" class="$comment_classes" style="margin-left:${indent}px;">""";
+    """<a name="$c.anchor"></a>""";
+
+    if ($c.screened and not $c.full and not viewer_is_owner()) {
+        """<strong>$*text_comment_screened</strong>""";
+    } elseif ($c.deleted) {
+        """<strong>$*text_comment_deleted</strong>""";
+    } elseif (($c.spam) and (not $p.showspam) and (not $c.can_marked_as_spam) and (size($c.replies) > 0)) {
+        """<strong>$*text_spam_comment</strong>""";
+    } elseif ($c.full) {
+        $this->print_comment_full($c);
+    } else {
+        $this->print_comment_partial($c);
+    }
+
+    "</div>";
+
+    $c->print_reply_container();
+}
+
 function EntryPage::print_comment_full (Comment c) {
     var Page p = get_page();
     var string poster = defined $c.poster ? _user_print($c.poster, "microformatted") : "<em>$*text_poster_anonymous</em>";
@@ -3032,6 +3070,20 @@
     var string commdate = _dateTime($c.time);
     var string hide_controls = $*hide_comment_controls ? " hide-comment-controls" : "";
 
+	var string comment_before = "<div class=\"comment-arrow\"></div>";
+	if ($c.depth == 1){
+		$comment_before = "";
+		}
+
+	if(not($*old_s1)) {
+		if ($this.multiform_on) {
+        """<div class="c-multyform">""";
+            print safe """ <label for="ljcomsel_$c.talkid">$*text_multiform_check</label>""";
+            $c->print_multiform_check();
+        "</div>";
+        }
+	}	
+		
     if (defined $c.userpic and $*comment_userpic_style != "off") {
         var int w = $c.userpic.width;
         var int h = $c.userpic.height;
@@ -3057,6 +3109,7 @@
         "</p>";
         "</div>";
     } else {
+
         """<div class="comment-head-in""" + $hide_controls + """">""";
             if (defined $c.subject_icon or $c.subject != "") {
                 """<h3>$c.subject_icon $c.subject</h3>""";
@@ -3070,12 +3123,7 @@
                     """</span>"""; 
                 }
             
-            if ($this.multiform_on) {
-                """<span class="c-multyform">""";
-                    print safe """ <label for="ljcomsel_$c.talkid">$*text_multiform_check</label>""";
-                    $c->print_multiform_check();
-                "</span>";
-                }
+            
             """<div class="c-linkbar">""";
                 $c->print_linkbar();
                 "</div>";

Tags: ljcom, s2, ybuhvalova, yokcel
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments