From 285f82504645c67dc21dcdecc57c380698e5fbe9 Mon Sep 17 00:00:00 2001 From: Chris Scribner Date: Fri, 26 Aug 2011 17:06:32 -0400 Subject: [PATCH] Adjusting layout of editor pages & starting changes of blti properties --- mod/blti/db/install.xml | 61 +++++++------- mod/blti/edit_form.php | 109 +++++++------------------ mod/blti/lang/en/blti.php | 40 +++++++--- mod/blti/lib.php | 59 ++++++-------- mod/blti/locallib.php | 13 +++ mod/blti/mod_form.php | 157 ++++++++++++------------------------- mod/blti/styles.css | 3 + mod/blti/typessettings.php | 27 +++---- 8 files changed, 191 insertions(+), 278 deletions(-) diff --git a/mod/blti/db/install.xml b/mod/blti/db/install.xml index c9d1023daf8..a0a84d83efa 100644 --- a/mod/blti/db/install.xml +++ b/mod/blti/db/install.xml @@ -1,5 +1,5 @@ - @@ -9,31 +9,23 @@ - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -42,17 +34,24 @@ - - - + + + + + + + + - + + +
@@ -62,9 +61,11 @@ - + + +
- + \ No newline at end of file diff --git a/mod/blti/edit_form.php b/mod/blti/edit_form.php index b13f2599145..55e07873612 100644 --- a/mod/blti/edit_form.php +++ b/mod/blti/edit_form.php @@ -57,8 +57,8 @@ class mod_blti_edit_types_form extends moodleform{ //------------------------------------------------------------------------------- // Add basiclti elements - $mform->addElement('header', 'setup', get_string('modstandardels', 'form')); - + $mform->addElement('header', 'setup', get_string('tool_settings', 'blti')); + $mform->addElement('text', 'lti_typename', get_string('typename', 'blti')); $mform->setType('lti_typename', PARAM_INT); // $mform->addHelpButton('lti_typename', 'typename','blti'); @@ -78,96 +78,66 @@ class mod_blti_edit_types_form extends moodleform{ $mform->addElement('passwordunmask', 'lti_password', get_string('password', 'blti')); $mform->setType('lti_password', PARAM_TEXT); -//------------------------------------------------------------------------------- - // Add size parameters - $mform->addElement('header', 'size', get_string('size', 'blti')); - - $mform->addElement('text', 'lti_preferheight', get_string('preferheight', 'blti')); - $mform->setType('lti_preferheight', PARAM_INT); -// $mform->addHelpButton('lti_preferheight', 'preferheight', 'blti'); - - -//------------------------------------------------------------------------------- + $mform->addElement('textarea', 'lti_customparameters', get_string('custom', 'blti'), array('rows'=>4, 'cols'=>60)); + $mform->setType('lti_customparameters', PARAM_TEXT); + + $mform->addElement('checkbox', 'lti_coursevisible', ' ', ' ' . get_string('show_in_course', 'blti')); + // Add privacy preferences fieldset where users choose whether to send their data $mform->addElement('header', 'privacy', get_string('privacy', 'blti')); $options=array(); $options[0] = get_string('never', 'blti'); $options[1] = get_string('always', 'blti'); - $options[2] = get_string('delegate', 'blti'); - - $defaults=array(); - $defaults[0] = get_string('donot', 'blti'); - $defaults[1] = get_string('send', 'blti'); + $options[2] = get_string('delegate_yes', 'blti'); + $options[3] = get_string('delegate_no', 'blti'); $mform->addElement('select', 'lti_sendname', get_string('sendname', 'blti'), $options); - $mform->setDefault('lti_sendname', '0'); + $mform->setDefault('lti_sendname', '2'); // $mform->addHelpButton('lti_sendname', 'sendname', 'blti'); - $mform->addElement('select', 'lti_instructorchoicesendname', get_string('setdefault', 'blti'), $defaults); - $mform->setDefault('lti_instructorchoicesendname', '0'); - $mform->disabledIf('lti_instructorchoicesendname', 'lti_sendname', 'neq', 2); - $mform->addElement('select', 'lti_sendemailaddr', get_string('sendemailaddr', 'blti'), $options); - $mform->setDefault('lti_sendemailaddr', '0'); + $mform->setDefault('lti_sendemailaddr', '2'); // $mform->addHelpButton('lti_sendemailaddr', 'sendemailaddr', 'blti'); - $mform->addElement('select', 'lti_instructorchoicesendemailaddr', get_string('setdefault', 'blti'), $defaults); - $mform->setDefault('lti_instructorchoicesendemailaddr', '0'); - $mform->disabledIf('lti_instructorchoicesendemailaddr', 'lti_sendemailaddr', 'neq', 2); - //------------------------------------------------------------------------------- // BLTI Extensions - $mform->addElement('header', 'extensions', get_string('extensions', 'blti')); - - $defaults_accept=array(); - $defaults_accept[0] = get_string('donotaccept', 'blti'); - $defaults_accept[1] = get_string('accept', 'blti'); - - $defaults_allow=array(); - $defaults_allow[0] = get_string('donotallow', 'blti'); - $defaults_allow[1] = get_string('allow', 'blti'); // Add grading preferences fieldset where the tool is allowed to return grades $mform->addElement('select', 'lti_acceptgrades', get_string('acceptgrades', 'blti'), $options); - $mform->setDefault('lti_acceptgrades', '0'); + $mform->setDefault('lti_acceptgrades', '2'); // $mform->addHelpButton('lti_acceptgrades', 'acceptgrades', 'blti'); - $mform->addElement('select', 'lti_instructorchoiceacceptgrades', get_string('setdefault', 'blti'), $defaults_accept); - $mform->setDefault('lti_instructorchoiceacceptgrades', '0'); - $mform->disabledIf('lti_instructorchoiceacceptgrades', 'lti_acceptgrades', 'neq', 2); - // Add grading preferences fieldset where the tool is allowed to retrieve rosters $mform->addElement('select', 'lti_allowroster', get_string('allowroster', 'blti'), $options); - $mform->setDefault('lti_allowroster', '0'); + $mform->setDefault('lti_allowroster', '2'); // $mform->addHelpButton('lti_allowroster', 'allowroster', 'blti'); - $mform->addElement('select', 'lti_instructorchoiceallowroster', get_string('setdefault', 'blti'), $defaults_allow); - $mform->setDefault('lti_instructorchoiceallowroster', '0'); - $mform->disabledIf('lti_instructorchoiceallowroster', 'lti_allowroster', 'neq', 2); - + /* // Add grading preferences fieldset where the tool is allowed to update settings $mform->addElement('select', 'lti_allowsetting', get_string('allowsetting', 'blti'), $options); $mform->setDefault('lti_allowsetting', '0'); // $mform->addHelpButton('lti_allowsetting', 'allowsetting', 'blti'); - - $mform->addElement('select', 'lti_instructorchoiceallowsetting', get_string('setdefault', 'blti'), $defaults_allow); - $mform->setDefault('lti_instructorchoiceallowsetting', '0'); - $mform->disabledIf('lti_instructorchoiceallowsetting', 'lti_allowsetting', 'neq', 2); + */ //------------------------------------------------------------------------------- - // Add custom parameters fieldset - $mform->addElement('header', 'custom', get_string('custom', 'blti')); + // Add launch parameters fieldset + $mform->addElement('header', 'launchoptions', get_string('launchoptions', 'blti')); - $mform->addElement('textarea', 'lti_customparameters', '', array('rows'=>15, 'cols'=>60)); - $mform->setType('lti_customparameters', PARAM_TEXT); + $launchoptions=array(); + $launchoptions[0] = get_string('embed', 'blti'); + $launchoptions[1] = get_string('embed_no_blocks', 'blti'); + $launchoptions[2] = get_string('popup_window', 'blti'); + $launchoptions[3] = get_string('new_window', 'blti'); - $mform->addElement('select', 'lti_allowinstructorcustom', get_string('allowinstructorcustom', 'blti'), $defaults_allow); - $mform->setDefault('lti_allowinstructorcustom', '0'); + $mform->addElement('select', 'lti_launchinpopup', get_string('launchinpopup', 'blti'), $launchoptions); + $mform->setDefault('lti_launchinpopup', '0'); +// $mform->addHelpButton('lti_launchinpopup', 'launchinpopup', 'blti'); + //------------------------------------------------------------------------------- // Add setup parameters fieldset - $mform->addElement('header', 'setupoptions', get_string('setupoptions', 'blti')); + $mform->addElement('header', 'setupoptions', get_string('miscellaneous', 'blti')); // Adding option to change id that is placed in context_id $idoptions = array(); @@ -176,18 +146,7 @@ class mod_blti_edit_types_form extends moodleform{ $mform->addElement('select', 'lti_moodle_course_field', get_string('moodle_course_field', 'blti'), $idoptions); $mform->setDefault('lti_moodle_course_field', '0'); - - // Added option to allow user to specify if this is a resource or activity type - $classoptions = array(); - $classoptions[0] = get_string('activity', 'blti'); - $classoptions[1] = get_string('resource', 'blti'); - - $mform->addElement('select', 'lti_module_class_type', get_string('module_class_type', 'blti'), $classoptions); - $mform->setDefault('lti_module_class_type', '0'); - -//------------------------------------------------------------------------------- - // Add organization parameters fieldset - $mform->addElement('header', 'organization', get_string('organization', 'blti')); + $mform->addElement('text', 'lti_organizationid', get_string('organizationid', 'blti')); $mform->setType('lti_organizationid', PARAM_TEXT); @@ -203,18 +162,6 @@ class mod_blti_edit_types_form extends moodleform{ $mform->addHelpButton('lti_organizationdescr', 'organizationdescr', 'blti'); */ -//------------------------------------------------------------------------------- - // Add launch parameters fieldset - $mform->addElement('header', 'launchoptions', get_string('launchoptions', 'blti')); - - $launchoptions=array(); - $launchoptions[0] = get_string('launch_in_moodle', 'blti'); - $launchoptions[1] = get_string('launch_in_popup', 'blti'); - - $mform->addElement('select', 'lti_launchinpopup', get_string('launchinpopup', 'blti'), $launchoptions); - $mform->setDefault('lti_launchinpopup', '0'); -// $mform->addHelpButton('lti_launchinpopup', 'launchinpopup', 'blti'); - //------------------------------------------------------------------------------- // Add a hidden element to signal a tool fixing operation after a problematic backup - restore process $mform->addElement('hidden', 'lti_fix'); diff --git a/mod/blti/lang/en/blti.php b/mod/blti/lang/en/blti.php index 62d95d44bbd..b13eeb7c591 100644 --- a/mod/blti/lang/en/blti.php +++ b/mod/blti/lang/en/blti.php @@ -53,7 +53,7 @@ $string['addserver'] = 'Add new trusted server'; $string['addtype'] = 'Create a new Basic LTI activity'; $string['allow'] = 'Allow'; $string['allowinstructorcustom'] = 'Allow instructors to add custom parameters'; -$string['allowroster'] = 'Allow tool access to course roster'; +$string['allowroster'] = 'Tool may access course roster'; $string['allowsetting'] = 'Allow tool to store 8K of settings in Moodle'; $string['always'] = 'Always'; $string['blti'] = 'Basic LTI'; @@ -109,13 +109,13 @@ $string['imsrolelearner'] = 'Learner'; $string['invalidid'] = 'basic LTI ID was incorrect'; $string['launch_in_moodle'] = 'Launch tool in moodle'; $string['launch_in_popup'] = 'Launch tool in a pop-up'; -$string['launchinpopup'] = 'Popup Option'; +$string['launchinpopup'] = 'Launch Container'; $string['launchoptions'] = 'Launch Options'; $string['lti_errormsg'] = 'The tool returned the following error message: \"$a\"'; $string['misconfiguredtools'] = 'Misconfigured tool instances were detected'; $string['missingparameterserror'] = 'The page is misconfigured: \"$a\"'; $string['module_class_type'] = 'Moodle module type'; -$string['modulename'] = 'Basic LTI'; +$string['modulename'] = 'External Tool'; $string['modulenameplural'] = 'basicltis'; $string['modulenamepluralformatted'] = 'Basic LTI Instances'; $string['moodle_course_field'] = 'Course identification field'; @@ -130,7 +130,7 @@ $string['organizationdescr'] ='Organization Description'; $string['organizationid'] ='Organization ID'; $string['organizationurl'] ='Organization URL'; $string['pagesize'] = 'Submissions shown per page'; -$string['password'] = 'Remote Tool Password'; +$string['password'] = 'Shared Secret'; $string['pluginadministration'] = 'Basic LTI administration'; $string['pluginname'] = 'BLTI'; $string['preferheight'] = 'Preferred Height'; @@ -142,12 +142,12 @@ $string['quickgrade'] = 'Allow quick grading'; $string['quickgrade_help'] = 'If enabled, multiple tools can be graded on one page. Add grades and comments then click the "Save all my feedback" button to save all changes for that page.'; $string['redirect'] = 'You will be redirected in few seconds. If you are not, press the button.'; $string['resource'] = 'Resource'; -$string['resourcekey'] = 'Resource Key'; +$string['resourcekey'] = 'Consumer Key'; $string['resourceurl'] = 'Resource URL'; $string['saveallfeedback'] = 'Save all my feedback'; $string['send'] = 'Send'; -$string['sendemailaddr'] = 'Send user email address to the external tool'; -$string['sendname'] = 'Send user name and surname to the external tool'; +$string['sendemailaddr'] = 'Share launcher\'s email with tool'; +$string['sendname'] = 'Share launcher\'s name with tool'; $string['setdefault'] = 'Set a default value for the professor if delegating'; $string['setupbox'] = 'Basic LTI Tool Setup Box'; $string['setupoptions'] = 'Setup Options'; @@ -155,9 +155,31 @@ $string['size'] = 'Size parameters'; $string['submission'] = 'Submission'; $string['toggle_debug_data'] = 'Toggle Debug Data'; $string['toolsetup'] = 'Basic LTI Tool Setup'; -$string['toolurl'] = 'Remote Tool URL'; -$string['typename'] = 'Remote Tool Name'; +$string['toolurl'] = 'Tool Base URL'; +$string['typename'] = 'Tool Name'; $string['types'] = 'Types'; $string['validurl'] = 'A valid URL must start with http(s)://'; $string['viewsubmissions'] = 'View submissions and grading screen'; +//New admin strings + +$string['show_in_course'] = 'Show tool type when creating tool instances'; +$string['delegate_yes'] = 'Delegate to Instructor (Default: Yes)'; +$string['delegate_no'] = 'Delegate to Instructor (Default: No)'; +$string['tool_settings'] = 'Tool Settings'; +$string['miscellaneous'] = 'Miscellaneous'; +$string['embed'] = 'Embed'; +$string['embed_no_blocks'] = 'Embed, without blocks'; +$string['popup_window'] = 'Popup window'; +$string['new_window'] = 'New browser window / tab'; + +//New instructor strings +$string['display_name'] = 'Display activity name when launched'; +$string['display_description'] = 'Display activity description when launched'; +$string['external_tool_type'] = 'External tool type'; +$string['launch_url'] = 'Launch URL'; +$string['share_name'] = 'Share launcher\'s name with the tool'; +$string['share_email'] = 'Share launcher\'s email with the tool'; +$string['accept_grades'] = 'Accept grades from the tool'; +$string['share_roster'] = 'Allow the tool to access this course\'s roster'; +$string['automatic'] = 'Automatic, based on Launch URL'; \ No newline at end of file diff --git a/mod/blti/lib.php b/mod/blti/lib.php index e0888ef63f9..2c13f93a652 100644 --- a/mod/blti/lib.php +++ b/mod/blti/lib.php @@ -79,18 +79,19 @@ function blti_supports($feature) { * @param object $instance An object from the form in mod.html * @return int The id of the newly inserted basiclti record **/ -function blti_add_instance($basiclti) { +function blti_add_instance($formdata) { global $DB; - $basiclti->timecreated = time(); - $basiclti->timemodified = $basiclti->timecreated; - $basiclti->placementsecret = uniqid('', true); - $basiclti->timeplacementsecret = time(); + $formdata->timecreated = time(); + $formdata->timemodified = $formdata->timecreated; + //$basiclti->placementsecret = uniqid('', true); + //$basiclti->timeplacementsecret = time(); - $id = $DB->insert_record("blti", $basiclti); + $id = $DB->insert_record("blti", $formdata); - $basiclti = $DB->get_record('blti', array('id'=>$id)); - - if ($basiclti->instructorchoiceacceptgrades == 1) { + if ($formdata->instructorchoiceacceptgrades == 1) { + $basiclti = $DB->get_record('blti', array('id'=>$id)); + $basiclti->cmidnumber = $formdata->cmidnumber; + blti_grade_item_update($basiclti); } @@ -105,26 +106,22 @@ function blti_add_instance($basiclti) { * @param object $instance An object from the form in mod.html * @return boolean Success/Fail **/ -function blti_update_instance($basiclti) { +function blti_update_instance($formdata) { global $DB; - $basiclti->timemodified = time(); - $basiclti->id = $basiclti->instance; + $formdata->timemodified = time(); + $formdata->id = $formdata->instance; - $basicltirec = $DB->get_record("blti", array("id" => $basiclti->id)); - $basiclti->grade = $basicltirec->grade; - - if (empty($basiclti->preferwidget)) { - $basiclti->preferwidget = 0; - } - - if ($basiclti->instructorchoiceacceptgrades == 1) { - blti_grade_item_update($basiclti); + if ($formdata->instructorchoiceacceptgrades == 1) { + $basicltirec = $DB->get_record("blti", array("id" => $formdata->id)); + $basicltirec->cmidnumber = $formdata->cmidnumber; + + blti_grade_item_update($basicltirec); } else { - blti_grade_item_delete($basiclti); + blti_grade_item_delete($formdata); } - return $DB->update_record("blti", $basiclti); + return $DB->update_record("blti", $formdata); } /** @@ -312,7 +309,7 @@ function blti_get_blti_types() { * * @return array of basicLTI types */ -function blti_get_types() { +/*function blti_get_types() { $types = array(); $basicltitypes = blti_get_blti_types(); @@ -336,7 +333,7 @@ function blti_get_types() { } return $types; -} +}*/ ////////////////////////////////////////////////////////////////////////////////////// /// Any other basiclti functions go here. Each of them must have a name that @@ -964,10 +961,6 @@ function blti_grade_item_update($basiclti, $grades=null) { global $CFG; require_once($CFG->libdir.'/gradelib.php'); - if (!isset($basiclti->courseid)) { - $basiclti->courseid = $basiclti->course; - } - $params = array('itemname'=>$basiclti->name, 'idnumber'=>$basiclti->cmidnumber); if ($basiclti->grade > 0) { @@ -988,7 +981,7 @@ function blti_grade_item_update($basiclti, $grades=null) { $grades = null; } - return grade_update('mod/blti', $basiclti->courseid, 'mod', 'blti', $basiclti->id, 0, $grades, $params); + return grade_update('mod/blti', $basiclti->course, 'mod', 'blti', $basiclti->id, 0, $grades, $params); } /** @@ -1001,10 +994,6 @@ function blti_grade_item_delete($basiclti) { global $CFG; require_once($CFG->libdir.'/gradelib.php'); - if (!isset($basiclti->courseid)) { - $basiclti->courseid = $basiclti->course; - } - - return grade_update('mod/blti', $basiclti->courseid, 'mod', 'blti', $basiclti->id, 0, null, array('deleted'=>1)); + return grade_update('mod/blti', $basiclti->course, 'mod', 'blti', $basiclti->id, 0, null, array('deleted'=>1)); } diff --git a/mod/blti/locallib.php b/mod/blti/locallib.php index 2310b0a4ce8..1885cb169ed 100644 --- a/mod/blti/locallib.php +++ b/mod/blti/locallib.php @@ -321,6 +321,19 @@ function blti_filter_get_types() { return $DB->get_records('blti_types'); } +function blti_get_types_for_add_instance(){ + $admintypes = blti_filter_get_types(); + + $types = array(); + $types[0] = get_string('automatic', 'blti'); + + foreach($admintypes as $type) { + $types[$type->id] = $type->name; + } + + return $types; +} + /** * Prints the various configured tool types * diff --git a/mod/blti/mod_form.php b/mod/blti/mod_form.php index 9eceb6ac89e..670f4216424 100644 --- a/mod/blti/mod_form.php +++ b/mod/blti/mod_form.php @@ -87,113 +87,65 @@ class mod_blti_mod_form extends moodleform_mod { $mform->setType('name', PARAM_TEXT); $mform->addRule('name', null, 'required', null, 'client'); /// Adding the optional "intro" and "introformat" pair of fields - $this->add_intro_editor(true, get_string('basicltiintro', 'blti')); + $this->add_intro_editor(false, get_string('basicltiintro', 'blti')); + $mform->setAdvanced('introeditor'); + $mform->addElement('checkbox', 'showtitle', ' ', ' ' . get_string('display_name', 'blti')); + $mform->setAdvanced('showtitle'); + + $mform->addElement('checkbox', 'showdescription', ' ', ' ' . get_string('display_description', 'blti')); + $mform->setAdvanced('showdescription'); + + //Tool settings + $mform->addElement('select', 'typeid', get_string('external_tool_type', 'blti'), blti_get_types_for_add_instance()); + //$mform->setDefault('typeid', '0'); + + $mform->addElement('text', 'toolurl', get_string('launch_url', 'blti'), array('size'=>'64')); + $mform->setType('toolurl', PARAM_TEXT); + + $mform->addElement('text', 'resourcekey', get_string('resourcekey', 'blti')); + $mform->setType('resourcekey', PARAM_TEXT); + $mform->setAdvanced('resourcekey'); + + $mform->addElement('passwordunmask', 'password', get_string('password', 'blti')); + $mform->setType('password', PARAM_TEXT); + $mform->setAdvanced('password'); + + $mform->addElement('textarea', 'instructorcustomparameters', get_string('custom', 'blti'), array('rows'=>4, 'cols'=>60)); + $mform->setType('instructorcustomparameters', PARAM_TEXT); + $mform->setAdvanced('instructorcustomparameters'); + //------------------------------------------------------------------------------- - $mform->addElement('hidden', 'typeid', $this->typeid); - $mform->addElement('hidden', 'toolurl', $this->typeconfig['toolurl']); + //$mform->addElement('hidden', 'typeid', $this->typeid); + //$mform->addElement('hidden', 'toolurl', $this->typeconfig['toolurl']); $mform->addElement('hidden', 'type', $typename); //------------------------------------------------------------------------------- // Add privacy preferences fieldset where users choose whether to send their data $mform->addElement('header', 'privacy', get_string('privacy', 'blti')); - $privacyoptions=array(); - $privacyoptions[0] = get_string('donot', 'blti'); - $privacyoptions[1] = get_string('send', 'blti'); - - $mform->addElement('select', 'instructorchoicesendname', get_string('sendname', 'blti'), $privacyoptions); - - if (isset($this->typeconfig['instructorchoicesendname'])) { - if ($this->typeconfig['instructorchoicesendname'] == 0) { - $mform->setDefault('instructorchoicesendname', '0'); - } else if ($this->typeconfig['instructorchoicesendname'] == 1) { - $mform->setDefault('instructorchoicesendname', '1'); - } - } -// $mform->addHelpButton('instructorchoicesendname', 'sendname', 'blti'); - - $mform->addElement('select', 'instructorchoicesendemailaddr', get_string('sendemailaddr', 'blti'), $privacyoptions); - - if (isset($this->typeconfig['instructorchoicesendemailaddr'])) { - if ($this->typeconfig['instructorchoicesendemailaddr'] == 0) { - $mform->setDefault('instructorchoicesendemailaddr', '0'); - } else if ($this->typeconfig['instructorchoicesendemailaddr'] == 1) { - $mform->setDefault('instructorchoicesendemailaddr', '1'); - } - } - // $mform->addHelpButton('instructorchoicesendemailaddr', 'sendemailaddr', 'blti'); + $mform->addElement('checkbox', 'instructorchoicesendname', ' ', ' ' . get_string('share_name', 'blti')); + $mform->setDefault('instructorchoicesendname', '1'); + + $mform->addElement('checkbox', 'instructorchoicesendemailaddr', ' ', ' ' . get_string('share_email', 'blti')); + $mform->setDefault('instructorchoicesendemailaddr', '1'); + + $mform->addElement('checkbox', 'instructorchoiceacceptgrades', ' ', ' ' . get_string('accept_grades', 'blti')); + $mform->setDefault('instructorchoiceacceptgrades', '1'); + + $mform->addElement('checkbox', 'instructorchoiceallowroster', ' ', ' ' . get_string('share_roster', 'blti')); + $mform->setDefault('instructorchoiceallowroster', '1'); //------------------------------------------------------------------------------- - // Add grading preferences fieldset where the instructor determines whether to accept grades - $mform->addElement('header', 'extensions', get_string('extensions', 'blti')); - $extensionoptions=array(); - $extensionoptions[0] = get_string('donotaccept', 'blti'); - $extensionoptions[1] = get_string('accept', 'blti'); - - $mform->addElement('select', 'instructorchoiceacceptgrades', get_string('acceptgrades', 'blti'), $extensionoptions); - if (isset($this->typeconfig['instructorchoiceacceptgrades'])) { - if ($this->typeconfig['instructorchoiceacceptgrades'] == 0) { - $mform->setDefault('instructorchoiceacceptgrades', '0'); - } else if ($this->typeconfig['instructorchoiceacceptgrades'] == 1) { - $mform->setDefault('instructorchoiceacceptgrades', '1'); - } - } - // $mform->addHelpButton('instructorchoiceacceptgrades', 'acceptgrades', 'blti'); - - $extensionoptions=array(); - $extensionoptions[0] = get_string('donotallow', 'blti'); - $extensionoptions[1] = get_string('allow', 'blti'); - - $mform->addElement('select', 'instructorchoiceallowroster', get_string('allowroster', 'blti'), $extensionoptions); - if (isset($this->typeconfig['instructorchoiceallowroster'])) { - if ($this->typeconfig['instructorchoiceallowroster'] == 0) { - $mform->setDefault('instructorchoiceallowroster', '0'); - } else if ($this->typeconfig['instructorchoiceallowroster'] == 1) { - $mform->setDefault('instructorchoiceallowroster', '1'); - } - } - // $mform->addHelpButton('instructorchoiceallowroster', 'allowroster', 'blti'); - $mform->setAdvanced('instructorchoiceallowroster'); - - $mform->addElement('select', 'instructorchoiceallowsetting', get_string('allowsetting', 'blti'), $extensionoptions); - - if (isset($this->typeconfig['instructorchoiceallowsetting'])) { - if ($this->typeconfig['instructorchoiceallowsetting'] == 0) { - $mform->setDefault('instructorchoiceallowsetting', '0'); - } else if ($this->typeconfig['instructorchoiceallowsetting'] == 1) { - $mform->setDefault('instructorchoiceallowsetting', '1'); - } - } -// $mform->addHelpButton('instructorchoiceallowsetting', 'allowsetting', 'blti'); - $mform->setAdvanced('instructorchoiceallowsetting'); - -//------------------------------------------------------------------------------- - if (isset($this->typeconfig['allowinstructorcustom'])) { - if ($this->typeconfig['allowinstructorcustom'] == 1) { - // Add custom parameters fieldset - $mform->addElement('header', 'launchoptions', get_string('custominstr', 'blti')); - - $mform->addElement('textarea', 'instructorcustomparameters', '', array('rows'=>15, 'cols'=>60)); - $mform->setType('instructorcustomparameters', PARAM_TEXT); - $mform->setAdvanced('instructorcustomparameters'); - } - } - -//------------------------------------------------------------------------------- // Add launch parameters fieldset $mform->addElement('header', 'launchoptions', get_string('launchoptions', 'blti')); - // Size parameters - $mform->addElement('text', 'preferheight', get_string('preferheight', 'blti')); - if (isset($this->typeconfig['preferheight'])) { - $mform->setDefault('preferheight', $this->typeconfig['preferheight']); - } - $launchoptions=array(); - $launchoptions[0] = get_string('launch_in_moodle', 'blti'); - $launchoptions[1] = get_string('launch_in_popup', 'blti'); + $launchoptions[0] = get_string('embed', 'blti'); + $launchoptions[1] = get_string('embed_no_blocks', 'blti'); + $launchoptions[2] = get_string('popup_window', 'blti'); + $launchoptions[3] = get_string('new_window', 'blti'); $mform->addElement('select', 'launchinpopup', get_string('launchinpopup', 'blti'), $launchoptions); @@ -205,7 +157,7 @@ class mod_blti_mod_form extends moodleform_mod { } } - $debugoptions=array(); +/* $debugoptions=array(); $debugoptions[0] = get_string('debuglaunchoff', 'blti'); $debugoptions[1] = get_string('debuglaunchon', 'blti'); @@ -218,16 +170,7 @@ class mod_blti_mod_form extends moodleform_mod { $mform->setDefault('debuglaunch', '1'); } } - -//------------------------------------------------------------------------------- - // Organization parameters - if (isset($this->typeconfig['organizationid'])) { - $mform->addElement('hidden', 'organizationid', $this->typeconfig['organizationid']); - } - if (isset($this->typeconfig['organizationurl'])) { - $mform->addElement('hidden', 'organizationurl', $this->typeconfig['organizationurl']); - } -// $mform->addElement('hidden', 'organizationdescr', $this->typeconfig['organizationdescr']); +*/ //------------------------------------------------------------------------------- // add standard elements, common to all modules @@ -243,7 +186,7 @@ class mod_blti_mod_form extends moodleform_mod { */ function definition_after_data() { parent::definition_after_data(); - $mform =& $this->_form; + /* $mform =& $this->_form; $typeid =& $mform->getElement('typeid'); $typeidvalue = $mform->getElementValue('typeid'); @@ -283,7 +226,7 @@ class mod_blti_mod_form extends moodleform_mod { $field->freeze(); $field->setPersistantFreeze(true); } - } + }*/ } /** @@ -293,7 +236,7 @@ class mod_blti_mod_form extends moodleform_mod { * @param array $default_values passed by reference */ function data_preprocessing(&$default_values) { - global $CFG; +/* global $CFG; $default_values['typeid'] = $this->typeid; if (!isset($default_values['toolurl'])) { @@ -475,7 +418,7 @@ class mod_blti_mod_form extends moodleform_mod { $default_values['launchinpopup'] = $CFG->blti_launchinpopup; } } - +*/ } } diff --git a/mod/blti/styles.css b/mod/blti/styles.css index 0be6d5f9bf9..72126e44e21 100644 --- a/mod/blti/styles.css +++ b/mod/blti/styles.css @@ -27,3 +27,6 @@ #page-mod-blti-submissions .submissions .outcome, #page-mod-blti-submissions .submissions .finalgrade {text-align: right;} #page-mod-blti-submissions .qgprefs #optiontable {text-align:right;margin-left:auto;} + +/* Styles for admin */ +.path-admin-mod-blti .mform .fitem .fitemtitle { min-width:15em;padding-right:1em } /* Prevent setting titles from wrapping */ diff --git a/mod/blti/typessettings.php b/mod/blti/typessettings.php index 0ef7c4ad352..44214014b6a 100644 --- a/mod/blti/typessettings.php +++ b/mod/blti/typessettings.php @@ -74,11 +74,16 @@ $errormsg = ''; $focus = ''; if ($data = data_submitted() and confirm_sesskey() and isset($data->submitbutton)) { + $type = new StdClass(); + $type->name = $data->lti_typename; + $type->baseurl = $data->lti_toolurl; + $type->course = $SITE->id; + $type->coursevisible = 1; + $type->timemodified = time(); + if (isset($id)) { - $type = new StdClass(); $type->id = $id; - $type->name = $data->lti_typename; - $type->rawname = preg_replace('/[^a-zA-Z]/', '', $type->name); + if ($DB->update_record('blti_types', $type)) { unset ($data->lti_typename); //@TODO: update work @@ -95,23 +100,13 @@ if ($data = data_submitted() and confirm_sesskey() and isset($data->submitbutton } } } - - // Update toolurl for all existing instances - it is the only common parameter - // between configurations and instances - $instances = $DB->get_records('blti', array('typeid' => $id)); - foreach ($instances as $instance) { - if ($instance->toolurl != $data->lti_toolurl) { - $instance->toolurl = $data->lti_toolurl; - $DB->update_record('blti', $instance); - } - } } redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=modsettingblti"); die; } else { - $type = new StdClass(); - $type->name = $data->lti_typename; - $type->rawname = preg_replace('/[^a-zA-Z]/', '', $type->name); + $type->createdby = $USER->id; + $type->timecreated = time(); + if ($id = $DB->insert_record('blti_types', $type)) { if (!empty($data->lti_fix)) { $instance = $DB->get_record('blti', array('id' => $data->lti_fix));