[livejournal] r23011: LJSUP-13770 (refactor LJ FAQs from BML t...

U   trunk/cgi-bin/LJ/Portal/Box/FAQ.pm
U   trunk/cgi-bin/LJ/Widget/CreateAccount.pm
U   trunk/cgi-bin/crumbs.pl
U   trunk/htdocs/multisearch.bml
U   trunk/htdocs/sitemap.txt
U   trunk/htdocs/support/index.bml
U   trunk/htdocs/support/see_request.bml

Modified: trunk/cgi-bin/LJ/Portal/Box/FAQ.pm
===================================================================
--- trunk/cgi-bin/LJ/Portal/Box/FAQ.pm	2012-09-28 12:56:39 UTC (rev 23010)
+++ trunk/cgi-bin/LJ/Portal/Box/FAQ.pm	2012-09-28 13:12:05 UTC (rev 23011)
@@ -104,7 +104,7 @@
 
     $content .= qq {
             <b>FAQ Search:</b>
-            <form action="$LJ::SITEROOT/support/faqsearch.bml" method="GET">
+            <form action="$LJ::SITEROOT/support/faq/search.html" method="GET">
             <input type="hidden" name="lang" value="$currlang" />
             <div style="padding: 5px;">
               } . LJ::html_text({ name => 'q' }) . qq {

Modified: trunk/cgi-bin/LJ/Widget/CreateAccount.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/CreateAccount.pm	2012-09-28 12:56:39 UTC (rev 23010)
+++ trunk/cgi-bin/LJ/Widget/CreateAccount.pm	2012-09-28 13:12:05 UTC (rev 23011)
@@ -31,7 +31,7 @@
         return '<h1>' . $class->ml('widget.createaccount.error.underage.title') . '</h1>'
                . '<p>' . $class->ml('widget.createaccount.error.underage.message') . '</p>'
                . '<p><strong>' . $class->ml('widget.createaccount.error.underage.links') . '</strong></p>'
-               . '<p>' . $class->ml('widget.createaccount.error.underage.faq', { faq => $LJ::SITE_ROOT . '/support/faq.bml' }) . '</p>'
+               . '<p>' . $class->ml('widget.createaccount.error.underage.faq', { faq => $LJ::SITE_ROOT . '/support/faq/' }) . '</p>'
                . '<p>' . $class->ml('widget.createaccount.error.underage.ljhome', { ljhome =>  $LJ::SITE_ROOT } ) . '</p>';
         ;
     }

Modified: trunk/cgi-bin/crumbs.pl
===================================================================
--- trunk/cgi-bin/crumbs.pl	2012-09-28 12:56:39 UTC (rev 23010)
+++ trunk/cgi-bin/crumbs.pl	2012-09-28 13:12:05 UTC (rev 23011)
@@ -41,7 +41,7 @@
                'emailmanage' => ['Email Management', '/tools/emailmanage.bml', 'manage'],
                'encodings' => ['About Encodings', '/support/encodings.bml', 'support'],
                'export' => ['Export Journal', '/export.bml', 'home'],
-               'faq' => ['Frequently Asked Questions', '/support/faq.bml', 'support'],
+               'faq' => ['Frequently Asked Questions', '/support/faq/', 'support'],
                'feedstersearch' => ['Search a Journal', '/tools/search.bml', 'home'],
                'filterfriends' => ['Filter Friends Page', '/friends/filter.bml', 'friends'],
                'friends' => ['Friends Tools', '/friends/', 'manage'],

Modified: trunk/htdocs/multisearch.bml
===================================================================
--- trunk/htdocs/multisearch.bml	2012-09-28 12:56:39 UTC (rev 23010)
+++ trunk/htdocs/multisearch.bml	2012-09-28 13:12:05 UTC (rev 23011)
@@ -235,7 +235,7 @@
     if ($type eq "faq") {
         my $term = lc($q);
         if ($term) {
-            return BML::redirect("$LJ::SITEROOT/support/faqsearch.bml?q=" . LJ::eurl($term));
+            return BML::redirect("$LJ::SITEROOT/support/faq/search.html?q=" . LJ::eurl($term));
         } else {
             $title = $ML{'.nofaqsearch.title'};
             $body = $ad . "<?h1 $ML{'Error'} h1?><?p $ML{'.nofaqsearch.text'} p?>";

Modified: trunk/htdocs/sitemap.txt
===================================================================
--- trunk/htdocs/sitemap.txt	2012-09-28 12:56:39 UTC (rev 23010)
+++ trunk/htdocs/sitemap.txt	2012-09-28 13:12:05 UTC (rev 23011)
@@ -1126,7 +1126,7 @@
 http://www.livejournal.com/styles/index.bml
 http://www.livejournal.com/sup/sms_tos.bml
 http://www.livejournal.com/support/encodings.bml
-http://www.livejournal.com/support/faq.bml
+http://www.livejournal.com/support/faq/
 http://www.livejournal.com/support/faq/cat/about.html
 http://www.livejournal.com/support/faq/cat/abuse.html
 http://www.livejournal.com/support/faq/cat/accounts.html

Modified: trunk/htdocs/support/index.bml
===================================================================
--- trunk/htdocs/support/index.bml	2012-09-28 12:56:39 UTC (rev 23010)
+++ trunk/htdocs/support/index.bml	2012-09-28 13:12:05 UTC (rev 23011)
@@ -41,7 +41,7 @@
     $ret .= "<?p $ML{'.faq.text'} p?>";
 
     $ret .= "<div align='center'>";
-    $ret .= "<form method='GET' action='$LJ::SITEROOT/support/faqsearch.bml'>";
+    $ret .= "<form method='GET' action='$LJ::SITEROOT/support/faq/search.html'>";
     $ret .= "<input type='text' name='q' size='30' />&nbsp;<input type='submit' value='$ML{'.faq.search.btn'}'>";
     $ret .= "</form>";
     $ret .= "</div>";
@@ -74,7 +74,7 @@
     }
     $ret .= "</ul>\n";
 
-    $ret .= "<p align='right'>&raquo; <a href='$LJ::SITEROOT/support/faq.bml'>$ML{'.faq.all'}</a></p>";
+    $ret .= "<p align='right'>&raquo; <a href='$LJ::SITEROOT/support/faq/'>$ML{'.faq.all'}</a></p>";
     $ret .= "</div>";
 
     $ret .= "</div>";

Modified: trunk/htdocs/support/see_request.bml
===================================================================
--- trunk/htdocs/support/see_request.bml	2012-09-28 12:56:39 UTC (rev 23010)
+++ trunk/htdocs/support/see_request.bml	2012-09-28 13:12:05 UTC (rev 23011)
@@ -803,7 +803,7 @@
     {
         my $dbr = LJ::get_db_reader();
         # FAQ reference
-        $ret .= "<tr valign='middle'><td align='right'>$ML{'.reference'} <a href='faq.bml'>$ML{'.faq'}</a>:</td><td colspan='2'>\n";
+        $ret .= "<tr valign='middle'><td align='right'>$ML{'.reference'} <a href='$LJ::SITEROOT/support/faq/'>$ML{'.faq'}</a>:</td><td colspan='2'>\n";
 
         my %faqcat;
         my %faqq;
@@ -838,7 +838,7 @@
         $ret .= LJ::html_select({ 'name' => 'faqid', 'onchange' => 'updateFaqLink()' }, @faqlist) . "\n";
         $ret .= qq(<script language="JavaScript"><!--
             if (document.getElementById)
-                document.write("<a href='faq.bml' id='faqlink'>View FAQ</a>");
+                document.write("<a href='$LJ::SITEROOT/support/faq/' id='faqlink'>View FAQ</a>");
         //--></script>);
         $ret .= "</td></tr>\n";
     }