[dw-free] remove LJ::server_down_html
[commit: http://hg.dwscoalition.org/dw-free/rev/98e530f23e6f]
http://bugs.dwscoalition.org/show_bug.cgi?id=3970
Remove trailing whitespace.
Patch by
kareila.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=3970
Remove trailing whitespace.
Patch by
Files modified:
- htdocs/community/pending.bml
- htdocs/manage/invites.bml
- htdocs/manage/profile/index.bml
- htdocs/update.bml
--------------------------------------------------------------------------------
diff -r dfdb5048760f -r 98e530f23e6f htdocs/community/pending.bml
--- a/htdocs/community/pending.bml Sun Oct 02 20:11:49 2011 -0500
+++ b/htdocs/community/pending.bml Sun Oct 02 20:34:03 2011 -0500
@@ -50,7 +50,7 @@
# is $remote an admin?
unless ( $remote->can_manage_other( $c ) ) {
$ret .= "<?h1 $ML{'Error'} h1?><?p ";
- $ret .= BML::ml('.error.noaccess',
+ $ret .= BML::ml('.error.noaccess',
{ comm => LJ::ljuser($cname, { type => 'C' }) });
$ret .= " p?>";
return $ret;
@@ -76,7 +76,7 @@
# need a db handle now
my $dbh = LJ::get_db_writer();
-
+
# hit up each user to find out what to do with them
my ($added, $rejected, $ignored, $previous, $banned, $ban_skipped);
foreach my $id (@userids) {
@@ -169,21 +169,21 @@
# table headers
$ret .= "<br /><div align='center'><table class='userslist-table' cellspacing='0' cellpadding='2'>\n<thead><tr><th>";
- $ret .= LJ::html_check({ id => 'all', name => 'all', checked => 'checked',
+ $ret .= LJ::html_check({ id => 'all', name => 'all', checked => 'checked',
onchange =>
"var inputs = document.pending_member_form.getElementsByTagName('input');
for (var i = 0; i < inputs.length; i++) {
if (inputs[i].type == 'checkbox' && inputs[i].getAttribute('id') !== 'all') {
inputs[i].checked = this.checked;
}
- }",
+ }",
onclick =>
"var inputs = document.pending_member_form.getElementsByTagName('input');
for (var i = 0; i < inputs.length; i++) {
if (inputs[i].type == 'checkbox' && inputs[i].getAttribute('id') !== 'all') {
inputs[i].checked = this.checked;
}
- }",
+ }",
selected => 0 });
$ret .= "</th><th>$ML{'/community/members.bml.key.user'}</th></tr></thead>\n";
@@ -192,7 +192,7 @@
foreach (@users) {
my $rstyle = ($rc++ & 1) ? 'even' : 'odd';
$ret .= "<tr class='$rstyle'><td>";
- $ret .= LJ::html_check({ id => 'pending_' . $_->userid, name => 'pending_' . $_->userid,
+ $ret .= LJ::html_check({ id => 'pending_' . $_->userid, name => 'pending_' . $_->userid,
selected => $jumpto ? ($_->user eq $jumpto ? 1 : 0) : 1 });
$ret .= "</td><td>" . LJ::ljuser($_->{user}) . "</td></tr>\n";
}
diff -r dfdb5048760f -r 98e530f23e6f htdocs/manage/invites.bml
--- a/htdocs/manage/invites.bml Sun Oct 02 20:11:49 2011 -0500
+++ b/htdocs/manage/invites.bml Sun Oct 02 20:34:03 2011 -0500
@@ -30,11 +30,11 @@
unless $remote;
LJ::need_res('stc/invites.css');
-
+
# for now, assume we're operating on $remote. maybe in the future we'll be able to
# manage other P type accounts, but we can't yet
my $u = $remote;
-
+
return $LJ::MSG_READONLY_USER
if $u->is_readonly;
@@ -60,7 +60,7 @@
if (LJ::did_post()) {
return "<?h1 $ML{'Error'} h1?><?p $ML{'error.invalidform'} p?>"
unless LJ::check_form_auth();
-
+
my (@accepted, @rejected, @undecided);
foreach my $invite (@$pending) {
my ($commid, $maintid, $date, $argline) = @$invite;
@@ -106,10 +106,10 @@
$ret .= "<li>" . LJ::ljuser($us->{$_}, { type => 'C' }) . "</li>\n" foreach @undecided;
$ret .= "</ul>";
}
-
+
return $ret;
}
-
+
# prepare table
$ret .= "<form method='post'>\n<div align='center'><table id='invites-list' cellspacing='0' cellpadding='0'>";
$ret .= LJ::form_auth();
@@ -132,7 +132,7 @@
}
my $ename = LJ::ehtml($cu->{name});
my $date = LJ::mysql_time($invite->[2]);
-
+
# now generate HTML
$ret .= "<tr class='$rstyle'><td class='invite-info'>" . LJ::ljuser($cu, { type => 'C' }) . " <br />$ename<br /><span class='invite-from'>";
$ret .= BML::ml('.fromline', { user => LJ::ljuser($us->{$invite->[1]}, { type => 'P' }), date => $date });
@@ -149,7 +149,7 @@
$ret .= "</table><br />";
$ret .= "<div class='action-box'><ul class='nostyle inner'><li>" . LJ::html_submit('submit', $ML{'.submit'}) . "</li></ul></div><div class='clear-floats'></div>";
$ret .= "</div></form>";
-
+
return $ret;
} _code?>
diff -r dfdb5048760f -r 98e530f23e6f htdocs/manage/profile/index.bml
--- a/htdocs/manage/profile/index.bml Sun Oct 02 20:11:49 2011 -0500
+++ b/htdocs/manage/profile/index.bml Sun Oct 02 20:34:03 2011 -0500
@@ -412,7 +412,7 @@
$ret .= "</td></tr>\n";
}
-
+
if ( $u->is_person ) {
# chat thingies
diff -r dfdb5048760f -r 98e530f23e6f htdocs/update.bml
--- a/htdocs/update.bml Sun Oct 02 20:11:49 2011 -0500
+++ b/htdocs/update.bml Sun Oct 02 20:34:03 2011 -0500
@@ -146,7 +146,7 @@
my $errors;
my $showform = $POST{'showform'} || $auth_missing; # show entry form
my $preview = $POST{'action:preview'};
-
+
# are we spellchecking before we post?
my $did_spellcheck; my $spellcheck_html;
if ($LJ::SPELLER && $POST{'action:spellcheck'}) {
@@ -179,12 +179,12 @@
$auth .= "<div id='altlogin_wrapper' style='display: $altlogin_display;'>";
$auth .= "<p class='pkg'>\n";
$auth .= "<label for='altlogin_username' class='left'>$ML{'.username'}</label>\n";
- $auth .= LJ::html_text({ 'name' => 'user', 'id' => 'altlogin_username', 'class' => 'text', 'size' => '15',
+ $auth .= LJ::html_text({ 'name' => 'user', 'id' => 'altlogin_username', 'class' => 'text', 'size' => '15',
'maxlength' => '25', 'tabindex' => '5', 'value' => $POST{'user'} || $GET{'user'} }) . "\n";
$auth .= "</p>\n";
$auth .= "<p class='pkg'>\n";
$auth .= "<label for='altlogin_password' class='left'>$ML{'.password'}</label>\n";
- $auth .= LJ::html_text({ 'type' => 'password', 'id' => 'altlogin_password', 'class' => 'text',
+ $auth .= LJ::html_text({ 'type' => 'password', 'id' => 'altlogin_password', 'class' => 'text',
'name' => 'password', 'tabindex' => '6', 'size' => '15', 'maxlength' => '30' }) . "\n";
# posted with a user, but no password
if ($did_post && $auth_missing) {
@@ -223,7 +223,7 @@
'include_insert_object' => $GET{'insobj'},
'altlogin' => $GET{altlogin} ? 1 : 0,
'prop_opt_preformatted' => $opt_preformatted ? 1 : 0,
-
+
%xpost_vals,
};
@@ -233,7 +233,7 @@
$entry->{prop_opt_default_screening} = $remote->prop('opt_whoscreened');
$entry->{prop_last_fm_user} = $remote->prop('last_fm_user');
}
-
+
if ($did_post) {
$entry->{$_} = $POST{$_} foreach keys %POST;
@@ -424,7 +424,7 @@
} else {
$ju = $remote; # posting as remote
};
-
+
if ( $ju->is_community ) { # changes the update message if journal is from a community
$updatemessage = '.update.success2.community';
}
@@ -550,7 +550,7 @@
# a frozen Storable string, which we then thaw into a hash by the same
# name.
$draft = LJ::ejs_string($remote->prop('entry_draft'));
- %draft_properties = $remote->prop( 'draft_properties' ) ?
+ %draft_properties = $remote->prop( 'draft_properties' ) ?
%{ Storable::thaw( $remote->prop( 'draft_properties' ) ) } : ();
# store raw for later use; will be escaped later
@@ -565,7 +565,7 @@
# not enough to just escape the draft_subject, we want to escape the entire thing, just in case the translation text
# for.draft.confirm2 contains JS-breaking characters such as apostrophes
- my $eMLconfirm = LJ::ejs_string( BML::ml( '.draft.confirm2',
+ my $eMLconfirm = LJ::ejs_string( BML::ml( '.draft.confirm2',
{ subjectline => "\"$draft_subject_raw\"" } ) );
# Setup draft saving and try to restore from a draft
@@ -592,7 +592,7 @@
$ret .= qq^
<script type="text/javascript">
//<