Андрей (andy) wrote in changelog,
Андрей
andy
changelog

[livejournal] r18379: LJINT-362 (Comments for side projects)

Committer: ailyin
LJINT-362 (Comments for side projects)
U   trunk/cgi-bin/LJ/Talk.pm
U   trunk/cgi-bin/LJ/Widget/LoginMulti.pm
U   trunk/htdocs/gadgets/logcom.bml
U   trunk/templates/CommentForm/FormEmbedable.tmpl
Modified: trunk/cgi-bin/LJ/Talk.pm
===================================================================
--- trunk/cgi-bin/LJ/Talk.pm	2011-02-22 09:31:50 UTC (rev 18378)
+++ trunk/cgi-bin/LJ/Talk.pm	2011-02-22 10:30:24 UTC (rev 18379)
@@ -1971,6 +1971,7 @@
 
         'logout_url'            => $opts->{'logout_url'},
         'js_check_domain'       => $opts->{'js_check_domain'},
+        'resources_html'        => $opts->{'resources_html'},
         'partner_domain'        => $opts->{'partner_domain'},
         'partner_remote_ljuser' => $opts->{'partner_remote_ljuser'},
     );

Modified: trunk/cgi-bin/LJ/Widget/LoginMulti.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/LoginMulti.pm	2011-02-22 09:31:50 UTC (rev 18378)
+++ trunk/cgi-bin/LJ/Widget/LoginMulti.pm	2011-02-22 10:30:24 UTC (rev 18379)
@@ -97,6 +97,7 @@
         'current_type'      => $current_type,
         'returnto'          => $thispage,
         'js_check_domain'   => $opts{'js_check_domain'},
+        'resources_html'    => $opts{'resources_html'},
     );
 
     ## well cooked widget is here

Modified: trunk/htdocs/gadgets/logcom.bml
===================================================================
--- trunk/htdocs/gadgets/logcom.bml	2011-02-22 09:31:50 UTC (rev 18378)
+++ trunk/htdocs/gadgets/logcom.bml	2011-02-22 10:30:24 UTC (rev 18379)
@@ -77,6 +77,9 @@
                 'journalu'          => $journal,
                 'ditemid'           => $entry->ditemid,
                 'replyto'           => int ($replyto / 256),
+
+                'resources_html'    => $partner->resources_html
+                                    || LJ::res_includes(),
             });
     } else {
         ## display login widget
@@ -95,6 +98,8 @@
         return $w->render(
             'embedded'          => 1,
             'js_check_domain'   => $js_check_domain,
+            'resources_html'    => $partner->resources_html
+                                || LJ::res_includes(),
 
             'forwhat'           => 'external',
             'thispage'          => $thispage,

Modified: trunk/templates/CommentForm/FormEmbedable.tmpl
===================================================================
--- trunk/templates/CommentForm/FormEmbedable.tmpl	2011-02-22 09:31:50 UTC (rev 18378)
+++ trunk/templates/CommentForm/FormEmbedable.tmpl	2011-02-22 10:30:24 UTC (rev 18379)
@@ -4,7 +4,7 @@
 	<meta charset="UTF-8">
 	<title>index :: Дерево комментариев</title>
 
-	<TMPL_VAR lj_res_includes>
+	<TMPL_VAR resources_html>
 </head>
 <body>
 	<TMPL_VAR js_check_domain>

Tags: andy, bml, livejournal, pm, tmpl
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