Less wordy default titles on group home page

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

htdocs/blocktype/recentforumposts/lang/en.utf8/blocktype.recentforumposts.php

@@ -34,5 +34,6 @@ $string['nogroupstochoosefrom'] = 'Sorry, no groups to choose from';
 $string['poststoshow'] = 'Maximum number of posts to show';
 $string['poststoshowdescription'] = 'Between 1 and 100';
 $string['recentforumpostsforgroup'] = "Recent Forum Posts for %s";
+$string['recentforumposts'] = "Recent Forum Posts";
 
 ?>

htdocs/lib/db/upgrade.php

@@ -1788,25 +1788,25 @@ function xmldb_core_upgrade($oldversion=0) {
         $blocktypes = array(
             array(
                 'blocktype' => 'groupinfo',
-                'title' => get_string('title', 'blocktype.groupinfo'),
+                'title' => '',
                 'column' => 1,
                 'config' => null,
             ),
             array(
                 'blocktype' => 'recentforumposts',
-                'title' => get_string('title', 'blocktype.recentforumposts'),
+                'title' => get_string('recentforumposts', 'blocktype.recentforumposts'),
                 'column' => 1,
                 'config' => null,
             ),
             array(
                 'blocktype' => 'groupviews',
-                'title' => get_string('title', 'blocktype.groupviews'),
+                'title' => get_string('Views', 'view'),
                 'column' => 1,
                 'config' => null,
             ),
             array(
                 'blocktype' => 'groupmembers',
-                'title' => get_string('title', 'blocktype.groupmembers'),
+                'title' => get_string('Members', 'group'),
                 'column' => 1,
                 'config' => null,
             ),

htdocs/lib/group.php

@@ -1385,31 +1385,31 @@ function install_system_grouphomepage_view() {
     $blocktypes = array(
         array(
             'blocktype' => 'groupinfo',
-            'title' => get_string('title', 'blocktype.groupinfo'),
+            'title' => '',
             'column' => 1,
             'config' => null,
         ),
         array(
             'blocktype' => 'recentforumposts',
-            'title' => get_string('title', 'blocktype.recentforumposts'),
+            'title' => get_string('recentforumposts', 'blocktype.recentforumposts'),
             'column' => 1,
             'config' => null,
         ),
         array(
             'blocktype' => 'groupviews',
-            'title' => get_string('title', 'blocktype.groupviews'),
+            'title' => get_string('Views', 'view'),
             'column' => 1,
             'config' => null,
         ),
         array(
             'blocktype' => 'groupmembers',
-            'title' => get_string('title', 'blocktype.groupmembers'),
+            'title' => get_string('Members', 'group'),
             'column' => 1,
             'config' => null,
         ),
     );
     $installed = get_column_sql('SELECT name FROM {blocktype_installed}');
-    $weights = array(1 => 0, 2 => 0);
+    $weights = array(1 => 0);
     foreach ($blocktypes as $blocktype) {
         if (in_array($blocktype['blocktype'], $installed)) {
             $weights[$blocktype['column']]++;