--- loncom/interface/lonpreferences.pm	2015/01/19 15:36:01	1.215
+++ loncom/interface/lonpreferences.pm	2016/01/27 00:24:09	1.217
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.215 2015/01/19 15:36:01 goltermann Exp $
+# $Id: lonpreferences.pm,v 1.217 2016/01/27 00:24:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1262,6 +1262,12 @@ sub passwordchanger {
         $r->print(Apache::loncommon::start_page('Personal Data'));
         $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
     }
+    my ($blocked,$blocktext) =
+        &Apache::loncommon::blocking_status('passwd');
+    if ($blocked) {
+        $r->print('<p class="LC_warning">'.$blocktext.'</p>');
+        return;
+    }
     if ((!defined($caller)) || ($caller eq 'preferences')) {
         $user = $env{'user.name'};
         $domain = $env{'user.domain'};
@@ -1490,6 +1496,12 @@ sub server_form {
 sub verify_and_change_password {
     my ($r,$caller,$mailtoken) = @_;
     my ($user,$domain,$homeserver);
+    my ($blocked,$blocktext) =
+        &Apache::loncommon::blocking_status('passwd');
+    if ($blocked) {
+        $r->print('<p class="LC_warning">'.$blocktext.'</p>');
+        return;
+    }
     if ($caller eq 'reset_by_email') {
         $user       = $env{'form.uname'};
         $domain     = $env{'form.udom'};
@@ -1892,8 +1904,8 @@ sub author_space_settings {
             if ($env{'environment.nocodemirror'}) {
                $constchecked=' checked="checked"';
             }
-            my $text=&mt('By default, Codemirror is activated for authors.');
-            my $cmoff=&mt('Deactivate Codemirror. This can improve the performance on slow computers.');
+            my $text=&mt('By default, CodeMirror an editor with advanced functionality for editing code is activated for authors.');
+            my $cmoff=&mt('Deactivate CodeMirror. This can improve performance on slow computers and accessibility.');
             my $change=&mt('Save');
             $r->print(<<ENDSCREEN);
         <form name="prefs" action="/adm/preferences" method="post">
@@ -1922,7 +1934,7 @@ sub change_authoring_settings {
             } else {
                 $status=&mt('off');
             }
-            my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Deactivate Codemirror in Authoring Space').'</i>','<tt>'.$status.'</tt>'));
+            my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Deactivate CodeMirror in Authoring Space').'</i>','<tt>'.$status.'</tt>'));
             $message=&Apache::loncommon::confirmwrapper($message);
             &print_main_menu($r,$message);
     }