mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-41562 file resource: fix page heading levels.

Browse Source 
Also removing printheading options setting.
This commit is contained in:
Rossiani Wijaya 2013-09-05 12:56:56 +08:00 committed by Dan Poltawski
parent 89cb942c6d
commit b25e7d8599
8 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/resource/backup/moodle1/lib.php
View File

@ -145,7 +145,7 @@ class moodle1_mod_resource_handler extends moodle1_mod_handler {
$resource['timemodified'] = $data['timemodified'];
// populate display and displayoptions fields
$options = array('printheading' => 0, 'printintro' => 1);
$options = array('printintro' => 1);
if ($data['options'] == 'frame') {
$resource['display'] = RESOURCELIB_DISPLAY_FRAME;

1
mod/resource/index.php
View File

@ -47,6 +47,7 @@ $PAGE->set_title($course->shortname.': '.$strresources);
$PAGE->set_heading($course->fullname);
$PAGE->navbar->add($strresources);
echo $OUTPUT->header();
echo $OUTPUT->heading($strresources);
if (!$resources = get_all_instances_in_course('resource', $course)) {
notice(get_string('thereareno', 'moodle', $strresources), "$CFG->wwwroot/course/view.php?id=$course->id");

2
mod/resource/lang/en/resource.php
View File

@ -88,8 +88,6 @@ $string['popupresource'] = 'This resource should appear in a popup window.';
$string['popupresourcelink'] = 'If it didn\'t, click here: {$a}';
$string['popupwidth'] = 'Pop-up width (in pixels)';
$string['popupwidthexplain'] = 'Specifies default width of popup windows.';
$string['printheading'] = 'Display resource name';
$string['printheadingexplain'] = 'Display resource name above content? Some display types may not display resource name even if enabled.';
$string['printintro'] = 'Display resource description';
$string['printintroexplain'] = 'Display resource description below content? Some display types may not display description even if enabled.';
$string['resource:addinstance'] = 'Add a new resource';

2
mod/resource/lib.php
View File

@ -136,7 +136,6 @@ function resource_set_display_options($data) {
$displayoptions['popupheight'] = $data->popupheight;
}
if (in_array($data->display, array(RESOURCELIB_DISPLAY_AUTO, RESOURCELIB_DISPLAY_EMBED, RESOURCELIB_DISPLAY_FRAME))) {
$displayoptions['printheading'] = (int)!empty($data->printheading);
$displayoptions['printintro'] = (int)!empty($data->printintro);
}
if (!empty($data->showsize)) {
@ -510,7 +509,6 @@ function resource_dndupload_handle($uploadinfo) {
$data->display = $config->display;
$data->popupheight = $config->popupheight;
$data->popupwidth = $config->popupwidth;
$data->printheading = $config->printheading;
$data->printintro = $config->printintro;
$data->showsize = (isset($config->showsize)) ? $config->showsize : 0;
$data->showtype = (isset($config->showtype)) ? $config->showtype : 0;

10
mod/resource/locallib.php
View File

@ -263,16 +263,12 @@ function resource_print_header($resource, $cm, $course) {
* @param object $resource
* @param object $cm
* @param object $course
* @param bool $ignoresettings print even if not specified in modedit
* @param bool $notused This variable is no longer used
* @return void
*/
function resource_print_heading($resource, $cm, $course, $ignoresettings=false) {
function resource_print_heading($resource, $cm, $course, $notused = false) {
global $OUTPUT;
$options = empty($resource->displayoptions) ? array() : unserialize($resource->displayoptions);
if ($ignoresettings or !empty($options['printheading'])) {
echo $OUTPUT->heading(format_string($resource->name), 2, 'main', 'resourceheading');
}
echo $OUTPUT->heading(format_string($resource->name), 2);
}
/**

10
mod/resource/mod_form.php
View File

@ -125,13 +125,6 @@ class mod_resource_mod_form extends moodleform_mod {
if (array_key_exists(RESOURCELIB_DISPLAY_AUTO, $options) or
array_key_exists(RESOURCELIB_DISPLAY_EMBED, $options) or
array_key_exists(RESOURCELIB_DISPLAY_FRAME, $options)) {
$mform->addElement('checkbox', 'printheading', get_string('printheading', 'resource'));
$mform->disabledIf('printheading', 'display', 'eq', RESOURCELIB_DISPLAY_POPUP);
$mform->disabledIf('printheading', 'display', 'eq', RESOURCELIB_DISPLAY_DOWNLOAD);
$mform->disabledIf('printheading', 'display', 'eq', RESOURCELIB_DISPLAY_OPEN);
$mform->disabledIf('printheading', 'display', 'eq', RESOURCELIB_DISPLAY_NEW);
$mform->setDefault('printheading', $config->printheading);
$mform->addElement('checkbox', 'printintro', get_string('printintro', 'resource'));
$mform->disabledIf('printintro', 'display', 'eq', RESOURCELIB_DISPLAY_POPUP);
$mform->disabledIf('printintro', 'display', 'eq', RESOURCELIB_DISPLAY_DOWNLOAD);
@ -168,9 +161,6 @@ class mod_resource_mod_form extends moodleform_mod {
if (isset($displayoptions['printintro'])) {
$default_values['printintro'] = $displayoptions['printintro'];
}
if (isset($displayoptions['printheading'])) {
$default_values['printheading'] = $displayoptions['printheading'];
}
if (!empty($displayoptions['popupwidth'])) {
$default_values['popupwidth'] = $displayoptions['popupwidth'];
}

2
mod/resource/settings.php
View File

@ -56,8 +56,6 @@ if ($ADMIN->fulltree) {
//--- modedit defaults -----------------------------------------------------------------------------------
$settings->add(new admin_setting_heading('resourcemodeditdefaults', get_string('modeditdefaults', 'admin'), get_string('condifmodeditdefaults', 'admin')));
$settings->add(new admin_setting_configcheckbox('resource/printheading',
get_string('printheading', 'resource'), get_string('printheadingexplain', 'resource'), 0));
$settings->add(new admin_setting_configcheckbox('resource/printintro',
get_string('printintro', 'resource'), get_string('printintroexplain', 'resource'), 1));
$settings->add(new admin_setting_configselect('resource/display',

3
mod/resource/tests/generator/lib.php
View File

@ -77,9 +77,6 @@ class mod_resource_generator extends testing_module_generator {
} else {
$record->cmidnumber = '';
}
if (!isset($record->printheading)) {
$record->printheading = 1;
}
if (!isset($record->printintro)) {
$record->printintro = 0;
}