[dw-free] S2 should have placeholder for comment titles

[mark]

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

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

Add permanent comment link, and only show Thread link if there are replies.

Patch by wyntarvox.

Files modified:

• bin/upgrading/s2layers/core2.s2
• cgi-bin/LJ/S2/EntryPage.pm

--------------------------------------------------------------------------------
diff -r 7adcc3ea6e4f -r f61eb35a03b1 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Mon Sep 21 00:49:15 2009 +0000
+++ b/bin/upgrading/s2layers/core2.s2	Mon Sep 21 01:36:38 2009 +0000
@@ -2156,6 +2156,11 @@ property string text_comment_parent {
     example = "Parent";
     maxlength = "50";
 }
+property string text_comment_link {
+    des = "Text to link to the comment";
+    example = "Link";
+    maxlength = "50";
+}
 property string text_comment_thread {
     des = "Text to link to the thread stemming from the comment";
     example = "Thread";
@@ -2169,6 +2174,7 @@ set text_comment_reply = "Reply";
 set text_comment_reply = "Reply";
 set text_comment_frozen = "Frozen";
 set text_comment_parent = "Parent";
+set text_comment_link = "Link";
 set text_comment_thread = "Thread";
 set text_comment_expand = "Expand";
 
@@ -4167,6 +4173,7 @@ function Comment::print_interaction_link
 "Prints comment interaction links, aka reply/thread/parent/expand."
 {
     """<ul class="comment-interaction-links">""";
+    print safe """<li class="link commentpermalink"><a href="$this.permalink_url">$*text_comment_link</a></li>\n""";
     if ($this.frozen) {
         print safe """<li class="link frozen first-item">$*text_comment_frozen</li>\n""";
     } else {
diff -r 7adcc3ea6e4f -r f61eb35a03b1 cgi-bin/LJ/S2/EntryPage.pm
--- a/cgi-bin/LJ/S2/EntryPage.pm	Mon Sep 21 00:49:15 2009 +0000
+++ b/cgi-bin/LJ/S2/EntryPage.pm	Mon Sep 21 01:36:38 2009 +0000
@@ -271,7 +271,8 @@ sub EntryPage
             push @$link_keyseq, "watching_parent" if LJ::is_enabled('esn');
             unshift @$link_keyseq, "edit_comment" if LJ::is_enabled('edit_comments');
 
-            $s2com->{'thread_url'} = LJ::Talk::talkargs($permalink, "thread=$dtalkid", $style_arg) . LJ::Talk::comment_anchor( $dtalkid );
+            $s2com->{'thread_url'} = LJ::Talk::talkargs($permalink, "thread=$dtalkid", $style_arg) . LJ::Talk::comment_anchor( $dtalkid )
+                if @{$com->{children}};
 
             # add the poster_ip metadata if remote user has
             # access to see it.
--------------------------------------------------------------------------------