kizu (ki_zu) wrote in changelog,
kizu
ki_zu
changelog

[ljcom] r7753: LJSUP-4664: some minor fixes in Penguins...

Committer: rkomarov
LJSUP-4664: some minor fixes in Penguins theme plus added classes for emsdashes and summary's comments/taglist's counts

U   trunk/bin/upgrading/s2layers/sup/layout.s2
U   trunk/bin/upgrading/s2layers/sup/themes.s2
Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2009-10-06 11:07:16 UTC (rev 7752)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2009-10-07 07:30:34 UTC (rev 7753)
@@ -568,7 +568,7 @@
         }
 
         if ($*tag_display == "list") {
-            $links[size $links] = """<a href="$tag.url" rel="tag">$tag.name</a> — $count_text""";
+            $links[size $links] = """<a href="$tag.url" rel="tag">$tag.name</a> <span class="emdash">—</span> <span class="tag-count">$count_text</span>""";
         } else {
             $links[size $links] = """<a href="$tag.url" title="$count_text" rel="tag" style="font-size:${text}em;">$tag.name</a>""";
         }
@@ -612,16 +612,15 @@
         """<li>""";
             if (($p.journal.username == $e.journal.username) and $p.view == "recent" and $p.journal_type == "C") {
                 print _user_print($e.poster,"microformatted");
-                """ — """;
+                """ <span class="emdash">—</span> """;
             } elseif ($p.journal.username != $e.journal.username or $p.view == "friends") {
                 print _user_print($e.journal,"microformatted");
-                """ — """;
+                """ <span class="emdash">—</span> """;
             }
             """<a href="#post-$e.journal.username-$e.itemid">""";
                 print ($e.subject != "") ? striphtml($e.subject) : $*text_nosubject;
             """</a>""";
-                print ($e.comments.count > 0 ? " — <a href=\"$e.permalink_url\">" + get_plural_phrase($e.comments.count, "text_read_comments") + "</a>":"");
-
+                print ($e.comments.count > 0 ? """ <span class="emdash">—</span> <a class="summary-comments" href="$e.permalink_url">""" + get_plural_phrase($e.comments.count, "text_read_comments") + "</a>":"");
         """</li>""";
     }
 """
@@ -890,7 +889,7 @@
         $comments_count = get_plural_phrase($e.comments.count, "text_read_comments");
     }
     if ($e.comments.count > 0) {
-        $comments_count = """<span class="comments-count">$comments_count</span> — """;
+        $comments_count = """<span class="comments-count">$comments_count</span> <span class="emdash">—</span> """;
     } else {
         $comments_count = "";
     }
@@ -1035,7 +1034,7 @@
             print safe " <a href=\"$e.permalink_url\">$*text_nosubject</a>";
         }
         if ($e.comments.count > 0) {
-            print safe " — " + get_plural_phrase($e.comments.count, "text_read_comments");
+            print safe """ <span class="emdash">—</span> """ + get_plural_phrase($e.comments.count, "text_read_comments");
         }
         if ($e.comments.screened) {
             print safe " $*text_month_screened_comments";
@@ -1418,7 +1417,7 @@
     if ($subj == "...") {
         $subj = "…";
     }
-    print safe """<a href="$c.permalink_url">$subj</a> — $poster""";
+    print safe """<a href="$c.permalink_url">$subj</a> <span class="emdash">—</span> $poster""";
     var Link expand_link = $c->get_link("expand_comments");
     if ($c.thread_url != "" and defined $expand_link) {
         " ("; $c->print_expand_link(); ")";

Modified: trunk/bin/upgrading/s2layers/sup/themes.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/themes.s2	2009-10-06 11:07:16 UTC (rev 7752)
+++ trunk/bin/upgrading/s2layers/sup/themes.s2	2009-10-07 07:30:34 UTC (rev 7753)
@@ -339,33 +339,7 @@
 """;
     _Footer();
 }
-function _summary(Entry[] entries) {
-    var Page p=get_page();
-"""
-    <ul>
-""";
-    foreach var Entry e ($entries) {
-        """<li>""";
-            if (($p.journal.username == $e.journal.username) and $p.view == "recent" and $p.journal_type == "C") {
-                print _user_print($e.poster,"microformatted");
-                """ — """;
-            } elseif ($p.journal.username != $e.journal.username or $p.view == "friends") {
-                print _user_print($e.journal,"microformatted");
-                """ — """;
-            }
-            """<a href="#post-$e.journal.username-$e.itemid">""";
-                print ($e.subject != "") ? striphtml($e.subject) : $*text_nosubject;
-            """</a>""";
-            	print ($e.comments.count > 0 ? " — <a class=\"summary-comments\" href=\"$e.permalink_url\">" + get_plural_phrase($e.comments.count, "text_read_comments") + "</a>":"");
-        """</li>""";
-    }
-"""
-    </ul>
-""";
-    }
 
-
-
 function _print_entry(Entry e) {
     var Page p = get_page();
     var string entrydate = _dateTime($e.time);
@@ -475,10 +449,10 @@
         """<li>""";
             if (($p.journal.username == $e.journal.username) and $p.view == "recent" and $p.journal_type == "C") {
                 print _user_print($e.poster,"microformatted");
-                """ — """;
+                """ <span class="emdash">—</span> """;
             } elseif ($p.journal.username != $e.journal.username or $p.view == "friends") {
                 print _user_print($e.journal,"microformatted");
-                """ — """;
+                """ <span class="emdash">—</span> """;
             }
             """<a href="#post-$e.journal.username-$e.itemid">""";
                 print ($e.subject != "") ? striphtml($e.subject) : $*text_nosubject;

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