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

Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk
2013-09-10 11:22:04 +12:00
parent bee0a508ef 66e2b9f8c2
commit a775f2c96d
19 changed files with 62 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/data/edit.php
+3 -4
View File
@@ -249,10 +249,9 @@ if ($datarecord = data_submitted() and confirm_sesskey()) {
/// Print the page header
echo $OUTPUT->header();
groups_print_activity_menu($cm, $CFG->wwwroot.'/mod/data/edit.php?d='.$data->id);
echo $OUTPUT->heading(format_string($data->name));
echo $OUTPUT->heading(format_string($data->name), 2);
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
groups_print_activity_menu($cm, $CFG->wwwroot.'/mod/data/edit.php?d='.$data->id);
/// Print the tabs
@@ -277,7 +276,7 @@ echo '<input name="sesskey" value="'.sesskey().'" type="hidden" />';
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
if (!$rid){
echo $OUTPUT->heading(get_string('newentry','data'), 2);
echo $OUTPUT->heading(get_string('newentry','data'), 3);
}
/******************************************
mod/data/export.php
+3 -2
View File
@@ -84,10 +84,11 @@ if($mform->is_cancelled()) {
$PAGE->set_title($data->name);
$PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($data->name), 2);
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
$url = new moodle_url('/mod/data/export.php', array('d' => $d));
groups_print_activity_menu($cm, $url);
echo $OUTPUT->heading(format_string($data->name));
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
// these are for the tab display
$currentgroup = groups_get_activity_group($cm);
mod/data/index.php
+1
View File
@@ -50,6 +50,7 @@ $PAGE->navbar->add($strdata, new moodle_url('/mod/data/index.php', array('id'=>$
$PAGE->set_title($strdata);
$PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
echo $OUTPUT->heading($strdataplural, 2);
if (! $datas = get_all_instances_in_course("data", $course)) {
notice(get_string('thereareno', 'moodle',$strdataplural) , "$CFG->wwwroot/course/view.php?id=$course->id");
mod/data/lib.php
+4 -5
View File
@@ -279,7 +279,7 @@ class data_field_base { // Base class for Database Field Types (see field/*/
echo '<input type="hidden" name="type" value="'.$this->type.'" />'."\n";
echo '<input name="sesskey" value="'.sesskey().'" type="hidden" />'."\n";
echo $OUTPUT->heading($this->name());
echo $OUTPUT->heading($this->name(), 3);
require_once($CFG->dirroot.'/mod/data/field/'.$this->type.'/mod.html');
@@ -1997,14 +1997,13 @@ function data_print_header($course, $cm, $data, $currenttab='') {
$PAGE->set_title($data->name);
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($data->name));
echo $OUTPUT->heading(format_string($data->name), 2);
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
// Groups needed for Add entry tab
// Groups needed for Add entry tab
$currentgroup = groups_get_activity_group($cm);
$groupmode = groups_get_activity_groupmode($cm);
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
// Print the tabs
if ($currenttab) {
mod/data/preset.php
+4 -4
View File
@@ -97,7 +97,7 @@ $form_save->set_data(array('d' => $data->id, 'name'=>$data->name));
/* Output */
if (!$form_export->is_submitted()) {
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($data->name));
echo $OUTPUT->heading(format_string($data->name), 2);
// Needed for tabs.php
$currenttab = 'presets';
@@ -243,13 +243,13 @@ if (optional_param('sesskey', false, PARAM_BOOL) && confirm_sesskey()) {
}
// Export forms
echo $OUTPUT->heading(get_string('export', 'data'));
echo $OUTPUT->heading(get_string('export', 'data'), 3);
$form_export->display();
$form_save->display();
// Import forms
echo $OUTPUT->heading(get_string('import'));
echo $OUTPUT->heading(get_string('import'), 3);
$form_importzip->display();
$form_importexisting->display();
echo $OUTPUT->footer();
echo $OUTPUT->footer();
mod/data/renderer.php
+1 -1
View File
@@ -32,7 +32,7 @@ class mod_data_renderer extends plugin_renderer_base {
}
if (!empty($newfields)) {
$html .= $this->output->heading_with_help($strfieldmappings, 'fieldmappings', 'data');
$html .= $this->output->heading_with_help($strfieldmappings, 'fieldmappings', 'data', '', '', 3);
$table = new html_table();
$table->data = array();
mod/data/styles.css
+1 -1
View File
@@ -66,4 +66,4 @@
.dir-rtl .mod-data-default-template .template-field {text-align:left;}
.dir-rtl .mod-data-default-template .template-token {text-align:right;}
.dir-rtl .mod-data-default-template searchcontrols {text-align:left;}
.dir-rtl .mod-data-default-template searchcontrols {text-align:left;}
mod/data/templates.php
+2 -4
View File
@@ -92,15 +92,13 @@ $PAGE->set_title($data->name);
$PAGE->set_heading($course->fullname);
$PAGE->set_pagelayout('report');
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($data->name));
echo $OUTPUT->heading(format_string($data->name), 2);
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
/// Groups needed for Add entry tab
$currentgroup = groups_get_activity_group($cm);
$groupmode = groups_get_activity_groupmode($cm);
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
/// Print the tabs.
$currenttab = 'templates';
include('tabs.php');
mod/data/view.php
+4 -3
View File
@@ -325,8 +325,6 @@
echo $OUTPUT->header();
/// Check to see if groups are being used here
$returnurl = $CFG->wwwroot . '/mod/data/view.php?d='.$data->id.'&amp;search='.s($search).'&amp;sort='.s($sort).'&amp;order='.s($order).'&amp;';
groups_print_activity_menu($cm, $returnurl);
$currentgroup = groups_get_activity_group($cm);
$groupmode = groups_get_activity_groupmode($cm);
$canmanageentries = has_capability('mod/data:manageentries', $context);
@@ -345,7 +343,7 @@
}
}
echo $OUTPUT->heading(format_string($data->name));
echo $OUTPUT->heading(format_string($data->name), 2);
// Do we need to show a link to the RSS feed for the records?
//this links has been Settings (database activity administration) block
@@ -361,6 +359,9 @@
$options->noclean = true;
}
echo $OUTPUT->box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
$returnurl = $CFG->wwwroot . '/mod/data/view.php?d='.$data->id.'&amp;search='.s($search).'&amp;sort='.s($sort).'&amp;order='.s($order).'&amp;';
groups_print_activity_menu($cm, $returnurl);
/// Delete any requested records