MDL-45282 core_user: fixed up some oddities in the bulk user messagin…

…g screen
moodle · May 7, 2014 · f624f56 · f624f56
1 parent f8fa440
commit f624f56
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
@@ -1695,6 +1695,7 @@
 $string['sitehome'] = 'Site home';
 $string['sitelegacyfiles'] = 'Legacy site files';
 $string['sitelogs'] = 'Site logs';
+$string['sitemessage'] = 'Message users';
 $string['sitenews'] = 'Site news';
 $string['sitepages'] = 'Site pages';
 $string['sitepartlist'] = 'You do not have the required permissions to view the participants list';

diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less
@@ -180,3 +180,7 @@ table.message .searchresults td {
 #newmessageoverlay #usermessage {
     padding: 10px;
 }
+/* Widen the plain text editor on the bulk message screen */
+#page-user-action_redir #edit-messagebody {
+    width:auto;
+}
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
diff --git a/user/message.html b/user/message.html
@@ -9,8 +9,8 @@
     <td align="right"><b>
      <?php print_string("messagebody"); ?>:
      </b></td>
-    <td align="left" rowspan="2">
-    <?php print_textarea(true, 25, 65, 630, 400, "messagebody", $messagebody); ?>
+    <td align="left">
+    <?php print_textarea(true, 15, 65, 1, 1, "messagebody", $messagebody); ?>
     </td>
 </tr>
 

diff --git a/user/messageselect.php b/user/messageselect.php
@@ -105,7 +105,13 @@
     }
 }
 
-$strtitle = get_string('coursemessage');
+if ($course->id == SITEID) {
+    $strtitle = get_string('sitemessage');
+    $PAGE->set_pagelayout('admin');
+} else {
+    $strtitle = get_string('coursemessage');
+    $PAGE->set_pagelayout('incourse');
+}
 
 $link = null;
 if (has_capability('moodle/course:viewparticipants', $coursecontext) ||