Convert misc widgets to TT (#3500)

* Convert Search widget

* Convert PaidAccountStatus widget to use TT

* Convert NewlyCreatedComms and RecentlyActiveComms to TT

---------

Co-authored-by: Cocoa <momijizukamori@gmail.com>

Author: momijizukamori

cgi-bin/DW/Widget/NewlyCreatedComms.pm

@@ -35,7 +35,6 @@ sub render_body {
 
     my $dbr = LJ::get_db_reader();
     my $sth;
-    my $ret;
 
     # prep the stats we're interested in using here
 
@@ -44,24 +43,16 @@ sub render_body {
     );
     $sth->execute;
 
-    $ret .= "<h2>" . $class->ml('widget.comms.recentcreate') . "</h2>";
-    $ret .= "<ul>";
-
-    # build the list
-
-    my $ct;
     my $targetu;
+    my @rowdata;
 
     while ( my ( $iuser, $iname, $itime ) = $sth->fetchrow_array ) {
         $targetu = LJ::load_user($iuser);
-        $ret .= "<li>" . $targetu->ljuser_display . ": " . $iname . ", " . $itime . "</li>\n";
-        $ct++;
+        push @rowdata, { user => $targetu, name => $iname, time => $itime };
     }
 
-    $ret .= "<li><em> " . BML::ml('widget.comms.notavailable') . "</em></li>" unless $ct;
-    $ret .= "</ul>\n";
-
-    return $ret;
+    return DW::Template->template_string( 'widget/comms.tt',
+        { title => 'widget.comms.recentcreate', rowdata => \@rowdata } );
 }
 
 1;

cgi-bin/DW/Widget/PaidAccountStatus.pm

@@ -41,12 +41,8 @@ sub render_body {
         . LJ::mysql_time($expires_at)
         : '';
 
-    my $ret = "<div class='shop-item-highlight shop-account-status border'>";
-    $ret .= $class->ml('widget.paidaccountstatus.accounttype') . " ";
-    $ret .= "<strong>$account_type</strong>$expires_on";
-    $ret .= "</div>";
-
-    return $ret;
+    return DW::Template->template_string( 'widget/paidaccountstatus.tt',
+        { account_type => $account_type, expires_on => $expires_on } );
 }
 
 1;

cgi-bin/DW/Widget/RecentlyActiveComms.pm

@@ -35,7 +35,6 @@ sub render_body {
 
     my $dbr = LJ::get_db_reader();
     my $sth;
-    my $ret;
 
     # prep the stats we're interested in using here
 
@@ -45,25 +44,16 @@ sub render_body {
             . " AND u.journaltype = 'C' ORDER BY uu.timeupdate_public DESC LIMIT 10" );
     $sth->execute;
 
-    $ret .= "<h2>" . $class->ml('widget.comms.recentactive') . "</h2>";
-    $ret .= "<ul>";
-
-    # build the list
-
-    my $ct;
     my $targetu;
+    my @rowdata;
 
     while ( my ( $iuser, $iname, $itime ) = $sth->fetchrow_array ) {
         $targetu = LJ::load_user($iuser);
-        $ret .= "<li>" . $targetu->ljuser_display . ": " . $iname . ", " . $itime . "</li>\n";
-        $ct++;
+        push @rowdata, { user => $targetu, name => $iname, time => $itime };
     }
 
-    $ret .= "<li><em> " . BML::ml('widget.comms.notavailable') . "</em></li>" unless $ct;
-    $ret .= "</ul>\n";
-
-    LJ::warn_for_perl_utf8($ret);
-    return $ret;
+    return DW::Template->template_string( 'widget/comms.tt',
+        { title => 'widget.comms.recentactive', rowdata => \@rowdata } );
 }
 
 1;

cgi-bin/LJ/Widget/Search.pm

@@ -20,43 +20,7 @@ use Carp qw(croak);
 sub need_res { qw( stc/widgets/search.css ) }
 
 sub render_body {
-    my $class = shift;
-    my %opts  = @_;
-    my $ret;
-
-    my ( $select_box, $search_btn );
-
-    my @search_opts = (
-        int          => $class->ml('widget.search.interest'),
-        region       => $class->ml('widget.search.region'),
-        nav_and_user => $class->ml('widget.search.siteuser'),
-        faq          => $class->ml('widget.search.faq'),
-        email        => $class->ml('widget.search.email'),
-    );
-
-    {
-        $select_box =
-            LJ::html_select( { name => 'type', selected => 'int', class => 'select' },
-            @search_opts )
-            . " ";
-        $search_btn = LJ::html_submit( $class->ml('widget.search.btn.go') );
-    }
-
-    $ret .= "<form action='$LJ::SITEROOT/multisearch' method='post'>\n";
-    $ret .= LJ::html_text(
-        {
-            name  => 'q',
-            id    => 'search',
-            class => 'text',
-            title => $class->ml('widget.search.title'),
-            size  => 20
-        }
-    ) . " ";
-    $ret .= $select_box;
-    $ret .= $search_btn;
-    $ret .= "</form>";
-
-    return $ret;
+    return DW::Template->template_string('widget/search.tt');
 }
 
 1;

views/widget/comms.tt

@@ -0,0 +1,10 @@
+<h2>[% dw.ml(title) %]</h2>
+<ul>
+[% IF rowdata.length > 0 %]
+    [% FOREACH row IN rowdata %]
+    <li>[% row.user.ljuser_display %]: [% row.name %], [% row.time %]</li>
+    [% END %]
+[% ELSE %]
+    <li><em>[% dw.ml('widget.comms.notavailable') %]</em></li>
+[% END %]
+</ul>

views/widget/paidaccountstatus.tt

@@ -0,0 +1,3 @@
+<div class='shop-item-highlight shop-account-status border'>
+[% dw.ml('widget.paidaccountstatus.accounttype') %] <strong>[% account_type %]</strong>[% expires_on %]
+</div>

views/widget/search.tt

@@ -0,0 +1,21 @@
+<form action='[% site.root %]/multisearch' method='post'>
+[% form.textbox (
+    name  => 'q',
+    id    => 'search',
+    class => 'text',
+    title => dw.ml('widget.search.title'),
+    size  => 20) 
+%]
+[% form.select( 
+    name => 'type', 
+    selected => 'int', 
+    class => 'select',
+    items => [
+        'int',          dw.ml('widget.search.interest'),
+        'region',       dw.ml('widget.search.region'),
+        'nav_and_user', dw.ml('widget.search.siteuser'),
+        'faq',          dw.ml('widget.search.faq'),
+        'email',        dw.ml('widget.search.email'),
+    ] ) %]
+[% form.submit( value = dw.ml('widget.search.btn.go') )%]
+</form>