L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-20700 coding style cleanup - cvs keywords removed, closign php tag removed, trailing whitespace cleanup

Browse Source
This commit is contained in:
Petr Skoda
2009-11-01 12:11:29 +00:00
parent 0a8b90f28f
commit 6c3ef4103a
101 changed files with 172 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/edit/letter/edit_form.php
+1 -1
View File
@@ -80,4 +80,4 @@ class edit_letter_form extends moodleform {
}
?>
grade/edit/letter/index.php
+1 -1
View File
@@ -72,4 +72,4 @@ $table->data = $data;
$table->tablealign = 'center';
echo $OUTPUT->table($table);
echo $OUTPUT->footer();
echo $OUTPUT->footer();
grade/edit/letter/tabs.php
+1 -1
View File
@@ -33,4 +33,4 @@
print_tabs($tabs, $currenttab);
echo '</div>';
?>
grade/edit/outcome/course.php
+1 -1
View File
@@ -133,4 +133,4 @@ check_theme_arrows();
require('course_form.html');
echo $OUTPUT->footer();
?>
grade/edit/outcome/edit_form.php
+1 -1
View File
@@ -146,4 +146,4 @@ class edit_outcome_form extends moodleform {
}
?>
grade/edit/outcome/export.php
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
// Exports selected outcomes in CSV format.
// Exports selected outcomes in CSV format.
require_once '../../../config.php';
require_once $CFG->dirroot.'/grade/lib.php';
grade/edit/outcome/import_outcomes_form.php
+1 -1
View File
@@ -49,4 +49,4 @@ class import_outcomes_form extends moodleform {
}
}
?>
grade/edit/outcome/tabs.php
+1 -1
View File
@@ -35,4 +35,4 @@
print_tabs($tabs, $currenttab);
echo '</div>';
?>
grade/edit/scale/edit_form.php
+1 -1
View File
@@ -143,4 +143,4 @@ class edit_scale_form extends moodleform {
}
}
?>
grade/edit/settings/form.php
+1 -1
View File
@@ -115,4 +115,4 @@ class course_settings_form extends moodleform {
$this->add_action_buttons();
}
}
?>
grade/edit/settings/index.php
+1 -1
View File
@@ -78,4 +78,4 @@ $mform->display();
echo $OUTPUT->footer();
?>
grade/edit/tree/action.php
+1 -1
View File
@@ -99,4 +99,4 @@ switch ($action) {
redirect($returnurl);
//redirect($returnurl, 'debug delay', 5);
?>
grade/edit/tree/calculation.php
+1 -1
View File
@@ -210,4 +210,4 @@ function get_grade_tree(&$gtree, $element, $current_itemid=null, $errors=null) {
return $return_string;
}
?>
grade/edit/tree/calculation_form.php
+1 -1
View File
@@ -93,4 +93,4 @@ class edit_calculation_form extends moodleform {
}
}
?>
grade/edit/tree/category.php
+2 -2
View File
@@ -129,7 +129,7 @@ if ($mform->is_cancelled()) {
if (!isset($itemdata->aggregationcoef)) {
$itemdata->aggregationcoef = 0;
}
if (!isset($itemdata->gradepass) || $itemdata->gradepass == '') {
$itemdata->gradepass = 0;
}
@@ -140,7 +140,7 @@ if ($mform->is_cancelled()) {
if (!isset($itemdata->grademin) || $itemdata->grademin == '') {
$itemdata->grademin = 0;
}
}
$hidden = empty($itemdata->hidden) ? 0: $itemdata->hidden;
$hiddenuntil = empty($itemdata->hiddenuntil) ? 0: $itemdata->hiddenuntil;
grade/edit/tree/category_form.php
+1 -1
View File
@@ -465,4 +465,4 @@ class edit_category_form extends moodleform {
}
}
?>
grade/edit/tree/grade_form.php
+1 -1
View File
@@ -206,4 +206,4 @@ class edit_grade_form extends moodleform {
}
}
?>
grade/edit/tree/index.php
+1 -1
View File
@@ -364,4 +364,4 @@ if ($moving) {
}
die;
?>
grade/edit/tree/item_form.php
+1 -1
View File
@@ -329,4 +329,4 @@ class edit_item_form extends moodleform {
}
}
?>
grade/edit/tree/lib.php
+1 -1
View File
@@ -1245,4 +1245,4 @@ class grade_edit_tree_column_select extends grade_edit_tree_column {
return false;
}
}
?>
grade/edit/tree/outcomeitem_form.php
+1 -1
View File
@@ -243,4 +243,4 @@ class edit_outcomeitem_form extends moodleform {
}
}
?>
grade/export/grade_export_form.php
+1 -1
View File
@@ -133,4 +133,4 @@ class grade_export_form extends moodleform {
}
}
?>
grade/export/key.php
+2 -2
View File
@@ -21,7 +21,7 @@
* @package moodlecore
* @copyright 2008 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
*/
require_once('../../config.php');
require_once('key_form.php');
@@ -130,4 +130,4 @@ echo $OUTPUT->header();
$editform->display();
echo $OUTPUT->footer();
?>
grade/export/keymanager.php
+2 -2
View File
@@ -21,7 +21,7 @@
* @package moodlecore
* @copyright 2008 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
*/
require_once '../../config.php';
require_once $CFG->dirroot.'/grade/export/lib.php';
@@ -91,4 +91,4 @@ echo $OUTPUT->button(html_form::make_button('key.php', array('courseid'=>$course
echo $OUTPUT->container_end();
echo $OUTPUT->footer();
?>
grade/export/lib.php
+2 -2
View File
@@ -288,7 +288,7 @@ abstract class grade_export {
public function print_continue() {
global $CFG, $OUTPUT;
$params = $this->get_export_params();
$params = $this->get_export_params();
echo $OUTPUT->heading(get_string('export', 'grades'));
@@ -383,4 +383,4 @@ class grade_export_update_buffer {
$this->flush(0);
}
}
?>
grade/export/ods/db/access.php
+1 -1
View File
@@ -39,4 +39,4 @@ $gradeexport_ods_capabilities = array(
);
?>
grade/export/ods/dump.php
+1 -1
View File
@@ -35,4 +35,4 @@ require_capability('gradeexport/ods:publish', $context);
// use the same page parameters as export.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa
require 'export.php';
?>
grade/export/ods/export.php
+1 -1
View File
@@ -47,4 +47,4 @@ if (groups_get_course_groupmode($COURSE) == SEPARATEGROUPS and !has_capability('
$export = new grade_export_ods($course, $groupid, $itemids, $export_feedback, $updatedgradesonly, $displaytype, $decimalpoints);
$export->print_grades();
?>
grade/export/ods/grade_export_ods.php
+1 -1
View File
@@ -103,4 +103,4 @@ class grade_export_ods extends grade_export {
}
}
?>
grade/export/ods/index.php
+2 -2
View File
@@ -46,7 +46,7 @@ $currentgroup = groups_get_course_group($course, true);
if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
echo $OUTPUT->heading(get_string("notingroup"));
echo $OUTPUT->footer();
die;
die;
}
// process post information
@@ -67,4 +67,4 @@ echo '<div class="clearer"></div>';
$mform->display();
echo $OUTPUT->footer();
?>
grade/export/ods/version.php
+1 -1
View File
@@ -18,4 +18,4 @@
$plugin->version = 2007092701;
$plugin->requires = 2007101000;
?>
grade/export/txt/db/access.php
+1 -1
View File
@@ -39,4 +39,4 @@ $gradeexport_txt_capabilities = array(
);
?>
grade/export/txt/dump.php
+1 -1
View File
@@ -35,4 +35,4 @@ require_capability('gradeexport/txt:publish', $context);
// use the same page parameters as export.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa
require 'export.php';
?>
grade/export/txt/export.php
+1 -1
View File
@@ -48,4 +48,4 @@ if (groups_get_course_groupmode($COURSE) == SEPARATEGROUPS and !has_capability('
$export = new grade_export_txt($course, $groupid, $itemids, $export_feedback, $updatedgradesonly, $displaytype, $decimalpoints, $separator);
$export->print_grades();
?>
grade/export/txt/grade_export_txt.php
+1 -1
View File
@@ -119,4 +119,4 @@ class grade_export_txt extends grade_export {
}
}
?>
grade/export/txt/index.php
+2 -2
View File
@@ -46,7 +46,7 @@ $currentgroup = groups_get_course_group($course, true);
if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
echo $OUTPUT->heading(get_string("notingroup"));
echo $OUTPUT->footer();
die;
die;
}
// process post information
@@ -68,4 +68,4 @@ echo '<div class="clearer"></div>';
$mform->display();
echo $OUTPUT->footer();
?>
grade/export/txt/version.php
+1 -1
View File
@@ -18,4 +18,4 @@
$plugin->version = 2007092700;
$plugin->requires = 2007101000;
?>
grade/export/xls/db/access.php
+1 -1
View File
@@ -39,4 +39,4 @@ $gradeexport_xls_capabilities = array(
);
?>
grade/export/xls/dump.php
+1 -1
View File
@@ -35,4 +35,4 @@ require_capability('gradeexport/xls:publish', $context);
// use the same page parameters as export.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa
require 'export.php';
?>
grade/export/xls/export.php
+1 -1
View File
@@ -47,4 +47,4 @@ if (groups_get_course_groupmode($COURSE) == SEPARATEGROUPS and !has_capability('
$export = new grade_export_xls($course, $groupid, $itemids, $export_feedback, $updatedgradesonly, $displaytype, $decimalpoints);
$export->print_grades();
?>
grade/export/xls/grade_export_xls.php
+1 -1
View File
@@ -103,4 +103,4 @@ class grade_export_xls extends grade_export {
}
}
?>
grade/export/xls/index.php
+2 -2
View File
@@ -46,7 +46,7 @@ $currentgroup = groups_get_course_group($course, true);
if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
echo $OUTPUT->heading(get_string("notingroup"));
echo $OUTPUT->footer();
die;
die;
}
// process post information
@@ -67,4 +67,4 @@ echo '<div class="clearer"></div>';
$mform->display();
echo $OUTPUT->footer();
?>
grade/export/xls/version.php
+1 -1
View File
@@ -18,4 +18,4 @@
$plugin->version = 2007092700;
$plugin->requires = 2007101000;
?>
grade/export/xml/db/access.php
+1 -1
View File
@@ -39,4 +39,4 @@ $gradeexport_xml_capabilities = array(
);
?>
grade/export/xml/dump.php
+1 -1
View File
@@ -35,4 +35,4 @@ require_capability('gradeexport/xml:publish', $context);
// use the same page parameters as export.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa
require 'export.php';
?>
grade/export/xml/export.php
+1 -1
View File
@@ -47,4 +47,4 @@ if (groups_get_course_groupmode($COURSE) == SEPARATEGROUPS and !has_capability('
$export = new grade_export_xml($course, $groupid, $itemids, $export_feedback, $updatedgradesonly, $displaytype, $decimalpoints);
$export->print_grades();
?>
grade/export/xml/grade_export_xml.php
+1 -1
View File
@@ -105,4 +105,4 @@ class grade_export_xml extends grade_export {
}
}
?>
grade/export/xml/index.php
+2 -2
View File
@@ -46,7 +46,7 @@ $currentgroup = groups_get_course_group($course, true);
if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
echo $OUTPUT->heading(get_string("notingroup"));
echo $OUTPUT->footer();
die;
die;
}
// process post information
@@ -67,4 +67,4 @@ echo '<div class="clearer"></div>';
$mform->display();
echo $OUTPUT->footer();
?>
grade/export/xml/version.php
+1 -1
View File
@@ -18,4 +18,4 @@
$plugin->version = 2007092700;
$plugin->requires = 2007101000;
?>
grade/import/csv/db/access.php
+1 -1
View File
@@ -27,4 +27,4 @@ $gradeimport_csv_capabilities = array(
)
);
?>
grade/import/csv/index.php
+1 -1
View File
@@ -494,4 +494,4 @@ if ($formdata = $mform->get_data()) {
}
echo $OUTPUT->footer();
?>
grade/import/csv/version.php
+1 -1
View File
@@ -18,4 +18,4 @@
$plugin->version = 2007072500;
$plugin->requires = 2007101000;
?>
grade/import/grade_import_form.php
+1 -1
View File
@@ -52,7 +52,7 @@ class grade_import_form extends moodleform {
if (!empty($features['verbosescales'])) {
$options = array(1=>get_string('yes'), 0=>get_string('no'));
$mform->addElement('select', 'verbosescales', get_string('verbosescales', 'grades'), $options);
$mform->addElement('select', 'verbosescales', get_string('verbosescales', 'grades'), $options);
}
$options = array('10'=>10, '20'=>20, '100'=>100, '1000'=>1000, '100000'=>100000);
grade/import/keymanager.php
+2 -2
View File
@@ -52,7 +52,7 @@ if ($keys = $DB->get_records_select('user_private_key', "script='grade/import' A
$line[0] = format_string($key->value);
$line[1] = $key->iprestriction;
$line[2] = empty($key->validuntil) ? get_string('always') : userdate($key->validuntil);
$icon = new moodle_action_icon();
$icon->link->url = new moodle_url('key.php', array('id' => $key->id));
$icon->image->add_class('iconsmall');
@@ -88,4 +88,4 @@ echo $OUTPUT->button(html_form::make_button('key.php', array('courseid'=>$course
echo $OUTPUT->container_end();
echo $OUTPUT->footer();
?>
grade/import/lib.php
+1 -1
View File
@@ -196,4 +196,4 @@ function import_cleanup($importcode) {
$DB->delete_records('grade_import_newitem', array('importcode' => $importcode, 'importer' => $USER->id));
}
?>
grade/import/xml/db/access.php
+1 -1
View File
@@ -35,4 +35,4 @@ $gradeimport_xml_capabilities = array(
)
);
?>
grade/import/xml/fetch.php
+1 -1
View File
@@ -35,4 +35,4 @@ require_capability('gradeimport/xml:publish', $context);
// use the same page parameters as import.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa
require 'import.php';
?>
grade/import/xml/grade_import_form.php
+1 -1
View File
@@ -94,4 +94,4 @@ class grade_import_form extends moodleform {
return $err;
}
}
?>
grade/import/xml/import.php
+1 -1
View File
@@ -81,4 +81,4 @@ if ($importcode !== false) {
print_error('error', 'gradeimport_xml');
}
?>
grade/import/xml/index.php
+1 -1
View File
@@ -93,4 +93,4 @@ $mform->display();
echo $OUTPUT->footer();
?>
grade/import/xml/lib.php
+1 -1
View File
@@ -120,4 +120,4 @@ function import_xml_grades($text, $course, &$error) {
return false;
}
}
?>
grade/import/xml/version.php
+1 -1
View File
@@ -18,4 +18,4 @@
$plugin->version = 2007092700;
$plugin->requires = 2007101000;
?>
grade/lib.php
+1 -1
View File
@@ -854,7 +854,7 @@ function print_grade_page_head($courseid, $active_type, $active_plugin=null,
}
$PAGE->navbar->add($stractive_plugin);
$title = ': ' . $stractive_plugin;
if (empty($plugin_info[$active_type]->id) || !empty($plugin_info[$active_type]->parent)) {
$title = ': ' . $stractive_type . ': ' . $stractive_plugin;
grade/querylib.php
+1 -1
View File
@@ -338,4 +338,4 @@ function grade_get_gradable_activities($courseid, $modulename='') {
return $DB->get_records_sql($sql, $params);
}
?>
grade/report/grader/ajax.php
+64 -64
View File
@@ -70,7 +70,7 @@ YAHOO.grader_report.tooltip = function(e, dataObj) {
YAHOO.grader_report.saveField = function(editedEl) {
var gr = YAHOO.grader_report;
var idData = gr.getIdData(editedEl.id);
if (idData.type == 'value') { // Text input
var newVal = editedEl.firstChild.value;
} else if (idData.type == 'feedback') { // Textarea
@@ -78,7 +78,7 @@ YAHOO.grader_report.saveField = function(editedEl) {
} else if (idData.type == 'scale') { // Select
var newVal = editedEl.options[editedEl.selectedIndex].value;
}
// Don't save if the new value is the same as the old
if (gr.el_being_edited.value == newVal || (gr.el_being_edited.value == gr.straddfeedback && newVal == '')) {
YAHOO.log("saveField: Field unchanged, not saving. (" + newVal + ")", "info");
@@ -86,10 +86,10 @@ YAHOO.grader_report.saveField = function(editedEl) {
}
YAHOO.log("saveField: Old value: " + gr.el_being_edited.value + ", new value: " + newVal + ". Saving field...", "info");
var postData = "id=" + gr.courseid + "&userid=" + idData.userId + "&itemid=" + idData.itemId +
var postData = "id=" + gr.courseid + "&userid=" + idData.userId + "&itemid=" + idData.itemId +
"&action=update&newvalue=" + newVal + "&type=" + idData.type;
var handleSuccess = function(o) {
try {
var queryResult = YAHOO.lang.JSON.parse(o.responseText);
@@ -107,7 +107,7 @@ YAHOO.grader_report.saveField = function(editedEl) {
}
} else if (idData.type == 'feedback') {
editedEl.innerHTML = gr.truncateText(queryResult.gradevalue);
YAHOO.util.Event.addListener(editedEl.id, 'mouseover', gr.tooltip, {text: queryResult.gradevalue}, true);
YAHOO.util.Event.addListener(editedEl.id, 'mouseout', nd); // See overlib doc for reference
gr.feedbacks[idData.userId][idData.itemId] = queryResult.gradevalue;
@@ -118,7 +118,7 @@ YAHOO.grader_report.saveField = function(editedEl) {
YAHOO.util.Dom.addClass(editedEl, "editable");
// TODO "highlight" the updated element using animation of color (yellow fade-out)
// Update the row's final grade values
gr.updateRow(gr.getIdData(editedEl.id).userId, queryResult.row);
} else {
@@ -132,7 +132,7 @@ YAHOO.grader_report.saveField = function(editedEl) {
var handleFailure = function(o) {
YAHOO.log("saveField: Failure to call the ajax callbacks page!", "error");
}
var uri = gr.wwwroot + '/grade/report/grader/ajax_callbacks.php';
var callback = {success: handleSuccess, failure: handleFailure};
var conn = YAHOO.util.Connect.asyncRequest("post", uri, callback, postData);
@@ -158,12 +158,12 @@ YAHOO.grader_report.displayMessage = function(result, message, elToHighlight) {
YAHOO.util.Dom.removeClass(messageDiv, 'success');
YAHOO.util.Dom.removeClass(messageDiv, 'error');
YAHOO.util.Dom.removeClass(messageDiv, 'notice');
var attributes = {backgroundColor: { to: '#00F0F0'} };
// Add result class
YAHOO.util.Dom.addClass(messageDiv, result);
messageDiv.innerHTML = message;
// Highlight given element
@@ -183,7 +183,7 @@ YAHOO.grader_report.updateRow = function(userId, row) {
// Send update request and update the row
YAHOO.log("updateRow: Updating row..." + row, "info");
for (var i in row) {
if (row[i].finalgrade != null) {
// Build id string
@@ -198,7 +198,7 @@ YAHOO.grader_report.updateRow = function(userId, row) {
idString += row[i].userid + "-i" + row[i].itemid;
var elementToUpdate = document.getElementById(idString);
if (undefined == elementToUpdate) {
YAHOO.log("updateRow: Element with id " + idString + " does not exist!", "error");
} else {
@@ -207,7 +207,7 @@ YAHOO.grader_report.updateRow = function(userId, row) {
} else {
elementToUpdate.innerHTML = gradevalue;
}
// Add overridden class where it applies, and remove it where it does not
// TODO fix the code below, it doesn't currently work. See ajax_callbacks.php for the code building the JSON data
if (row[i].overridden > 0) {
@@ -223,15 +223,15 @@ YAHOO.grader_report.updateRow = function(userId, row) {
};
/**
* Given a gradevalue or gradefeedback <a> element,
* Given a gradevalue or gradefeedback <a> element,
* @param object element A DOM element
*/
YAHOO.grader_report.openField = function(element) {
YAHOO.log("openField: Moving to next item: " + element.id, "info");
var gr = YAHOO.grader_report;
YAHOO.log("openField: Moving to next item: " + element.id, "info");
var gr = YAHOO.grader_report;
var idData = gr.getIdData(element.id);
element.inputId = element.id + "_input";
// If field is in error, empty it before editing
if (YAHOO.util.Dom.hasClass(element, 'error')) {
if (idData.type == 'feedback') {
@@ -239,7 +239,7 @@ YAHOO.grader_report.openField = function(element) {
} else if (idData.type == 'value') {
element.value = '';
}
YAHOO.util.Dom.removeClass(element, 'error');
}
@@ -259,19 +259,19 @@ YAHOO.grader_report.openField = function(element) {
}
element.innerHTML = '<textarea id="' + element.inputId + '" name="' + idData.type + '">' + displayValue + '</textarea>';
setTimeout(function() {element.firstChild.focus(); }, 0);
setTimeout(function() {element.firstChild.focus(); }, 0);
} else if (idData.type == 'value') {
var original = element.innerHTML.toString(); // Removes reference to original
element.innerHTML = '<input onfocus="this.select()" id="' + element.inputId + '" type="text" name="' +
element.innerHTML = '<input onfocus="this.select()" id="' + element.inputId + '" type="text" name="' +
idData.type + '" value="' + gr.roundValue(original, idData.itemId) + '" />';
setTimeout(function() {element.firstChild.focus(); }, 0);
setTimeout(function() {element.firstChild.focus(); }, 0);
} else if (idData.type == 'scale') {
var original = element.options[element.selectedIndex].value;
setTimeout(function() {element.focus(); }, 0);
setTimeout(function() {element.focus(); }, 0);
}
YAHOO.util.Dom.removeClass(element, "editable");
// Save the element and its original value
gr.el_being_edited = {elementId: element.id, value: original, tabIndex: tabIndex};
YAHOO.log("openField: el_being_edited saved as: " + gr.el_being_edited.value, "info");
@@ -294,7 +294,7 @@ YAHOO.grader_report.closeField = function(element, forcecancel) {
if (idData.type == 'feedback') {
var newValue = element.firstChild.value;
var originalValue = gr.feedbacks[idData.userId][idData.itemId];
if (!forcecancel && originalValue == newValue) {
YAHOO.log("closeField: originalValue == newvalue, forcing a cancel", "info");
forcecancel = true;
@@ -303,16 +303,16 @@ YAHOO.grader_report.closeField = function(element, forcecancel) {
} else if (idData.type == 'value') {
var originalValue = gr.el_being_edited.value;
var newValue = element.firstChild.value;
}
}
YAHOO.util.Dom.addClass(element, "editable");
// No need to change HTML for select element
if (idData.type == 'scale') {
gr.el_being_edited = null;
return;
}
if (forcecancel || ((newValue == '' && idData.type == 'feedback') && idData.type != 'scale')) {
// Replace the input by the original value as plain text
element.innerHTML = gr.truncateText(originalValue);
@@ -320,7 +320,7 @@ YAHOO.grader_report.closeField = function(element, forcecancel) {
} else {
// For numeric grades, round off to item decimal points
if (idData.type == 'value') {
element.innerHTML = gr.roundValue(newValue, idData.itemId);
element.innerHTML = gr.roundValue(newValue, idData.itemId);
} else if (idData.type == 'feedback') {
element.innerHTML = newValue;
}
@@ -340,10 +340,10 @@ YAHOO.grader_report.truncateText = function(text) {
var gr = YAHOO.grader_report;
var returnString = '';
returnString = text.substring(0, gr.feedback_trunc_length);
returnString = text.substring(0, gr.feedback_trunc_length);
// Add ... if the string was truncated
if (returnString.length < text.length) {
if (returnString.length < text.length) {
returnString += '...';
}
@@ -376,7 +376,7 @@ YAHOO.grader_report.roundValue = function(value, itemId) {
}
}
return gradevalue;
return gradevalue;
};
/**
@@ -390,14 +390,14 @@ YAHOO.grader_report.getField = function(origin_element, direction) {
// get all 'editable' elements
var haystack = YAHOO.util.Dom.getElementsByClassName('editable');
var wrapElement = null;
var feedbackModifier = 1;
var upDownOffset = 1;
var idData = gr.getIdData(origin_element.id);
if (gr.showquickfeedback) {
feedbackModifier = 2;
if (idData.type == 'value' || idData.type == 'scale') {
upDownOffset = gr.studentsperpage;
}
@@ -407,25 +407,25 @@ YAHOO.grader_report.getField = function(origin_element, direction) {
if (direction == 'next') {
var wrapValue = 1;
var needle = origin_element.tabIndex + 1;
} else if (direction == 'previous') {
var wrapValue = haystack.length;
var needle = origin_element.tabIndex - 1;
} else if (direction == 'right') {
var needle = origin_element.tabIndex + gr.studentsperpage * feedbackModifier;
var wrapValue = null; // TODO implement wrapping when moving right
} else if (direction == 'left') {
var needle = origin_element.tabIndex - gr.studentsperpage * feedbackModifier;
var wrapValue = null; // TODO implement wrapping when moving left
} else if (direction == 'up') {
// Jump up from value to feedback: origin + (studentsperpage - 1)
if (idData.type == 'value' || idData.type == 'scale') {
var upDownOffset = gr.studentsperpage - 1;
// Jump up from feedback to value: origin - studentsperpage
} else if (idData.type == 'feedback') {
var upDownOffset = -(gr.studentsperpage);
@@ -433,7 +433,7 @@ YAHOO.grader_report.getField = function(origin_element, direction) {
var needle = origin_element.tabIndex + upDownOffset;
var wrapValue = haystack.length;
} else if (direction == 'down') {
// Jump down from value to feedback: origin + studentsperpage
if (idData.type == 'value' || idData.type == 'scale') {
@@ -442,10 +442,10 @@ YAHOO.grader_report.getField = function(origin_element, direction) {
// Jump down from feedback to value: origin - (studentsperpage - 1)
} else if (idData.type == 'feedback') {
var upDownOffset = -(gr.studentsperpage - 1);
}
}
var needle = origin_element.tabIndex + upDownOffset;
var wrapValue = 1;
}
}
for (var i = 0; i < haystack.length; i++) {
if (haystack[i].tabIndex == wrapValue) {
@@ -454,7 +454,7 @@ YAHOO.grader_report.getField = function(origin_element, direction) {
if (haystack[i].tabIndex == needle) {
return haystack[i];
}
}
}
// If we haven't returned yet, it means we have reached the end of tabindices: return the wrap element
@@ -472,27 +472,27 @@ YAHOO.grader_report.init = function() {
// Handle Key presses: Tab and Enter
this.keyHandler = function(e) {
var charCode = YAHOO.util.Event.getCharCode(e);
YAHOO.log("init: Key pressed (" + charCode + "). el_being_edited = " + gr.el_being_edited, "info");
// Handle keys if editing
if (gr.el_being_edited !== null) {
var editedEl = document.getElementById(gr.el_being_edited.elementId);
var idData = gr.getIdData(editedEl.id);
// Handle Tab and Shift-Tab for navigation forward/backward
if (charCode == 9) {
gr.saveField(editedEl);
gr.closeField(editedEl, false);
if (e.shiftKey) {
var fieldToOpen = gr.getField(editedEl, 'previous');
var fieldToOpen = gr.getField(editedEl, 'previous');
} else {
var fieldToOpen = gr.getField(editedEl, 'next');
var fieldToOpen = gr.getField(editedEl, 'next');
}
gr.openField(fieldToOpen);
}
// Handle Enter key press
if (charCode == 13 && idData.type != 'feedback') { // textareas need [enter]
// Locate element being edited
@@ -503,42 +503,42 @@ YAHOO.grader_report.init = function() {
// Handle ctrl-arrows
var arrows = { 37: "left", 38: "up", 39: "right", 40: "down" };
if (e.ctrlKey && (charCode == 37 || charCode == 38 || charCode == 39 || charCode == 40)) {
gr.saveField(editedEl);
gr.closeField(editedEl, false);
var fieldToOpen = gr.getField(editedEl, arrows[charCode]);
gr.openField(fieldToOpen);
}
}
}
// Handle mouse clicks
this.clickHandler = function(e) {
var clickTargetElement = YAHOO.util.Event.getTarget(e);
// Handle a click while a grade value or feedback is being edited
if (gr.el_being_edited !== null) {
// idData represents the element being edited, not the clicked element
var idData = gr.getIdData(gr.el_being_edited.elementId);
if (idData.type != 'scale') {
if (idData.type != 'scale') {
// If clicking in a cell being edited, no action
// parentNode is the original a to which the element was added as a Child node
if (gr.el_being_edited.elementId == clickTargetElement.parentNode.id) {
YAHOO.log("init: Clicked within the edited element, no action.", "info");
return false;
}
// Otherwise, we CANCEL the current edit
var originalTarget = document.getElementById(gr.el_being_edited.elementId);
YAHOO.log("init: Clicked out of the edited element, cancelling edit.", "info");
gr.closeField(originalTarget, true);
} else if (idData.type == 'scale' && gr.el_being_edited.elementId == clickTargetElement.id) {
// An option has been selected, update the element
gr.saveField(clickTargetElement);
// Then open the element to save the new value in el_being_edited
@@ -550,7 +550,7 @@ YAHOO.grader_report.init = function() {
while (clickTargetElement.id != 'grade-report-grader-index') {
anchor_re = /(gradevalue|gradefeedback|gradescale)(.*) editable/;
anchor_matches = anchor_re.exec(clickTargetElement.className);
// YAHOO.log("className = " + clickTargetElement.className, "info");
var nodeName = clickTargetElement.nodeName.toLowerCase();
@@ -558,7 +558,7 @@ YAHOO.grader_report.init = function() {
gr.openField(clickTargetElement);
break;
// If clicked anywhere else in the cell, default to editing the grade, not the feedback
// If clicked anywhere else in the cell, default to editing the grade, not the feedback
} else if (clickTargetElement.nodeName.toLowerCase() == "td" && clickTargetElement.id.match(/gradecell/)) {
anchors = YAHOO.util.Dom.getElementsByClassName("editable", "a", clickTargetElement);
if (anchors.length > 0) {
grade/report/grader/ajax_callbacks.php
+1 -1
View File
@@ -141,4 +141,4 @@ switch ($action) {
break;
}
?>
grade/report/grader/ajaxlib.php
+1 -1
View File
@@ -518,4 +518,4 @@ class grade_report_grader_ajax extends grade_report_grader {
return json_encode($decimals);
}
}
?>
grade/report/grader/db/access.php
+1 -1
View File
@@ -29,4 +29,4 @@ $gradereport_grader_capabilities = array(
)
);
?>
grade/report/grader/index.php
+1 -1
View File
@@ -193,4 +193,4 @@ echo $OUTPUT->container('tooltip panel', '', 'hiddentooltiproot');
if ($report->get_pref('enableajax')) {
require_once 'ajax.php';
}
echo $OUTPUT->footer();
echo $OUTPUT->footer();
grade/report/grader/lib.php
+1 -1
View File
@@ -1557,4 +1557,4 @@ class grade_report_grader extends grade_report {
return $arrows;
}
}
?>
grade/report/grader/preferences.php
+1 -1
View File
@@ -76,4 +76,4 @@ $mform->display();
echo $OUTPUT->box_end();
echo $OUTPUT->footer();
?>
grade/report/grader/preferences_form.php
+1 -1
View File
@@ -204,4 +204,4 @@ class grader_report_preferences_form extends moodleform {
return parent::validation($data, $files);
}
}
?>
grade/report/grader/quickedit_item.php
+1 -1
View File
@@ -114,4 +114,4 @@ if (!empty($studentsperpage) && $studentsperpage >= 20) {
}
echo $OUTPUT->footer();
?>
grade/report/grader/settings.php
+1 -1
View File
@@ -103,4 +103,4 @@ $settings->add(new admin_setting_configselect('grade_report_rangesdecimalpoints'
'5' => '5')));
?>
grade/report/grader/tabs.php
+1 -1
View File
@@ -32,4 +32,4 @@
echo '<div class="gradedisplay">';
print_tabs($tabs, $currenttab);
echo '</div>';
?>
grade/report/grader/version.php
+1 -1
View File
@@ -18,4 +18,4 @@
$plugin->version = 2009022500;
$plugin->requires = 2007101000;
?>
grade/report/lib.php
+1 -1
View File
@@ -331,4 +331,4 @@ abstract class grade_report {
return $html;
}
}
?>
grade/report/outcomes/db/access.php
+1 -1
View File
@@ -30,4 +30,4 @@ $gradereport_outcomes_capabilities = array(
);
?>
grade/report/outcomes/index.php
+1 -1
View File
@@ -156,4 +156,4 @@ print_grade_page_head($courseid, 'report', 'outcomes');
echo $html;
echo $OUTPUT->footer();
?>
grade/report/outcomes/version.php
+1 -1
View File
@@ -18,4 +18,4 @@
$plugin->version = 2007073000;
$plugin->requires = 2007101000;
?>
grade/report/overview/db/access.php
+1 -1
View File
@@ -29,4 +29,4 @@ $gradereport_overview_capabilities = array(
);
?>
grade/report/overview/index.php
+1 -1
View File
@@ -56,7 +56,7 @@ if (has_capability('moodle/grade:viewall', $systemcontext)) {
} else if ($userid == $USER->id and has_capability('moodle/grade:viewall', $context)) {
//ok - can view any own grades
$access = true;
} else if ($userid == $USER->id and has_capability('moodle/grade:view', $context) and $course->showgrades) {
//ok - can view own course grades
$access = true;
grade/report/overview/lib.php
+1 -1
View File
@@ -241,4 +241,4 @@ function grade_report_overview_settings_definition(&$mform) {
$mform->setHelpButton('report_overview_showrank', array('showrank', get_string('showrank', 'grades'), 'grade'));
}
?>
grade/report/overview/settings.php
+1 -1
View File
@@ -19,4 +19,4 @@
$settings->add(new admin_setting_configcheckbox('grade_report_overview_showrank', get_string('showrank', 'grades'), get_string('configshowrank', 'grades'), 0, PARAM_INT));
?>
grade/report/overview/version.php
+1 -1
View File
@@ -18,4 +18,4 @@
$plugin->version = 2009022500;
$plugin->requires = 2007101000;
?>
grade/report/user/db/access.php
+1 -1
View File
@@ -30,4 +30,4 @@ $gradereport_user_capabilities = array(
),
);
?>
grade/report/user/index.php
+1 -1
View File
@@ -150,4 +150,4 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all
echo $OUTPUT->footer();
?>
grade/report/user/lib.php
+1 -1
View File
@@ -485,4 +485,4 @@ function grade_report_user_profilereport($course, $user) {
}
}
?>
grade/report/user/settings.php
+1 -1
View File
@@ -25,4 +25,4 @@ $options = array(0 => get_string('shownohidden', 'grades'),
2 => get_string('showallhidden', 'grades'));
$settings->add(new admin_setting_configselect('grade_report_user_showhiddenitems', get_string('showhiddenitems', 'grades'), get_string('configshowhiddenitems', 'grades'), 1, $options));
?>
grade/report/user/version.php
+1 -1
View File
@@ -18,4 +18,4 @@
$plugin->version = 2007092500;
$plugin->requires = 2007101000;
?>
grade/simpletest/testreportlib.php
+1 -1
View File
@@ -45,4 +45,4 @@ class gradereportlib_test extends FakeDBUnitTestCase {
}
?>
login/change_password.php
-2
View File
@@ -141,5 +141,3 @@ if (get_user_preferences('auth_forcepasswordchange')) {
}
$mform->display();
echo $OUTPUT->footer();
?>
login/change_password_form.php
+1 -2
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
require_once $CFG->libdir.'/formslib.php';
@@ -76,4 +76,3 @@ class login_change_password_form extends moodleform {
return $errors;
}
}
?>
login/confirm.php
-2
View File
@@ -78,5 +78,3 @@ if (!empty($data) || (!empty($p) && !empty($s))) {
}
redirect("$CFG->wwwroot/");
?>
login/forgot_password.php
-2
View File
@@ -161,5 +161,3 @@ echo $OUTPUT->box(get_string('passwordforgotteninstructions2'), 'generalbox boxw
$mform->display();
echo $OUTPUT->footer();
?>
login/forgot_password_form.php
+3 -5
View File
@@ -1,4 +1,4 @@
<?php //$Id$
<?php
require_once $CFG->libdir.'/formslib.php';
@@ -15,9 +15,9 @@ class login_forgot_password_form extends moodleform {
$submitlabel = get_string('search');
$mform->addElement('submit', 'submitbutton', $submitlabel);
$mform->addElement('header', '', get_string('searchbyemail'), '');
$mform->addElement('text', 'email', get_string('email'));
$mform->setType('email', PARAM_RAW);
@@ -67,5 +67,3 @@ class login_forgot_password_form extends moodleform {
}
}
?>
login/index.php
+1 -1
View File
@@ -314,4 +314,4 @@ $PAGE->set_focuscontrol($focus);
echo $OUTPUT->header();
include("index_form.html");
echo $OUTPUT->footer();
echo $OUTPUT->footer();
login/index_form.html
+1 -1
View File
@@ -65,7 +65,7 @@ if ($show_instructions) {
<div class="signuppanel">
<h2><?php print_string("firsttime") ?></h2>
<div class="subcontent">
<?php if (is_enabled_auth('none')) { // instructions override the rest for security reasons
<?php if (is_enabled_auth('none')) { // instructions override the rest for security reasons
print_string("loginstepsnone");
} else if ($CFG->registerauth == 'email') {
if (!empty($CFG->auth_instructions)) {
login/mnet_email.php
+1 -1
View File
@@ -41,4 +41,4 @@ echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
<?php
echo $OUTPUT->box_end();
echo $OUTPUT->footer();
echo $OUTPUT->footer();
login/signup.php
+1 -1
View File
@@ -89,4 +89,4 @@ $PAGE->set_headingmenu("<div class=\"langmenu\">$langmenu</div>");
echo $OUTPUT->header();
$mform_signup->display();
echo $OUTPUT->footer();
echo $OUTPUT->footer();

Some files were not shown because too many files have changed in this diff Show More