[ljcom] r10665: LJSUP-9117: S2 Expand

U   trunk/bin/upgrading/s2layers/3column/layout.s2
U   trunk/bin/upgrading/s2layers/component/layout.s2
U   trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
U   trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
U   trunk/bin/upgrading/s2layers/unearthed/layout.s2
U   trunk/bin/upgrading/s2layers/voxhtml/layout.s2

Modified: trunk/bin/upgrading/s2layers/3column/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/3column/layout.s2	2011-06-20 08:05:39 UTC (rev 10664)
+++ trunk/bin/upgrading/s2layers/3column/layout.s2	2011-06-20 08:32:43 UTC (rev 10665)
@@ -691,7 +691,7 @@
     # if ($c.thread_url != "" and defined $expand_link) {
     if ($c.thread_url != "") {
     #     print " " + $c->expand_link() + $*t_divider;
-        " ("; $c->print_expand_collapse_links(); ")";
+        " - "; $c->print_expand_collapse_links();
     }
     print """</div></div></div></div>""";
     ### $this->print_comments($c.replies);

Modified: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2	2011-06-20 08:05:39 UTC (rev 10664)
+++ trunk/bin/upgrading/s2layers/component/layout.s2	2011-06-20 08:32:43 UTC (rev 10665)
@@ -2806,7 +2806,7 @@
     print_comment_content_top($c);
     "$content";
     if ($c.thread_url != "") {
-        " ("; $c->print_expand_collapse_links(); ")";
+        " - "; $c->print_expand_collapse_links();
     }
     print_comment_content_bottom();
 }

Modified: trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-06-20 08:05:39 UTC (rev 10664)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2	2011-06-20 08:32:43 UTC (rev 10665)
@@ -1895,7 +1895,7 @@
     <div class="commentHolder"><div class="commentText">""";
     print "<a href=\"$comment.permalink_url\">"+($comment.subject==""?"<i>(no subject)</i>":"$comment.subject")+"</a> - ";
     print (defined $comment.poster?"<span class=\"ljuser\" style=\"white-space:nowrap;\">$comment.poster</span>":"<i>Anonymous</i>");
-    " ("; $comment->print_expand_collapse_links(); ") ";
+    " - "; $comment->print_expand_collapse_links();
     """</div></div>""";
 }
 

Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-06-20 08:05:39 UTC (rev 10664)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2	2011-06-20 08:32:43 UTC (rev 10665)
@@ -1331,7 +1331,7 @@
     print safe "<a href='$c.permalink_url'>$subj</a> - $poster";
     var Link expand_link = $c->get_link("expand_comments");
     if ($c.thread_url != "") {
-        $c->print_expand_collapse_links();
+        " - "; $c->print_expand_collapse_links();
     }
 }
 
@@ -1425,7 +1425,9 @@
                 print safe " | ";
             }
             print safe "<a href=\"$c.thread_url\" title=\"$*text_comment_thread\">$*text_comment_thread</a>";
-            $c->print_expand_collapse_links();
+            if ($c.parent_url != "" and size $c.replies > 0) {
+                " | "; $c->print_expand_collapse_links();
+            }
         }
         print "</h4>";
                 # $c->print_reply_container();

Modified: trunk/bin/upgrading/s2layers/unearthed/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-06-20 08:05:39 UTC (rev 10664)
+++ trunk/bin/upgrading/s2layers/unearthed/layout.s2	2011-06-20 08:32:43 UTC (rev 10665)
@@ -1407,7 +1407,7 @@
     var string subj = $c.subject != "" ? $c.subject : $*text_nosubject;
     print safe "<a href='$c.permalink_url'>$subj</a> - $poster";
     if ($c.thread_url != "") {
-        $c->print_expand_collapse_links();
+        " - "; $c->print_expand_collapse_links();
     }
 }
 
@@ -1490,7 +1490,9 @@
     if ($c.parent_url != "") { println """(<a href="$c.parent_url">$*text_comment_parent</a>) """; }
     if ($c.thread_url != "" and (not $c.spam)) {
         println """(<a href="$c.thread_url">$*text_comment_thread</a>) """;
-        $c->print_expand_collapse_links();
+        if ($c.parent_url != "" and size $c.replies > 0) {
+            "("; $c->print_expand_collapse_links(); ") ";
+        }
     }
     # $c->print_reply_container();
     println "</div>";

Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-06-20 08:05:39 UTC (rev 10664)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2	2011-06-20 08:32:43 UTC (rev 10665)
@@ -2397,7 +2397,7 @@
      #if ($e.thread_url != "" and defined $expand_link) {
      #      " " + $e->expand_link({ "class" => "collapsed-comment-link" });
      #}
-        " ("; $e->print_expand_collapse_links(); ") ";
+        " - "; $e->print_expand_collapse_links();
  
      """
          </div>