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

Merge branch 'MDL-30901_master' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2012-09-24 15:15:05 +12:00
parent 67d5121d9b d11f12f646
commit d324d74e39
12 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/moodle2/backup_stepslib.php
+1 -1
View File
@@ -1096,7 +1096,7 @@ class backup_users_structure_step extends backup_structure_step {
'lastaccess', 'lastlogin', 'currentlogin',
'mailformat', 'maildigest', 'maildisplay', 'htmleditor',
'autosubscribe', 'trackforums', 'timecreated',
'timemodified', 'trustbitmask', 'screenreader');
'timemodified', 'trustbitmask');
// Then, the fields potentially needing anonymization
$anonfields = array(
grade/report/grader/lib.php
+1 -2
View File
@@ -615,7 +615,6 @@ class grade_report_grader extends grade_report {
$rows = array();
$showuserimage = $this->get_pref('showuserimage');
$fixedstudents = $this->is_fixed_students();
$strfeedback = $this->get_lang_string("feedback");
$strgrade = $this->get_lang_string('grade');
@@ -1639,7 +1638,7 @@ class grade_report_grader extends grade_report {
*/
public function is_fixed_students() {
global $USER, $CFG;
return empty($USER->screenreader) && $CFG->grade_report_fixedstudents &&
return $CFG->grade_report_fixedstudents &&
(check_browser_version('MSIE', '7.0') ||
check_browser_version('Firefox', '2.0') ||
check_browser_version('Gecko', '2006010100') ||
grade/report/grader/module.js
+2 -1
View File
@@ -56,7 +56,7 @@ M.gradereport_grader = {
return;
}
var content = '<div class="graderreportoverlay">';
var content = '<div class="graderreportoverlay" role="tooltip" aria-describedby="' + properties.id + '">';
content += '<div class="fullname">'+properties.username+'</div><div class="itemname">'+properties.itemname+'</div>';
if (properties.feedback) {
content += '<div class="feedback">'+properties.feedback+'</div>';
@@ -241,6 +241,7 @@ M.gradereport_grader.classes.report.prototype.get_cell_info = function(arg) {
}
return {
id : cell.getAttribute('id'),
userid : userid,
username : this.users[userid],
itemid : itemid,
lang/en/moodle.php
-4
View File
@@ -1466,10 +1466,6 @@ $string['scalestandard_help'] = 'A standard scale is available site-wide, for al
$string['scalestandard_link'] = 'grade/scale';
$string['scalestip'] = 'To create custom scales, use the \'Scales...\' link in your course administration menu.';
$string['scalestip2'] = 'To create custom scales, click the Grades link in the course administration menu, then choose Edit, Scales.';
$string['screenreaderno'] = 'No';
$string['screenreaderuse'] = 'Screen reader';
$string['screenreaderyes'] = 'Yes';
$string['screenreaderuse_help'] = 'If set to yes, a more accessible interface is provided in various places such as chat.';
$string['screenshot'] = 'Screenshot';
$string['search'] = 'Search'; // TODO MDL-34652 rename to searchforums and move to mod_forum
$string['search_help'] = 'For basic searching of one or more words anywhere in the text, just type them separated by spaces. All words longer than two characters are used.
lib/db/install.xml
+2 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<XMLDB PATH="lib/db" VERSION="20120825" COMMENT="XMLDB file for core Moodle tables"
<XMLDB PATH="lib/db" VERSION="20120917" COMMENT="XMLDB file for core Moodle tables"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
>
@@ -778,8 +778,7 @@
<FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="trackforums" NEXT="timemodified"/>
<FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="timecreated" NEXT="trustbitmask"/>
<FIELD NAME="trustbitmask" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="timemodified" NEXT="imagealt"/>
<FIELD NAME="imagealt" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false" COMMENT="alt tag for user uploaded image" PREVIOUS="trustbitmask" NEXT="screenreader"/>
<FIELD NAME="screenreader" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="flag for determining whehter the user uses a screenreader." PREVIOUS="imagealt"/>
<FIELD NAME="imagealt" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false" COMMENT="alt tag for user uploaded image" PREVIOUS="trustbitmask"/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id"/>
lib/db/upgrade.php
+14
View File
@@ -1206,5 +1206,19 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2012090700.01);
}
if ($oldversion < 2012091700.00) {
// Dropping screenreader field from user.
$table = new xmldb_table('user');
$field = new xmldb_field('screenreader');
if ($dbman->field_exists($table, $field)) {
$dbman->drop_field($table, $field);
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2012091700.00);
}
return true;
}
lib/moodlelib.php
+2 -4
View File
@@ -8815,11 +8815,9 @@ function get_browser_version_classes() {
* @return bool True for yes, false for no
*/
function can_use_rotated_text() {
global $USER;
return (check_browser_version('MSIE', 9) || check_browser_version('Firefox', 2) ||
return check_browser_version('MSIE', 9) || check_browser_version('Firefox', 2) ||
check_browser_version('Chrome', 21) || check_browser_version('Safari', 536.25) ||
check_browser_version('Opera', 12) || check_browser_version('Safari iOS', 533)) &&
!$USER->screenreader;
check_browser_version('Opera', 12) || check_browser_version('Safari iOS', 533);
}
/**
mod/chat/lib.php
+4 -7
View File
@@ -1203,7 +1203,7 @@ function chat_supports($feature) {
}
function chat_extend_navigation($navigation, $course, $module, $cm) {
global $CFG, $USER, $PAGE, $OUTPUT;
global $CFG;
$currentgroup = groups_get_activity_group($cm, true);
@@ -1219,12 +1219,9 @@ function chat_extend_navigation($navigation, $course, $module, $cm) {
$links = array();
// If user is using screenreader, display gui_basic gui link only
if (empty($USER->screenreader)) {
$url = new moodle_url($target.'gui_'.$CFG->chat_method.'/index.php', $params);
$action = new popup_action('click', $url, 'chat'.$course->id.$cm->instance.$currentgroup, array('height' => 500, 'width' => 700));
$links[] = new action_link($url, $strenterchat, $action);
}
$url = new moodle_url($target.'gui_'.$CFG->chat_method.'/index.php', $params);
$action = new popup_action('click', $url, 'chat'.$course->id.$cm->instance.$currentgroup, array('height' => 500, 'width' => 700));
$links[] = new action_link($url, $strenterchat, $action);
$url = new moodle_url($target.'gui_basic/index.php', $params);
$action = new popup_action('click', $url, 'chat'.$course->id.$cm->instance.$currentgroup, array('height' => 500, 'width' => 700));
mod/chat/view.php
+5 -11
View File
@@ -126,18 +126,12 @@ if (has_capability('mod/chat:chat', $context)) {
echo '</p>';
}
if (empty($USER->screenreader)) {
$params['id'] = $chat->id;
$chattarget = new moodle_url("/mod/chat/gui_$CFG->chat_method/index.php", $params);
echo '<p>';
echo $OUTPUT->action_link($chattarget, $strenterchat, new popup_action('click', $chattarget, "chat$course->id$chat->id$groupparam", array('height' => 500, 'width' => 700)));
echo '</p>';
}
$params['id'] = $chat->id;
$chattarget = new moodle_url("/mod/chat/gui_$CFG->chat_method/index.php", $params);
echo '<p>';
echo $OUTPUT->action_link($chattarget, $strenterchat, new popup_action('click', $chattarget, "chat$course->id$chat->id$groupparam", array('height' => 500, 'width' => 700)));
echo '</p>';
// if user is using screen reader, then there is no need to display this link again
// users with screenreader set, will only see 1 link, to the manual refresh page
// for better accessibility
// show frame/js-less alternative
$params['id'] = $chat->id;
$link = new moodle_url('/mod/chat/gui_basic/index.php', $params);
$action = new popup_action('click', $link, "chat{$course->id}{$chat->id}{$groupparam}", array('height' => 500, 'width' => 700));
report/progress/index.php
+3 -2
View File
@@ -326,12 +326,13 @@ foreach($activities as $activity) {
if ($csv) {
print $sep.csv_quote(strip_tags($activity->name)).$sep.csv_quote($datetext);
} else {
$formattedactivityname = format_string($activity->name, true, array('context' => $context));
print '<th scope="col" class="'.$activity->datepassedclass.'">'.
'<a href="'.$CFG->wwwroot.'/mod/'.$activity->modname.
'/view.php?id='.$activity->id.'">'.
'/view.php?id='.$activity->id.'" title="' . $formattedactivityname . '">'.
'<img src="'.$OUTPUT->pix_url('icon', $activity->modname).'" alt="'.
get_string('modulename',$activity->modname).'" /> <span class="completion-activityname">'.
format_string($activity->name).'</span></a>';
$formattedactivityname.'</span></a>';
if ($activity->completionexpected) {
print '<div class="completion-expected"><span>'.$datetext.'</span></div>';
}
user/editlib.php
-7
View File
@@ -216,13 +216,6 @@ function useredit_shared_definition(&$mform, $editoroptions = null, $filemanager
$mform->setType('htmleditor', PARAM_INT);
}
$choices = array();
$choices['0'] = get_string('screenreaderno');
$choices['1'] = get_string('screenreaderyes');
$mform->addElement('select', 'screenreader', get_string('screenreaderuse'), $choices);
$mform->setDefault('screenreader', 0);
$mform->addHelpButton('screenreader', 'screenreaderuse');
$mform->addElement('text', 'city', get_string('city'), 'maxlength="120" size="21"');
$mform->setType('city', PARAM_TEXT);
$mform->addRule('city', $strrequired, 'required', null, 'client');
version.php
+2 -2
View File
@@ -30,11 +30,11 @@
defined('MOODLE_INTERNAL') || die();
$version = 2012092000.00; // YYYYMMDD = weekly release date of this DEV branch
$version = 2012092100.00; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
$release = '2.4dev (Build: 20120920)'; // Human-friendly version name
$release = '2.4dev (Build: 20120921)'; // Human-friendly version name
$branch = '24'; // this version's branch
$maturity = MATURITY_ALPHA; // this version's maturity level