fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2011-09-15 08:10 am

[dw-free] Relative urls for privacy tool

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

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

Don't hardcode http://www.dreamwidth.org into site text.

Patch by [personal profile] skakri.

Files modified:
  • htdocs/editprivacy.bml
  • htdocs/editprivacy.bml.text
--------------------------------------------------------------------------------
diff -r 5dc738ffd616 -r e72231891024 htdocs/editprivacy.bml
--- a/htdocs/editprivacy.bml	Thu Sep 15 15:52:03 2011 +0800
+++ b/htdocs/editprivacy.bml	Thu Sep 15 16:07:39 2011 +0800
@@ -87,7 +87,7 @@
     if ($mode eq "init") {
         my $ret = '';
         $ret .= LJ::bad_input(@errors) if @errors;
-        $ret .= "<?p $ML{'.intro'} p?>";
+        $ret .= "<p>" . BML::ml( '.intro2', { aopts => qq{href="$LJ::SITEROOT/accountstatus"} } ) . "</p>";
 
         $ret .= "<?p " . BML::ml('.archive',
                                 { aopts => "href='" . $u->journal_base() . "/archive/'" })
diff -r 5dc738ffd616 -r e72231891024 htdocs/editprivacy.bml.text
--- a/htdocs/editprivacy.bml.text	Thu Sep 15 15:52:03 2011 +0800
+++ b/htdocs/editprivacy.bml.text	Thu Sep 15 16:07:39 2011 +0800
@@ -5,7 +5,7 @@
 
 .button.ya.rly=Yes, Modify these Entries
 
-.intro=Change the privacy level of all entries during a specific period by choosing the start and end dates. You can also specify that only entries of a certain privacy level should be changed. <br><br><b>IMPORTANT NOTE</b>: This process can take time, up to a full day during times of heavy load -- it is <em>not</em> immediate. Do <em>not</em> rely on this tool in an emergency. If you urgently need to make your journal unavailable quickly, you should temporarily set it to <a href="http://www.dreamwidth.org/accountstatus">deleted</a>. Even then, offsite search engines may still retain cached copies.
+.intro2=Change the privacy level of all entries during a specific period by choosing the start and end dates. You can also specify that only entries of a certain privacy level should be changed. <br><br><b>IMPORTANT NOTE</b>: This process can take time, up to a full day during times of heavy load -- it is <em>not</em> immediate. Do <em>not</em> rely on this tool in an emergency. If you urgently need to make your journal unavailable quickly, you should temporarily set it to <a [[aopts]]>deleted</a>. Even then, offsite search engines may still retain cached copies.
 
 .matching=<b>[[posts]] matching [[?posts|entry has|entries have]]</b> been found.
 
--------------------------------------------------------------------------------