[ljcom] r9621: LJSV-1244: Novel Conundrum Layout Userna...

U   trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2

Modified: trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2010-10-14 08:07:59 UTC (rev 9620)
+++ trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2	2010-10-15 02:54:09 UTC (rev 9621)
@@ -648,30 +648,17 @@
     <td valign="top">
         <div class="bodybox">
         <div class="author">""";
+            if ($e.userpic) { $e.userpic->print(); """<br />""";}
+            print $e.poster->ljuser();
+            if ($e.security != "") {
+                $e.security_icon->print();
+            }
+            if ($e.poster.username != $e.journal.username and $e.journal.journal_type =="C") {
+            """,<br />
+            <img border="0" src="$*IMGDIR/community.gif" alt="" align="absmiddle" />
+            <a href=\"""" + $e.journal->base_url() + """/">$e.journal.username</a>""";
+            }
 
-    if (defined $e.userpic) {
-        """<img border="0" src="$e.userpic.url" width="$e.userpic.width" height="$e.userpic.height" alt=""><br />""";
-    }
-    # elseif ($e.poster.journal_type == "C") {
-    #     """<img border="0" src="$*IMGDIR/community.gif" alt="" /><br />""";
-    # 
-    # }
-    # elseif ($e.poster.journal_type == "Y") {
-    #     """<img border="0" src="$*IMGDIR/syndicated.gif" alt="" /><br />""";
-    # }
-    else {
-        #"""<img border="0" src="$*IMGDIR/userinfo.gif" alt="" /><br />""";
-		print $e.poster->ljuser();
-    }
-    if ($e.security != "") {
-        $e.security_icon->print();
-    }
-    if ($e.poster.username != $e.journal.username and $e.journal.journal_type =="C") {
-""",<br />
-<img border="0" src="$*IMGDIR/community.gif" alt="" align="absmiddle" />
-<a href=\"""" + $e.journal->base_url() + """/">$e.journal.username</a>""";
-    }
-
     var string subject=$e.subject;
     if($p.view=="entry") { $subject=""; }
 """</div>