[livejournal] r17303: LJSUP-6729

U   trunk/htdocs/manage/profile/index.bml
U   trunk/htdocs/manage/settings/index.bml
U   trunk/htdocs/manage/sms/index.bml

Modified: trunk/htdocs/manage/profile/index.bml
===================================================================
--- trunk/htdocs/manage/profile/index.bml	2010-09-08 02:58:57 UTC (rev 17302)
+++ trunk/htdocs/manage/profile/index.bml	2010-09-08 04:38:55 UTC (rev 17303)
@@ -501,32 +501,12 @@
             foreach (values %$tminfo) { LJ::text_out(\$_); }
             $tminfo->{'security'} = "N" if ($u->{'txtmsg_status'} eq 'off' || $u->{'txtmsg_status'} eq 'none');
 
-            $ret .= "<span id='phone_view_options' class='view_options'>$ML{'.fn.txtmsg'}&nbsp;";
-            $ret .= LJ::html_select({ 'name' => 'txtmsg_security', 'selected' => $tminfo->{'security'} },
-                                      "all" => BML::ml(".security.visibility.everybody"),
-                                      "reg" => BML::ml(".security.visibility.regusers"),
-                                      "friends" => BML::ml(".security.visibility.friends"),
-                                      "N"   => BML::ml(".security.visibility.nobody") );
-            $ret .= "</span></div>\n";
+            $ret .= "</div>\n";
 
             $ret .= "<table class='field_block' id='phone_verification'>\n";
 
             foreach (values %$tminfo) { LJ::text_out(\$_); }
 
-            $ret .= "<tr><td class='field_name'>$ML{'.fn.servprov'}</td><td>";
-            {
-                my @opts = ("", "");
-                foreach my $p (LJ::TextMessage::providers()) {
-                    my $info = LJ::TextMessage::provider_info($p);
-                    push @opts, ($p, $info->{'name'});
-                }
-
-                $ret .= LJ::html_select({ 'name' => 'txtmsg_provider',
-                                          'selected' => $tminfo->{'provider'}, },
-                                          @opts);
-            }
-
-            $ret .= " <span>" . BML::ml('.txt.details', {'aopts' => "href='$LJ::SITEROOT/tools/textmessage.bml?mode=details'"}) . "</span></td></tr>\n";
             $ret .= "<tr><td class='field_name'>$ML{'.fn.txtnum'}</td><td>";
             $ret .= '<ul class="b-manage-smsn b-manage-smsn-hide">';
             $ret .= '<li class="b-manage-smsn-sms">' . LJ::html_text({ 'name' => 'txtmsg_number', 'value' => $tminfo->{'number'}, 'size' => '15', 'maxlength' => '15' }) . '<br /><span class="helper">' . $ML{'.section.textmsg.example'} . '</span></li>';

Modified: trunk/htdocs/manage/settings/index.bml
===================================================================
--- trunk/htdocs/manage/settings/index.bml	2010-09-08 02:58:57 UTC (rev 17302)
+++ trunk/htdocs/manage/settings/index.bml	2010-09-08 04:38:55 UTC (rev 17303)
@@ -89,7 +89,6 @@
             sort_weight => 40,
             settings => [qw(
                 LJ::Setting::VoicePosting
-                LJ::Setting::SMS
                 LJ::Setting::EmailPosting
                 LJ::Setting::Display::MobileApps
             )],

Modified: trunk/htdocs/manage/sms/index.bml
===================================================================
--- trunk/htdocs/manage/sms/index.bml	2010-09-08 02:58:57 UTC (rev 17302)
+++ trunk/htdocs/manage/sms/index.bml	2010-09-08 04:38:55 UTC (rev 17303)
@@ -168,7 +168,8 @@
     my $fgroup = LJ::html_select({name => 'fgroup', selected => $u->prop('sms_friend_group') || $POST{fgroup}},
                                 ('', '(All Friends)'), map { $_, $_ } map { $_->{groupname} } @fgroups);
 
-    my $body = '';
+    my $body = 'Service is currently unavailable';
+    return $body;
 
     my $carrier_html = $carrier || '';