Remove .bml from links on nonfree pages.
Patch by denise.
diffs (207 lines):
diff -r d44485483306 -r 3c252c99fc3b cgi-bin/bml/scheme/dreamwidth.look
--- a/cgi-bin/bml/scheme/dreamwidth.look Thu Aug 20 12:38:39 2009 -0500
+++ b/cgi-bin/bml/scheme/dreamwidth.look Thu Aug 20 15:06:16 2009 -0500
@@ -158,9 +158,9 @@ _code?>
<hr />
<p class="left">
- <a href="<?siteroot?>/privacy.bml">Privacy Policy</A> |
- <a href="<?siteroot?>/coppa.bml">COPPA</a> |
- <a href="<?siteroot?>/disclaimer.bml">Legal Disclaimer</a>
+ <a href="<?siteroot?>/privacy">Privacy Policy</A> |
+ <a href="<?siteroot?>/coppa">COPPA</a> |
+ <a href="<?siteroot?>/disclaimer">Legal Disclaimer</a>
</p>
<p class="right">
diff -r d44485483306 -r 3c252c99fc3b cgi-bin/bml/scheme/tropo-purple.look
--- a/cgi-bin/bml/scheme/tropo-purple.look Thu Aug 20 12:38:39 2009 -0500
+++ b/cgi-bin/bml/scheme/tropo-purple.look Thu Aug 20 15:06:16 2009 -0500
@@ -85,27 +85,27 @@ accountlinks<=
}
$ret .= "</a></div>";
$ret .= "<div id='account-links-text'>";
- $ret .= "<form action='$LJ::SITEROOT/logout.bml?ret=1' method='post'>";
+ $ret .= "<form action='$LJ::SITEROOT/logout?ret=1' method='post'>";
$ret .= $remote->ljuser_display;
$ret .= "<input type='hidden' name='user' value='" . $remote->user .
"' />";
$ret .= "<input type='hidden' name='sessid'
value='$remote->{_session}->{sessid}' />";
$ret .= " <input type='submit'
value=\"$ML{'tropo.accountlinks.btn.logout'}\" />";
$ret .= "</form>";
$ret .= "<ul>";
- $ret .= "<li><a
href='$LJ::SITEROOT/update.bml'>$ML{'tropo.accountlinks.post'}</a> •
</li>" unless $identity;
+ $ret .= "<li><a
href='$LJ::SITEROOT/update'>$ML{'tropo.accountlinks.post'}</a> • </li>"
unless $identity;
$ret .= "<li><a href='" . $remote->journal_base .
"/read'>$ML{'tropo.accountlinks.readinglist'}</a> • </li>";
$ret .= "<li><a
href='$LJ::SITEROOT/inbox/'>$ML{'tropo.accountlinks.inbox'}";
$ret .= " ($unread)" if $unread;
$ret .= "</a> • </li>";
$ret .= "<li><a
href='$LJ::SITEROOT/manage/settings/'>$ML{'tropo.accountlinks.account'}</a></li>
<br />";
- $ret .= "<li><a
href='$LJ::SITEROOT/manage/circle/invite.bml'>$ML{'tropo.accountlinks.invitefriend'}</a>
• </li>" unless $identity;
+ $ret .= "<li><a
href='$LJ::SITEROOT/manage/circle/invite'>$ML{'tropo.accountlinks.invitefriend'}</a>
• </li>" unless $identity;
$ret .= "<li><a
href='$LJ::SITEROOT/support/'>$ML{'tropo.accountlinks.help'}</a></li>";
$ret .= "</ul>";
$ret .= "</div>";
} else {
my $chal = LJ::challenge_generate(300);
- $ret .= "<form action='$LJ::SITEROOT/login.bml?ret=1' method='post'>";
+ $ret .= "<form action='$LJ::SITEROOT/login?ret=1' method='post'>";
$ret .= LJ::html_hidden( returnto => $GET{returnto} );
$ret .= "<input type='hidden' name='chal' class='lj_login_chal'
value='$chal' />\n";
$ret .= "<input type='hidden' name='response'
class='lj_login_response' value='' />\n";
@@ -125,7 +125,7 @@ accountlinks<=
id => "login_password",
size => 20,
tabindex => 2,
- }) . " <a
href='$LJ::SITEROOT/lostinfo.bml'>$ML{'tropo.accountlinks.login.forgotpassword'}</a></td></tr>";
+ }) . " <a
href='$LJ::SITEROOT/lostinfo'>$ML{'tropo.accountlinks.login.forgotpassword'}</a></td></tr>";
$ret .= "<tr><td> </td>";
$ret .= "<td class='remember-me-cell'>";
$ret .= LJ::html_check({
diff -r d44485483306 -r 3c252c99fc3b cgi-bin/bml/scheme/tropo-red.look
--- a/cgi-bin/bml/scheme/tropo-red.look Thu Aug 20 12:38:39 2009 -0500
+++ b/cgi-bin/bml/scheme/tropo-red.look Thu Aug 20 15:06:16 2009 -0500
@@ -85,27 +85,27 @@ accountlinks<=
}
$ret .= "</a></div>";
$ret .= "<div id='account-links-text'>";
- $ret .= "<form action='$LJ::SITEROOT/logout.bml?ret=1' method='post'>";
+ $ret .= "<form action='$LJ::SITEROOT/logout?ret=1' method='post'>";
$ret .= $remote->ljuser_display;
$ret .= "<input type='hidden' name='user' value='" . $remote->user .
"' />";
$ret .= "<input type='hidden' name='sessid'
value='$remote->{_session}->{sessid}' />";
$ret .= " <input type='submit'
value=\"$ML{'tropo.accountlinks.btn.logout'}\" />";
$ret .= "</form>";
$ret .= "<ul>";
- $ret .= "<li><a
href='$LJ::SITEROOT/update.bml'>$ML{'tropo.accountlinks.post'}</a> •
</li>" unless $identity;
+ $ret .= "<li><a
href='$LJ::SITEROOT/update'>$ML{'tropo.accountlinks.post'}</a> • </li>"
unless $identity;
$ret .= "<li><a href='" . $remote->journal_base .
"/read'>$ML{'tropo.accountlinks.readinglist'}</a> • </li>";
$ret .= "<li><a
href='$LJ::SITEROOT/inbox/'>$ML{'tropo.accountlinks.inbox'}";
$ret .= " ($unread)" if $unread;
$ret .= "</a> • </li>";
$ret .= "<li><a
href='$LJ::SITEROOT/manage/settings/'>$ML{'tropo.accountlinks.account'}</a></li>
<br />";
- $ret .= "<li><a
href='$LJ::SITEROOT/manage/circle/invite.bml'>$ML{'tropo.accountlinks.invitefriend'}</a>
• </li>" unless $identity;
+ $ret .= "<li><a
href='$LJ::SITEROOT/manage/circle/invite'>$ML{'tropo.accountlinks.invitefriend'}</a>
• </li>" unless $identity;
$ret .= "<li><a
href='$LJ::SITEROOT/support/'>$ML{'tropo.accountlinks.help'}</a></li>";
$ret .= "</ul>";
$ret .= "</div>";
} else {
my $chal = LJ::challenge_generate(300);
- $ret .= "<form action='$LJ::SITEROOT/login.bml?ret=1' method='post'>";
+ $ret .= "<form action='$LJ::SITEROOT/login?ret=1' method='post'>";
$ret .= LJ::html_hidden( returnto => $GET{returnto} );
$ret .= "<input type='hidden' name='chal' class='lj_login_chal'
value='$chal' />\n";
$ret .= "<input type='hidden' name='response'
class='lj_login_response' value='' />\n";
@@ -125,7 +125,7 @@ accountlinks<=
id => "login_password",
size => 20,
tabindex => 2,
- }) . " <a
href='$LJ::SITEROOT/lostinfo.bml'>$ML{'tropo.accountlinks.login.forgotpassword'}</a></td></tr>";
+ }) . " <a
href='$LJ::SITEROOT/lostinfo'>$ML{'tropo.accountlinks.login.forgotpassword'}</a></td></tr>";
$ret .= "<tr><td> </td>";
$ret .= "<td class='remember-me-cell'>";
$ret .= LJ::html_check({
diff -r d44485483306 -r 3c252c99fc3b htdocs/legal/dmca.bml
--- a/htdocs/legal/dmca.bml Thu Aug 20 12:38:39 2009 -0500
+++ b/htdocs/legal/dmca.bml Thu Aug 20 15:06:16 2009 -0500
@@ -30,7 +30,7 @@ body<=
<p>We believe that the DMCA takedown process is a powerful tool that can help
copyright holders protect their intellectual property from being exploited. We
also believe that the DMCA takedown process is a powerful tool that is
frequently misused to force a chilling effect on legitimate and legal speech.
Our enforcement policy is an attempt to prevent the worst abuses of this
process that we've seen over the years, while still upholding our legal
obligations and protecting copyright holders from the misuse of their
intellectual property.</p>
-<p>This is a complicated process, and the law surrounding it is unclear in
many situations. We've tried to make this as readable as possible. If you have
any questions that aren't covered here, please <a
href='http://www.dreamwidth.org/support/submit.bml'>contact us</a> with your
questions.</p>
+<p>This is a complicated process, and the law surrounding it is unclear in
many situations. We've tried to make this as readable as possible. If you have
any questions that aren't covered here, please <a
href='http://www.dreamwidth.org/support/submit'>contact us</a> with your
questions.</p>
<p>None of this material should be construed as legal advice. We cannot advise
you on how to protect your rights online, either your rights as a copyright
holder or your rights as someone accused of copyright infringement. If you are
in need of legal advice, contact a lawyer who is licensed to practice in your
jurisdiction.</p>
diff -r d44485483306 -r 3c252c99fc3b htdocs/legal/principles.bml
--- a/htdocs/legal/principles.bml Thu Aug 20 12:38:39 2009 -0500
+++ b/htdocs/legal/principles.bml Thu Aug 20 15:06:16 2009 -0500
@@ -81,7 +81,7 @@ expression, we will tell you why, and wo
<li><strong>Respect</strong>: We believe in the inherent dignity of all human
beings. We will never discriminate against any group of people. We will
work hard to maintain inclusive attitudes, use inclusive language, and
-promote inclusiveness at all times. Our <a
href="$LJ::SITEROOT/legal/diversity.bml">Diversity
+promote inclusiveness at all times. Our <a
href="$LJ::SITEROOT/legal/diversity">Diversity
Statement</a> isn't just there so we can pat ourselves on the back. It's there
because
we believe that our diversity is our greatest strength.</li></ul>
@@ -100,7 +100,7 @@ with other sites in order to add feature
with other sites in order to add features that we don't have the resources for
ourselves.
If we do this, we will clearly indicate any such features, and we will include
information in our
-<a href="$LJ::SITEROOT/legal/privacy.bml">Privacy Policy</a>.</p>
+<a href="$LJ::SITEROOT/legal/privacy">Privacy Policy</a>.</p>
PAGE
diff -r d44485483306 -r 3c252c99fc3b htdocs/site/brand.bml
--- a/htdocs/site/brand.bml Thu Aug 20 12:38:39 2009 -0500
+++ b/htdocs/site/brand.bml Thu Aug 20 15:06:16 2009 -0500
@@ -27,7 +27,7 @@ body<=
<p>In order to protect our users from confusion and to protect our identity
and reputation, we have set forth guidelines for using our name and our logos.
This applies to anyone who would like to run a production site using any of the
code developed or maintained by Dreamwidth Studios, LLC, as well as to anyone
who would like to write a client or tool that interfaces with Dreamwidth
code.</p>
-<p>These are basic guidelines. If you have a question that isn't covered here,
please <a href='http://www.dreamwidth.org/support/submit.bml'>contact us</a>
with details about your planned use. We are happy to answer any questions you
might have, and we are more than willing to grant express written permission
for the use of any of our service marks in most cases as long as we feel
there's no chance of causing confusion among our users.</p>
+<p>These are basic guidelines. If you have a question that isn't covered here,
please <a href='http://www.dreamwidth.org/support/submit'>contact us</a> with
details about your planned use. We are happy to answer any questions you might
have, and we are more than willing to grant express written permission for the
use of any of our service marks in most cases as long as we feel there's no
chance of causing confusion among our users.</p>
<p>In all cases, the guiding principle in any use of our brand and/or service
marks should be to avoid any possibility for reasonable confusion. An average
person should never be able to accidentally mistake your use of our brand
and/or mark as an official or sponsored use.</p>
@@ -63,7 +63,7 @@ body<=
<li>The site name is only capitalized at the beginning: <em>Dreamwidth</em>,
not <em>DreamWidth</em>.</li>
<li>You <b>may not</b> use the site name in merchandise, including but not
limited to t-shirts, stickers, mugs, or jewelry, without our express written
permission.</li>
<li>You <b>may not</b> use the site name in any way that indicates or implies
our sponsorship, endorsement, or approval, without our express written
permission.</li>
- <li>You <b>may not</b> use the site name in conjunction with any content that
is explicit, hateful, discriminatory, exclusionary, or that violates our <a
href='http://www.dreamwidth.org/legal/principles.bml'>Guiding
Principles</a>.</li>
+ <li>You <b>may not</b> use the site name in conjunction with any content that
is explicit, hateful, discriminatory, exclusionary, or that violates our <a
href='http://www.dreamwidth.org/legal/principles'>Guiding Principles</a>.</li>
</ul><br />
<h2>Site Logo</h2><br />
@@ -73,20 +73,20 @@ body<=
<li>You <b>may not</b> use any of these trademarks in merchandise, including
but not limited to t-shirts, stickers, mugs, or jewelry, without our express
written permission.</li>
<li>You <b>may not</b> use any of these trademarks in any way that indicates
or implies our sponsorship, endorsement, or approval, without our express
written permission.</li>
<li>You <b>may not</b> use any of our trademarks in banners, icons, and
graphics if doing so would cause a reasonable person to mistake your use as
speaking for or representing Dreamwidth Studios, LLC. (For instance, in an icon
captioned 'Dreamwidth Staff'.)</li>
- <li>You <b>may not</b> use our trademarks in conjunction with any content
that is explicit, hateful, discriminatory, exclusionary, or that violates our
<a href='http://www.dreamwidth.org/legal/principles.bml'>Guiding
Principles</a>.</li>
+ <li>You <b>may not</b> use our trademarks in conjunction with any content
that is explicit, hateful, discriminatory, exclusionary, or that violates our
<a href='http://www.dreamwidth.org/legal/principles'>Guiding
Principles</a>.</li>
</ul><br />
<h2>Site Design</h2><br />
<ul><li>The default site design visible on www.dreamwidth.org, known as
'Tropospherical Red', is our default visual identity. Because of this, and
because of the potential for confusion, you should refrain from using these
design elements in these colors for your client's website, without our express
written permission.</li>
<li>The client homepage -- whether the tool itself is web-based or the page
is hosting a downloadable application -- must clearly indicate that the client
is not created by, affiliated with, or sponsored by Dreamwidth Studios,
LLC.</li>
<li>The client homepage should include your name and contact information in a
prominent place, and indicate that people should contact you and not Dreamwidth
Studios, LLC with questions about your client.</li>
- <li>The client homepage should not contain any content that is explicit,
hateful, discriminatory, exclusionary, or that violates our <a
href='http://www.dreamwidth.org/legal/principles.bml'>Guiding
Principles</a>.</li>
+ <li>The client homepage should not contain any content that is explicit,
hateful, discriminatory, exclusionary, or that violates our <a
href='http://www.dreamwidth.org/legal/principles'>Guiding Principles</a>.</li>
</ul><br />
<h2>Source Code</h2><br />
<ul><li>The <a href='http://hg.dwscoalition.org/'>source code</a> for
Dreamwidth Studios is based on code developed and maintained by
LiveJournal.com. Code in the dw-free repository authored by LiveJournal is
released under the GNU General Public License. Code in the dw-free repository
authored by Dreamwidth Studios, LLC is dual-released under the GPL and Artistic
Licenses.</li>
<li>Code in the dw-nonfree repository is source-available but not Open
Source. You may not use code from the dw-nonfree repository to run a production
site. You may only use code from the dw-nonfree repository in a development
environment for the purposes of improving the source code. If your development
environment is publicly web-accessible, you may only use code from the
dw-nonfree repository with our express written permission.</li>
- <li>If you are running a production site based on the Dreamwidth code, please
let us know! We would like to add a link to your site to our <a
href='http://www.dreamwidth.org/site/opensource.bml'>Open Source</a> page.</li>
+ <li>If you are running a production site based on the Dreamwidth code, please
let us know! We would like to add a link to your site to our <a
href='http://www.dreamwidth.org/site/opensource'>Open Source</a> page.</li>
</ul><br />
diff -r d44485483306 -r 3c252c99fc3b htdocs/site/policy.bml
--- a/htdocs/site/policy.bml Thu Aug 20 12:38:39 2009 -0500
+++ b/htdocs/site/policy.bml Thu Aug 20 15:06:16 2009 -0500
@@ -29,17 +29,17 @@ body<=
<p>We believe in providing our users with the maximum amount of free
expression as permitted by United States law, with the exceptions of actions we
choose to take to protect the health of the service (such as by removing spam)
and actions we choose to take to safeguard the privacy and safety of others.</p>
-<p>We know that any conflict between two people has the potential to become
heated, and that once a conflict becomes heated, it is often very difficult for
us to determine what the best and most ethical course of action should be. We
are committed to upholding our <a
href='http://www.dreamwidth.org/legal/principles.bml'>Guiding Principles</a>,
and we will work with you to determine the best course of action in any given
situation.</p>
+<p>We know that any conflict between two people has the potential to become
heated, and that once a conflict becomes heated, it is often very difficult for
us to determine what the best and most ethical course of action should be. We
are committed to upholding our <a
href='http://www.dreamwidth.org/legal/principles'>Guiding Principles</a>, and
we will work with you to determine the best course of action in any given
situation.</p>
<p>We will provide as much information about our policies and their
enforcement as we can while still respecting the privacy of our users. While
this means that we will never release details about a specific conflict without
the express permission of all parties involved, we are always willing to answer
general questions about our policies.</p>
-<dl><dt><a href='http://www.dreamwidth.org/legal/tos.bml'>Terms of
Service</a></dt>
+<dl><dt><a href='http://www.dreamwidth.org/legal/tos'>Terms of Service</a></dt>
<dd>The Terms of Service governing all usage of the site.</dd></dl>
-<dl><dt><a href='http://www.dreamwidth.org/legal/privacy.bml'>Privacy
Policy</a></dt>
+<dl><dt><a href='http://www.dreamwidth.org/legal/privacy'>Privacy
Policy</a></dt>
<dd>Our Privacy Policy, which explains how we use any information you provide
us.</dd></dl>
-<dl><dt><a
href='http://www.dreamwidth.org/support/faqbrowse.bml?faqid=80'>Reporting a
Terms of Service Violation</a></dt>
+<dl><dt><a
href='http://www.dreamwidth.org/support/faqbrowse?faqid=80'>Reporting a Terms
of Service Violation</a></dt>
<dd>How to report a violation of our Terms of Service agreement, or seek
clarification on any of our policies.</dd></dl>
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
