[ljcom] r10034: LJSUP-74 Try & buy

U   trunk/cgi-bin/LJ/Widget/CreateAccountUpgrade.pm
U   trunk/htdocs/create/step2a.bml

Modified: trunk/cgi-bin/LJ/Widget/CreateAccountUpgrade.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/CreateAccountUpgrade.pm	2011-02-14 07:30:03 UTC (rev 10033)
+++ trunk/cgi-bin/LJ/Widget/CreateAccountUpgrade.pm	2011-02-14 11:28:11 UTC (rev 10034)
@@ -33,17 +33,8 @@
     $ret .= "</ul>";
     $ret .= "</td><td class='pricingblock'>";
 
-    my $normalpricestring = $class->ml('widget.createaccountupgrade.price', { price => "<span class='priceamount'>\$$normalpricerec</span>" });
-    if (LJ::is_enabled("paid_acct_sale") && !$u->in_class("paid")) {
-        $ret .= "<p class='price'><del>$normalpricestring</del></p>";
-        $ret .= "<p class='pricesale'>" . $class->ml('widget.createaccountupgrade.pricesale', { price => "\$$salepricerec" }) . "</p>";
-    } else {
-        $ret .= "<p class='price'>$normalpricestring</p>";
-    }
-
-    $ret .= "<p class='priceinfo'>" . $class->ml('widget.createaccountupgrade.priceinfo', { numcents => "\$0.06" }) . "</p>";
-    $ret .= $class->html_hidden( ljcom_atype => "paid" );
-    $ret .= $class->html_submit( upgrade => $class->ml('widget.createaccountupgrade.btn.upgrade'), { class => "save-button" });
+    $ret .= '<div class="b-createupgr-trynbuy"><p>' . $class->ml('widget.createaccountupgrade.trynbuy') . '</p><p class="b-createupgr-try">' . $class->ml('widget.createaccountupgrade.trynbuy.try', { aopts => "href='$LJ::SITEROOT/free-trial/' target='_blank'" }) . '</p></div>';
+    $ret .= '<div class="b-createupgr-paid">' . $class->ml('widget.createaccountupgrade.price', { price => "\$$normalpricerec" }) . ' ' . $class->ml('widget.createaccountupgrade.priceinfo', { numcents => "\$0.06" }) . '</p><p class="b-createupgr-try">' . $class->ml('widget.createaccountupgrade.trynbuy.try', { aopts => "href='$LJ::SITEROOT/shop/paidaccount.bml' target='_blank'" }) . '</p></div>';
     $ret .= "</td></tr>";
     $ret .= "</table>";
     $ret .= $class->end_form;
@@ -53,8 +44,6 @@
     $ret .= "</div></div></div></div>";
     $ret .= "</div></div></div></div>";
 
-    $ret .= "<p class='nothanks'><a href='$LJ::SITEROOT/create/thanks.bml'>" . $class->ml('widget.createaccountupgrade.nothanks') . "</a></p>";
-
     return $ret;
 }
 

Modified: trunk/htdocs/create/step2a.bml
===================================================================
--- trunk/htdocs/create/step2a.bml	2011-02-14 07:30:03 UTC (rev 10033)
+++ trunk/htdocs/create/step2a.bml	2011-02-14 11:28:11 UTC (rev 10034)
@@ -55,7 +55,7 @@
     $ret .= "<tr valign='top'><td style='padding-right: 10px;'>";
 
     $ret .= LJ::Widget::CreateAccountProfile->render( from_post => \%from_post );
-    $ret .= LJ::Widget::CreateAccountLevel->render;
+    $ret .= LJ::Widget::CreateAccountUpgrade->render;
 
     $ret .= "</td><td width='300'>";