improved documentation for wiki types

diff --git a/lang/en/help/wiki/wikitype.html b/lang/en/help/wiki/wikitype.html
index 7c624bfd57cd30e39b727693ad4cb7bde9f7cc76..e0e676ab21eb5421b215acd9f4fe3f2f667766f3 100644 (file)
--- a/lang/en/help/wiki/wikitype.html
+++ b/lang/en/help/wiki/wikitype.html
@@ -1,13 +1,9 @@
-<P ALIGN=CENTER><B>Allow students to contribute to the wiki</B></P>
+<P ALIGN=CENTER><B>Wiki types</B></P>
 <P>
-<UL>
-  <li>A teacher can always edit every wiki in his course</li>
-  <li>There are three wiki -types: Teacher, Course/Group, Student</li>
-  <li>The Activity has the Moodle-Group states: &quot;No Groups&quot; &quot;Separate Groups&quot; and &quot;Visible Groups&quot;</li>
-  <li>The same initial Content is filled in for all groups</li>
-</UL>
+There are three wiki types: Teacher, Groups, Student. In addition,
+like any activity, the wiki has the Moodle group modes: &quot;No Groups&quot; &quot;Separate Groups&quot; and &quot;Visible Groups&quot;. 
 
-There is now a matrice:
+This leads to the following matrix of nine possibilities:
 <table border="1" width="100%"><tbody>
   <tr>
     <th valign="top" width="25%"></th>
@@ -17,23 +13,28 @@ There is now a matrice:
   </tr>
   <tr>
     <th valign="top" width="25%">Teacher</th>
-    <td valign="top" width="25%">Teacher creates and changes the wiki. Students can read the contents.</td>
-    <td valign="top" width="25%">There is a wiki  for every group which just the teacher can change. Every student just sees the wiki of his group.</td>
-    <td valign="top" width="25%">There is a Wik for every group which just the teacher can change. The students can see all wikis, choseable by a Drop-Down box which contains all groups.</td>
+    <td valign="top" width="25%">There is only one wiki which only the teacher can edit. Students can view the contents.</td>
+    <td valign="top" width="25%">There is one wiki for every group which just the teacher can edit. Students can view the wiki of their group only.</td>
+    <td valign="top" width="25%">There is one wiki for every group which just the teacher can edit. Students can view the wikis for all groups.</td>
   </tr>
   <tr>
-    <th valign="top" width="25%">Course/Group</th>
-    <td valign="top" width="25%">Teacher and user can create and change the wiki.</td>
-    <td valign="top" width="25%">Students can change and see the wiki of their own group.</td>
-    <td valign="top" width="25%">Students can change the wiki of their own group. They can see all wikis, choseable by a Drop-Down box which contains all groups.</td>
+    <th valign="top" width="25%">Groups</th>
+    <td valign="top" width="25%">There is only one wiki. The teacher and all students can view and edit this wiki.</td>
+    <td valign="top" width="25%">There is one wiki per group. Students can view and edit the wiki of their own group only.</td>
+    <td valign="top" width="25%">There is one wiki per group. Students can change the wiki of their own group only. They can view the wikis for all groups.</td>
   </tr>
   <tr>
     <th valign="top" width="25%">Student</th>
-    <td valign="top" width="25%">Every student sees and can change his own wiki.</td>
-    <td valign="top" width="25%">Every student can change his own wiki, and sees all other wikis of the students in his group, choseable by a Drop-Down box which contains all students of his group.</td>
-    <td valign="top" width="25%">Every student can change his own wiki, and sees all other wikis, choseable by a Drop-Down box which contains all students.</td>
+    <td valign="top" width="25%">Every student has their own wiki which only they and their teacher can view and edit.</td>
+    <td valign="top" width="25%">Every student has their own wiki, which only they and their teacher can edit. Students can view the wikis of other students in their group.</td>
+    <td valign="top" width="25%">Every student has their own wiki, which only they and their teacher can edit. Students can view the wikis of all other students in the course.</td>
   </tr></tbody>
 </table>
 
+Unless the group mode has been forced by the course settings, it can be set with the groups icons on the course home page after the wiki has been created.
+
+<UL>
+  <li>A teacher can always edit every wiki in the course</li>
+</UL>
 </P>
 

diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index 0c00bca7272fbd2f2b37614ebf1e61c4fe65d57e..083818ab71ec354afda09a7998b418b561ff93e4 100644 (file)
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -6,9 +6,9 @@
 
 $wiki_CONSTANT = 7;     /// for example
 $site = get_site();
-$WIKI_TYPES = array ('teacher' =>   $site->teacher,
+$WIKI_TYPES = array ('teacher' =>   get_string('defaultcourseteacher'),
                      'group' =>     get_string('groups',"wiki"),
-                     'student' =>   $site->student );
+                     'student' =>   get_string('defaultcoursestudent') );
 define("EWIKI_ESCAPE_AT", 0);       # For the algebraic filter
 
 function wiki_add_instance($wiki) {