From 67b5883e7bbeaaa6fd902e3e9809b03aedc3bac2 Mon Sep 17 00:00:00 2001
From: David Mudrak <david.mudrak@gmail.com>
Date: Mon, 16 Aug 2010 14:32:00 +0000
Subject: [PATCH] MDL-21695 Notes help files migrated to the help string

AMOS BEGIN
 HLP notes/status.html,[publishstate_help,core_notes]
AMOS END
---
 lang/en/help/notes/status.html |  8 --------
 lang/en/notes.php              |  2 +-
 notes/edit_form.php            | 10 ++++------
 3 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100755 lang/en/help/notes/status.html

diff --git a/lang/en/help/notes/status.html b/lang/en/help/notes/status.html
deleted file mode 100755
index 4044cf3949a..00000000000
--- a/lang/en/help/notes/status.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<h1>Status</h1>
-
-<p>There are 3 possible settings here</p>
-<ul>
-<li><strong>Personal</strong> - The note will be visible only to you</li>
-<li><strong>Course</strong> - The note will be visible to teachers in this course</li>
-<li><strong>Site</strong> - The note will be visible to teachers in all courses</li>
-</ul>
\ No newline at end of file
diff --git a/lang/en/notes.php b/lang/en/notes.php
index 2a194ce43d0..f8520faf9c5 100755
--- a/lang/en/notes.php
+++ b/lang/en/notes.php
@@ -49,7 +49,7 @@ $string['nouser'] = 'You must select a user';
 $string['personal'] = 'personal';
 $string['personalnotes'] = 'Personal notes';
 $string['publishstate'] = 'Context';
-$string['publishstate_help'] = 'A note\'s context determines who can see the note. 
+$string['publishstate_help'] = 'A note\'s context determines who can see the note.
 
 * Personal - The note will be visible only to you
 * Course - The note will be visible to teachers in this course
diff --git a/notes/edit_form.php b/notes/edit_form.php
index 8230b422927..979b432f99b 100644
--- a/notes/edit_form.php
+++ b/notes/edit_form.php
@@ -9,19 +9,17 @@ require_once($CFG->libdir.'/formslib.php');
 class note_edit_form extends moodleform {
 
     function definition() {
-        $mform    =& $this->_form;
-        $strcontent = get_string('content', 'notes');
-        $strpublishstate = get_string('publishstate', 'notes');
+        $mform =& $this->_form;
         $mform->addElement('header', 'general', get_string('note', 'notes'));
 
-        $mform->addElement('textarea', 'content', $strcontent, array('rows'=>15, 'cols'=>40));
+        $mform->addElement('textarea', 'content', get_string('content', 'notes'), array('rows'=>15, 'cols'=>40));
         $mform->setType('content', PARAM_RAW);
         $mform->addRule('content', get_string('nocontent', 'notes'), 'required', null, 'client');
 
-        $mform->addElement('select', 'publishstate', $strpublishstate, note_get_state_names());
+        $mform->addElement('select', 'publishstate', get_string('publishstate', 'notes'), note_get_state_names());
         $mform->setDefault('publishstate', NOTES_STATE_PUBLIC);
         $mform->setType('publishstate', PARAM_ALPHA);
-        $mform->setHelpButton('publishstate', array('status', $strpublishstate, 'notes'));
+        $mform->addHelpButton('publishstate', 'publishstate', 'notes');
 
         $this->add_action_buttons();