[dw-free] Clean up /openid/approve.bml

[afuna]

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

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

Clean up /openid/approve.bml

Patch by rho.

Files modified:

• htdocs/openid/approve.bml
• htdocs/openid/approve.bml.text

--------------------------------------------------------------------------------
diff -r fadb53f23f67 -r a4548d5361dc htdocs/openid/approve.bml
--- a/htdocs/openid/approve.bml	Sun Apr 05 08:20:52 2009 +0000
+++ b/htdocs/openid/approve.bml	Sun Apr 05 10:08:34 2009 +0000
@@ -65,14 +65,15 @@
     }
 
     $title = $ML{'.form.title'};
-    $body = $ML{'.form.header1'};
+    $body = "<?p " . BML::ml( ".form.request", { sitename => $LJ::SITENAMESHORT } ) . " p?>";
+    $body .= "<?p " . $ML{'.form.address'} . " p?>";
     $body .= "<form method='post'>";
     $body .= LJ::form_auth();
     my $dis_site = LJ::ehtml($site);
     $dis_site =~ s!\*\.!<span style='color: red'><i>&lt;anything&gt;</i></span>.!;
 
     $body .= "<div style='overflow: auto; background: #DDD; word-wrap: break-word; color: black; border: 2px solid black; padding: 0.5em; font-size: 13pt'><tt>$dis_site</tt></div>";
-    $body .= $ML{'.form.header2'};
+    $body .= "<?p " . $ML{'.form.passid'} . " p?>";
     $body .= "<table align='center'><tr><td><input type='submit' name='yes:once' value='".$ML{'.form.button.yes_this_time'}."' /> ";
     $body .= "<input type='submit' name='yes:always' value='".$ML{'.form.button.yes_always'}."' /> ";
     $body .= "<input type='submit' name='no' value='".$ML{'.form.button.no'}."' /></td></tr></table>";
diff -r fadb53f23f67 -r a4548d5361dc htdocs/openid/approve.bml.text
--- a/htdocs/openid/approve.bml.text	Sun Apr 05 08:20:52 2009 +0000
+++ b/htdocs/openid/approve.bml.text	Sun Apr 05 10:08:34 2009 +0000
@@ -1,30 +1,31 @@
 ;; -*- coding: utf-8 -*-
 
-.error.openid_support_disabled=OpenID consumer support is disabled
+.error.cannot_provide_identity=The site you just came from seems to want to verify <a href='[[url]]'>an identity</a> that you, as [[user]], cannot provide.
+
+.error.failed_sign_url=Failed to make signed return URL.
+
+.error.failed_to_save=Failed to save
+
+.error.invalid_site_address=Invalid site address
 
 .error.login_needed=You need to be logged in to grant another site permission to know your identity.
 
 .error.need_to_login=You Need to Login
 
-.error.cannot_provide_identity=The site you just came from seems to want to verify <a href='[[url]]'>an identity</a> that you, as [[user]], cannot provide.
-
-.error.invalid_site_address=Invalid site address
+.error.openid_support_disabled=OpenID consumer support is disabled
 
 .error.possible_form_tampering=Possible form tampering detected.
 
-.error.failed_to_save=Failed to save
+.form.address=The address wanting permission is:
 
-.error.failed_sign_url=Failed to make signed return URL.
+.form.button.no=No.
 
-.form.title=Grant identity validation?
-
-.form.header1=<?h1 Identity Validation h1?><?p Another site on the web wants to validate your LiveJournal identity.  No information will be shared with them that isn't already public in your profile, only that you're who you've already told them you are (if you told them). p?><?p The address wanting permission is: p?>
-
-.form.header2=<?p Do you want to pass your identity to them? p?>
+.form.button.yes_always=Yes; always.
 
 .form.button.yes_this_time=Yes; just this time.
 
-.form.button.yes_always=Yes; always.
+.form.passid=Do you want to pass your identity to them?
 
-.form.button.no=No.
+.form.request=Another site on the web wants to validate your [[sitename]] identity.  No information will be shared with them that isn't already public in your profile, only that you're who you've already told them you are (if you told them).
 
+.form.title=Grant identity validation?
\ No newline at end of file
--------------------------------------------------------------------------------