Tweaks for future use; no visible changes other than a shorter state
text field.
Patch by kareila.
diffs (86 lines):
diff -r ab810a5a8e81 -r 6422ea172118 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat Wed Aug 26 17:19:11 2009 +0000
+++ b/bin/upgrading/en.dat Wed Aug 26 17:56:05 2009 +0000
@@ -2949,11 +2949,11 @@ settings.state.us=US States
settings.usermessaging.error.invalid=Invalid Option
-settings.usermessaging.helper=Only registered [[sitename]] users can send you
messages. You also have options to receive messages only from users on your
friends list.
-
-settings.usermessaging.opt.f=Friends Only
-
-settings.usermessaging.opt.m=Only Mutual Friends
+settings.usermessaging.helper=Only registered [[sitename]] users can send you
messages. You also have options to receive messages only from users on your
access list.
+
+settings.usermessaging.opt.f=Access Only
+
+settings.usermessaging.opt.m=Only Mutual Access
settings.usermessaging.opt.n=Nobody
diff -r ab810a5a8e81 -r 6422ea172118 cgi-bin/LJ/Setting/FindByEmail.pm
--- a/cgi-bin/LJ/Setting/FindByEmail.pm Wed Aug 26 17:19:11 2009 +0000
+++ b/cgi-bin/LJ/Setting/FindByEmail.pm Wed Aug 26 17:56:05 2009 +0000
@@ -21,14 +21,15 @@ sub as_html {
$ret .= "<label for='${key}opt_findbyemail'>" .
$class->ml('settings.findbyemail.question',
- { sitename => $LJ::SITENAMESHORT }) . "</label>";
+ { sitename => $LJ::SITENAMESHORT }) . "</label>"
+ unless $args && $args->{minimal_display};
# Display learn more link?
$ret .= " (<a href='" . $LJ::HELPURL{$class->helpurl($u)} .
"'>" . $class->ml('settings.settingprod.learn') . "</a>)<br />"
if ($faq && $LJ::HELPURL{$class->helpurl($u)});
- $ret .= "<br />";
+ $ret .= "<br />" unless $args && $args->{minimal_display};
my @options;
push @options, { text => $class->ml('settings.option.select'), value => ''
}
unless $u->opt_findbyemail;
@@ -46,7 +47,7 @@ sub as_html {
$class->ml('settings.findbyemail.helper', {
sitename => $LJ::SITENAMESHORT,
siteabbrev => $LJ::SITENAMEABBREV }) .
- "</div>" if ($helper);
+ "</div>" if $helper;
$ret .= $class->errdiv($errs, "opt_findbyemail");
diff -r ab810a5a8e81 -r 6422ea172118 cgi-bin/LJ/Setting/UserMessaging.pm
--- a/cgi-bin/LJ/Setting/UserMessaging.pm Wed Aug 26 17:19:11 2009 +0000
+++ b/cgi-bin/LJ/Setting/UserMessaging.pm Wed Aug 26 17:56:05 2009 +0000
@@ -9,8 +9,10 @@ sub as_html {
my ($class, $u, $errs, $args) = @_;
my $key = $class->pkgkey;
my $ret;
+ my $helper = ( $args && $args->{helper} == 0 ) ? 0 : 1;
- $ret .= "<label for='${key}opt_usermsg'>" .
$class->ml('settings.usermessaging.question') . "</label>";
+ $ret .= "<label for='${key}opt_usermsg'>" .
$class->ml('settings.usermessaging.question') . "</label>"
+ unless $args && $args->{minimal_display};
$ret .= LJ::html_select({ 'name' => "${key}opt_usermsg",
'id' => "${key}opt_usermsg",
'class' => "select",
@@ -26,7 +28,7 @@ sub as_html {
$ret .= "<div class='helper'>" .
$class->ml('settings.usermessaging.helper', {
sitename => $LJ::SITENAMESHORT }) .
- "</div>";
+ "</div>" if $helper;
$ret .= $class->errdiv($errs, "opt_usermsg");
return $ret;
diff -r ab810a5a8e81 -r 6422ea172118 cgi-bin/LJ/Widget/Location.pm
--- a/cgi-bin/LJ/Widget/Location.pm Wed Aug 26 17:19:11 2009 +0000
+++ b/cgi-bin/LJ/Widget/Location.pm Wed Aug 26 17:56:05 2009 +0000
@@ -102,7 +102,7 @@ sub render_body {
$ret .= $class->html_text('id' => 'written_state',
'name' => 'stateother',
'value' => $state_val,
- 'size' => '20',
+ 'size' => '12',
'style' => 'display:' . ($regions_cfg ? 'none' :
'inline') . ";$state_inline_color",
'maxlength' => '50',
%minimal_display_state_attrs,
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
