[dw-free] Inconsistent title/subtitle format

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/6051f7820fd2]

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

Remove duplicated titles from pages.

Patch by isabeau.

Files modified:

• htdocs/accountstatus.bml
• htdocs/community/transfer.bml
• htdocs/directorysearch.bml
• htdocs/register.bml
• htdocs/register.bml.text
• htdocs/support/faq.bml

--------------------------------------------------------------------------------
diff -r 7532a74af098 -r 6051f7820fd2 htdocs/accountstatus.bml
--- a/htdocs/accountstatus.bml	Sun Apr 05 08:06:46 2009 +0000
+++ b/htdocs/accountstatus.bml	Sun Apr 05 08:10:33 2009 +0000
@@ -146,7 +146,7 @@ body<=
     $ret .= "<form method='post' action='accountstatus.bml$getextra'>\n";
     $ret .= LJ::form_auth();
 
-    $ret .= "<?h1 $ML{'.journalstatus.head'} h1?><?p $ML{'.journalstatus.about'} p?>\n";
+    $ret .= "<?p $ML{'.journalstatus.about'} p?>\n";
 
     $ret .= LJ::run_hook("accountstatus_delete_text", $u);
 
diff -r 7532a74af098 -r 6051f7820fd2 htdocs/community/transfer.bml
--- a/htdocs/community/transfer.bml	Sun Apr 05 08:06:46 2009 +0000
+++ b/htdocs/community/transfer.bml	Sun Apr 05 08:10:33 2009 +0000
@@ -49,7 +49,7 @@
     }
 
     # setup the form to transfer the community
-    $body .= "<?h1 $ML{'.title'} h1?><?p $ML{'.body'} p?>";
+    $body .= "<?p $ML{'.body'} p?>";
     $body .= "<form method='post' action='/community/transfer.bml'>";
     $body .= LJ::form_auth();
     $body .= "<table><tr><td>$ML{'.account'}</td>";
diff -r 7532a74af098 -r 6051f7820fd2 htdocs/directorysearch.bml
--- a/htdocs/directorysearch.bml	Sun Apr 05 08:06:46 2009 +0000
+++ b/htdocs/directorysearch.bml	Sun Apr 05 08:10:33 2009 +0000
@@ -23,8 +23,6 @@ body<=
     return "";
 }
 _code?>
-
-<?h1 <?_ml .h1 _ml?> h1?>
 
 <?_code
 {
diff -r 7532a74af098 -r 6051f7820fd2 htdocs/register.bml
--- a/htdocs/register.bml	Sun Apr 05 08:06:46 2009 +0000
+++ b/htdocs/register.bml	Sun Apr 05 08:10:33 2009 +0000
@@ -149,8 +149,6 @@ body<=
      my @authas = LJ::get_authas_list($remote);
      my @list;
 
-     $ret .= "<?h1 $ML{'.ask.header'} h1?>";
-
      if (@authas > 1) {  # only display if they can auth as anyone other than themselves
          foreach (@authas) {
              my $user = LJ::load_user($_);
diff -r 7532a74af098 -r 6051f7820fd2 htdocs/register.bml.text
--- a/htdocs/register.bml.text	Sun Apr 05 08:06:46 2009 +0000
+++ b/htdocs/register.bml.text	Sun Apr 05 08:10:33 2009 +0000
@@ -2,8 +2,6 @@
 .ask.body=Validating your email address will confirm your account and allow you to use all its features. Click the button below to have a validation email sent to <b>[[email]]</b>.
 
 .ask.button=Send Validation Email
-
-.ask.header=Validate Email
 
 .ask.select=Select account
 
diff -r 7532a74af098 -r 6051f7820fd2 htdocs/support/faq.bml
--- a/htdocs/support/faq.bml	Sun Apr 05 08:06:46 2009 +0000
+++ b/htdocs/support/faq.bml	Sun Apr 05 08:10:33 2009 +0000
@@ -1,5 +1,5 @@
 <?page
-title=>FAQ
+title=><?_ml .faq.title _ml?>
 body<=
 
 <?_code
@@ -25,7 +25,6 @@ body<=
     my $ret = "";
 
     $ret .= "<div id='faq'>";
-    $ret .= "<?h1 $ML{'.faq.title'} h1?>";
     $ret .= "<?p $ML{'.faq.title.text'} p?>";
 
     # FAQ search
--------------------------------------------------------------------------------