mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-03-04 07:56 am

[dw-free] Remove FAQ id numbers from user-facing text

[commit: http://hg.dwscoalition.org/dw-free/rev/2620ad1e9a33]

http://bugs.dwscoalition.org/show_bug.cgi?id=377

Remove FAQ IDs from pages.

Patch by [personal profile] phoenix.

Files modified:
  • htdocs/support/faqbrowse.bml
  • htdocs/support/faqbrowse.bml.text
--------------------------------------------------------------------------------
diff -r fefa0f878db4 -r 2620ad1e9a33 htdocs/support/faqbrowse.bml
--- a/htdocs/support/faqbrowse.bml	Wed Mar 04 07:48:22 2009 +0000
+++ b/htdocs/support/faqbrowse.bml	Wed Mar 04 07:56:12 2009 +0000
@@ -56,8 +56,8 @@ body<=
     my $dbr = LJ::get_db_reader();
     if ($faqidarg) {
         # loading single faqid
-        $$title = BML::ml('.title_num', { 'num' => $faqidarg });
         @faqs = (LJ::Faq->load($faqidarg, lang => $lang));
+        $$title = $faqs[0]->question_html;
 
     } elsif ($faqcatarg) {
         # loading entire faqcat
@@ -148,12 +148,12 @@ body<=
         }
 
         # display output
-        $$body .= "<?h1";
         if ($faqcatarg) {
+            $$body .= "<?h1";
             $$body .= " <a style='text-decoration: none;' " .
                       "href='faqbrowse.bml?faqid=$faqid'>&#x00bb;</a>";
+            $$body .= " $question h1?>";
         }
-        $$body .= " $question h1?>";
         $$body .= "<div style='margin-left: 20px;'>";
 
         $$body .= "<div name='summary' id='summary'>$summary</div>";
diff -r fefa0f878db4 -r 2620ad1e9a33 htdocs/support/faqbrowse.bml.text
--- a/htdocs/support/faqbrowse.bml.text	Wed Mar 04 07:48:22 2009 +0000
+++ b/htdocs/support/faqbrowse.bml.text	Wed Mar 04 07:56:12 2009 +0000
@@ -23,7 +23,5 @@
 
 .title_cat=FAQ - [[catname]]
 
-.title_num=FAQ Question #[[num]]
-
 .translate.faq=Translate this FAQ
 
--------------------------------------------------------------------------------