$stage = $mform->addElement('hidden', $name, $value);
if (in_array($name, $intparams)) {
$mform->setType($name, PARAM_INT);
+ } else {
+ // Adding setType() to avoid missing setType() warnings.
+ // MDL-39126: support $mform->setType() for additional backup parameters.
+ $mform->setType($name, PARAM_RAW);
}
}
}
//add the course id (of the context)
$mform->addElement('hidden', 'courseid', $this->_customdata['courseid']);
+ $mform->setType('courseid', PARAM_INT);
$mform->addElement('hidden', 'executesearch', 1);
+ $mform->setType('executesearch', PARAM_INT);
//retrieve the hub list on the hub directory by web service
$function = 'hubdirectory_get_hubs';
$mform->addElement('text', 'search', get_string('keywords', 'block_community'),
array('size' => 30));
$mform->addHelpButton('search', 'keywords', 'block_community');
-
+ $mform->setType('search', PARAM_NOTAGS);
$mform->addElement('submit', 'submitbutton', get_string('search', 'block_community'));
}
$hubname = $hub->hubname;
$mform->addElement('hidden', clean_param($hub->huburl, PARAM_ALPHANUMEXT), $hubname);
+ $mform->setType(clean_param($hub->huburl, PARAM_ALPHANUMEXT), PARAM_ALPHANUMEXT);
if (empty($hubname)) {
$hubname = $hub->huburl;
}
}
$mform->addElement('hidden', 'id', $this->_customdata['id']);
+ $mform->setType('id', PARAM_INT);
if ($share) {
$buttonlabel = get_string('shareonhub', 'hub');
$mform->addElement('hidden', 'share', true);
+ $mform->setType('share', PARAM_BOOL);
} else {
$buttonlabel = get_string('advertiseonhub', 'hub');
$mform->addElement('hidden', 'advertise', true);
+ $mform->setType('advertise', PARAM_BOOL);
}
$this->add_action_buttons(false, $buttonlabel);
//hidden parameters
$mform->addElement('hidden', 'huburl', $huburl);
+ $mform->setType('huburl', PARAM_URL);
$mform->addElement('hidden', 'hubname', $hubname);
+ $mform->setType('hubname', PARAM_TEXT);
//check on the hub if the course has already been published
$registrationmanager = new registration_manager();
$mform->addHelpButton('name', 'name', 'hub');
$mform->addElement('hidden', 'id', $this->_customdata['id']);
+ $mform->setType('id', PARAM_INT);
if ($share) {
$buttonlabel = get_string('shareon', 'hub', !empty($hubname) ? $hubname : $huburl);
$mform->addElement('hidden', 'share', $share);
-
+ $mform->setType('share', PARAM_BOOL);
$mform->addElement('text', 'demourl', get_string('demourl', 'hub'),
array('class' => 'metadatatext'));
$mform->setType('demourl', PARAM_URL);
$buttonlabel = get_string('readvertiseon', 'hub', !empty($hubname) ? $hubname : $huburl);
}
$mform->addElement('hidden', 'advertise', $advertise);
+ $mform->setType('advertise', PARAM_BOOL);
$mform->addElement('hidden', 'courseurl', $CFG->wwwroot . "/course/view.php?id=" . $course->id);
+ $mform->setType('courseurl', PARAM_URL);
$mform->addElement('static', 'courseurlstring', get_string('courseurl', 'hub'));
$mform->setDefault('courseurlstring', new moodle_url("/course/view.php?id=" . $course->id));
$mform->addHelpButton('courseurlstring', 'courseurl', 'hub');
array('class' => 'metadatatext'));
$mform->setDefault('courseshortname', $defaultshortname);
$mform->addHelpButton('courseshortname', 'courseshortname', 'hub');
-
+ $mform->setType('courseshortname', PARAM_TEXT);
$mform->addElement('textarea', 'description', get_string('description'), array('rows' => 10,
'cols' => 57));
$mform->addRule('description', $strrequired, 'required', null, 'client');
$mform->setDefault('publishername', $defaultpublishername);
$mform->addRule('publishername', $strrequired, 'required', null, 'client');
$mform->addHelpButton('publishername', 'publishername', 'hub');
+ $mform->setType('publishername', PARAM_NOTAGS);
$mform->addElement('text', 'publisheremail', get_string('publisheremail', 'hub'),
array('class' => 'metadatatext'));
$mform->setDefault('publisheremail', $defaultpublisheremail);
$mform->addRule('publisheremail', $strrequired, 'required', null, 'client');
$mform->addHelpButton('publisheremail', 'publisheremail', 'hub');
+ $mform->setType('publisheremail', PARAM_EMAIL);
$mform->addElement('text', 'creatorname', get_string('creatorname', 'hub'),
array('class' => 'metadatatext'));
$mform->addRule('creatorname', $strrequired, 'required', null, 'client');
- $mform->setType('creatorname', PARAM_TEXT);
+ $mform->setType('creatorname', PARAM_NOTAGS);
$mform->setDefault('creatorname', $defaultcreatorname);
$mform->addHelpButton('creatorname', 'creatorname', 'hub');
array('class' => 'metadatatext'));
$mform->setDefault('contributornames', $defaultcontributornames);
$mform->addHelpButton('contributornames', 'contributornames', 'hub');
+ $mform->setType('contributornames', PARAM_NOTAGS);
$mform->addElement('text', 'coverage', get_string('tags', 'hub'),
array('class' => 'metadatatext'));
}
$mform->addElement('hidden', 'existingscreenshotnumber', $screenshotsnumber);
+ $mform->setType('existingscreenshotnumber', PARAM_INT);
}
$mform->addElement('filemanager', 'screenshots', get_string('addscreenshots', 'hub'), null,
$hubcourseid = optional_param('hubcourseid', 0, PARAM_INT);
$publicationid = optional_param('publicationid', 0, PARAM_INT);
$timepublished = optional_param('timepublished', 0, PARAM_INT);
+ $publication = new stdClass();
$publication->courseshortname = $course->shortname;
$publication->courseid = $course->id;
$publication->hubname = $hubname;
}
// display course overview files
+ $contentimages = $contentfiles = '';
foreach ($course->get_course_overviewfiles() as $file) {
$isimage = $file->is_valid_image();
$url = file_encode_url("$CFG->wwwroot/pluginfile.php",
'/'. $file->get_contextid(). '/'. $file->get_component(). '/'.
$file->get_filearea(). $file->get_filepath(). $file->get_filename(), !$isimage);
if ($isimage) {
- $content .= html_writer::tag('div',
+ $contentimages .= html_writer::tag('div',
html_writer::empty_tag('img', array('src' => $url)),
array('class' => 'courseimage'));
} else {
- $content .= html_writer::tag('div',
- html_writer::link($url, $file->get_filename()),
- array('class' => 'coursefile'));
+ $image = $this->output->pix_icon(file_file_icon($file, 24), $file->get_filename(), 'moodle');
+ $filename = html_writer::tag('span', $image, array('class' => 'fp-icon')).
+ html_writer::tag('span', $file->get_filename(), array('class' => 'fp-filename'));
+ $contentfiles .= html_writer::tag('span',
+ html_writer::link($url, $filename),
+ array('class' => 'coursefile fp-filename-icon'));
}
}
+ $content .= $contentimages. $contentfiles;
// display course contacts. See course_in_list::get_course_contacts()
if ($course->has_course_contacts()) {
// Courses
if ($chelper->get_show_courses() > core_course_renderer::COURSECAT_SHOW_COURSES_COUNT) {
- $courses = $coursecat->get_courses($chelper->get_courses_display_options());
+ $courses = array();
+ if (!$chelper->get_courses_display_option('nodisplay')) {
+ $courses = $coursecat->get_courses($chelper->get_courses_display_options());
+ }
if ($viewmoreurl = $chelper->get_courses_display_option('viewmoreurl')) {
// the option for 'View more' link was specified, display more link (if it is link to category view page, add category id)
if ($viewmoreurl->compare(new moodle_url('/course/index.php'), URL_MATCH_BASE)) {
if ($grade_item->gradetype == GRADE_TYPE_VALUE) {
// numeric grade
$mform->addElement('text', 'finalgrade', get_string('finalgrade', 'grades'));
+ $mform->setType('finalgrade', PARAM_RAW);
$mform->addHelpButton('finalgrade', 'finalgrade', 'grades');
$mform->disabledIf('finalgrade', 'overridden', 'notchecked');
$radio = array();
$radio[] = $mform->createElement('radio', 'separator', null, get_string('septab', 'grades'), 'tab');
$radio[] = $mform->createElement('radio', 'separator', null, get_string('sepcomma', 'grades'), 'comma');
+ $radio[] = $mform->createElement('radio', 'separator', null, get_string('sepcolon', 'grades'), 'colon');
+ $radio[] = $mform->createElement('radio', 'separator', null, get_string('sepsemicolon', 'grades'), 'semicolon');
$mform->addGroup($radio, 'separator', get_string('separator', 'grades'), ' ', false);
$mform->setDefault('separator', 'comma');
}
$radio = array();
$radio[] = $mform->createElement('radio', 'separator', null, get_string('septab', 'grades'), 'tab');
$radio[] = $mform->createElement('radio', 'separator', null, get_string('sepcomma', 'grades'), 'comma');
+ $radio[] = $mform->createElement('radio', 'separator', null, get_string('sepcolon', 'grades'), 'colon');
+ $radio[] = $mform->createElement('radio', 'separator', null, get_string('sepsemicolon', 'grades'), 'semicolon');
$mform->addGroup($radio, 'separator', get_string('separator', 'grades'), ' ', false);
$mform->setDefault('separator', 'comma');
}
$string['dbprefix'] = 'Префикс табеле';
$string['dirroot'] = 'Moodle директоријум';
$string['environmenthead'] = 'Проверавање Вашег окружења...';
-$string['environmentsub2'] = 'Свака веÑ\80зиÑ\98а Moodlea има минимум захтева по питању одговарајуће PHP верзије и неколико обавезних PHP екстензија.
-Ð\9fÑ\83на пÑ\80овеÑ\80а окÑ\80Ñ\83жеÑ\9aа Ñ\81е вÑ\80Ñ\88и пÑ\80е Ñ\81ваке инÑ\81Ñ\82алаÑ\86иÑ\98е или ажÑ\83Ñ\80иÑ\80аÑ\9aа поÑ\81Ñ\82оÑ\98еÑ\9bе веÑ\80зиÑ\98е. Уколико не знаÑ\82е како да инÑ\81Ñ\82алиÑ\80аÑ\82е новÑ\83 веÑ\80зиÑ\98Ñ\83 или омогÑ\83Ñ\9bиÑ\82е PHP екÑ\82ензиÑ\98е конÑ\82акÑ\82иÑ\80аÑ\98Ñ\82е Ð\92аÑ\88ег Ñ\81еÑ\80веÑ\80 админиÑ\81Ñ\82Ñ\80аÑ\82ора.';
+$string['environmentsub2'] = 'Свако издаÑ\9aе Moodlea има минимум захтева по питању одговарајуће PHP верзије и неколико обавезних PHP екстензија.
+Ð\9aомплеÑ\82на пÑ\80овеÑ\80а окÑ\80Ñ\83жеÑ\9aа Ñ\81е вÑ\80Ñ\88и пÑ\80е Ñ\81ваке инÑ\81Ñ\82алаÑ\86иÑ\98е и надогÑ\80адÑ\9aе поÑ\81Ñ\82оÑ\98еÑ\9bе веÑ\80зиÑ\98е. Уколико не знаÑ\82е како да инÑ\81Ñ\82алиÑ\80аÑ\82е новÑ\83 веÑ\80зиÑ\98Ñ\83 или омогÑ\83Ñ\9bиÑ\82е PHP екÑ\81Ñ\82ензиÑ\98е конÑ\82акÑ\82иÑ\80аÑ\98Ñ\82е Ñ\81вог админиÑ\81Ñ\82Ñ\80аÑ\82оÑ\80а Ñ\81еÑ\80вера.';
$string['errorsinenvironment'] = 'Провера окружења није прошла!';
$string['installation'] = 'Инсталација';
$string['langdownloaderror'] = 'Нажалост, језик "{$a}" се не може преузети. Процес инсталације биће настављен на енглеском језику.';
$string['dbprefix'] = 'Prefiks tabele';
$string['dirroot'] = 'Moodle direktorijum';
$string['environmenthead'] = 'Proveravanje Vašeg okruženja...';
-$string['environmentsub2'] = 'Svaka verzija Moodlea ima minimum zahteva po pitanju odgovarajuće PHP verѕije i nekoliko obaveznih PHP ekstenzija.
-Puna provera okruženja se vrši pre svake instalacije ili ažuriranja postojeće verzije. Ukoliko ne znate kako da instalirate novu verziju ili omogućite PHP ektenzije kontaktirajte Vašeg server administratora.';
+$string['environmentsub2'] = 'Svako izdanje Moodlea ima minimum zahteva po pitanju odgovarajuće PHP verzije i nekoliko obaveznih PHP ekstenzija.
+Kompletna provera okruženja se vrši pre svake instalacije i nadogradnje postojeće verzije. Ukoliko ne znate kako da instalirate novu verziju ili omogućite PHP ekstenzije kontaktirajte svog administratora servera.';
$string['errorsinenvironment'] = 'Provera okruženja nije prošla!';
$string['installation'] = 'Instalacija';
$string['langdownloaderror'] = 'Nažalost, jezik "{$a}" se ne može preuzeti. Proces instalacije biće nastavljen na engleskom jeziku.';
$string['selectauser'] = 'Select a user';
$string['selectdestination'] = 'Select destination of {$a}';
$string['separator'] = 'Separator';
+$string['sepcolon'] = 'Colon';
$string['sepcomma'] = 'Comma';
+$string['sepsemicolon'] = 'Semicolon';
$string['septab'] = 'Tab';
$string['setcategories'] = 'Set categories';
$string['setcategorieserror'] = 'You must first set the categories for your course before you can give weights to them.';
),
'theme' => array(
- 'afterburner', 'anomaly', 'arialist', 'base', 'binarius', 'bootstrap',
- 'boxxie', 'brick', 'canvas', 'formal_white', 'formfactor',
+ 'afterburner', 'anomaly', 'arialist', 'base', 'binarius', 'bootstrapbase',
+ 'boxxie', 'brick', 'canvas', 'clean', 'formal_white', 'formfactor',
'fusion', 'leatherbound', 'magazine', 'mymobile', 'nimble',
- 'nonzero', 'overlay', 'serenity', 'simple', 'sky_high', 'splash',
+ 'nonzero', 'overlay', 'serenity', 'sky_high', 'splash',
'standard', 'standardold'
),
/**
* Navigation passed to print_header.
* Override this to do something more specific than the module view page
+ * like adding more links to the breadcrumb.
*
* @return array
*/
public function get_navigation() {
- $extranav = array('name' => $this->cm->name, 'link' => $this->get_return_url());
+ // No extra navigation by default, link to the course module already included.
+ $extranav = array();
return array($extranav, $this->cm);
}
<licenseversion>3.0+</licenseversion>
</library>
<library>
- <location>theme/bootstrap/less/bootstrap</location>
+ <location>theme/bootstrapbase/less/bootstrap</location>
<name>Twitter Bootstrap</name>
<license>Apache</license>
<version>2.3.0</version>
<licenseversion>2.0</licenseversion>
</library>
<library>
- <location>theme/bootstrap/javascript/html5shiv.js</location>
+ <location>theme/bootstrapbase/javascript/html5shiv.js</location>
<name>Html5Shiv</name>
<license>Apache</license>
<version>3.6.2</version>
<licenseversion>2.0</licenseversion>
</library>
<library>
- <location>theme/bootstrap/javascript/bootstrapcollapse.js</location>
+ <location>theme/bootstrapbase/yui/src/bootstrap/js/bootstrapcollapse.js</location>
<name>Gallery Bootstrap Collapse</name>
<license>BSD</license>
<version>2012.08.22-20-00</version>
<licenseversion></licenseversion>
</library>
<library>
- <location>theme/bootstrap/javascript/bootstrapdropdown.js</location>
+ <location>theme/bootstrapbase/yui/src/bootstrap/js/bootstrapdropdown.js</location>
<name>Gallery Bootstrap Dropdown</name>
<license>BSD</license>
<version>2012.08.22-20-00</version>
<licenseversion></licenseversion>
</library>
<library>
- <location>theme/bootstrap/javascript/bootstrapengine.js</location>
+ <location>theme/bootstrapbase/yui/src/bootstrap/js/bootstrapengine.js</location>
<name>Gallery Bootstrap Engine</name>
<license>BSD</license>
<version>2012.08.22-20-00</version>
'modcontext' => $modcontext,
'forum' => $forum,
'post' => $post,
- 'thresholdwarning' => $thresholdwarning), 'post', '', array('id' => 'mformforum'));
+ 'thresholdwarning' => $thresholdwarning,
+ 'edit' => $edit), 'post', '', array('id' => 'mformforum'));
$draftitemid = file_get_submitted_draft_itemid('attachments');
file_prepare_draft_area($draftitemid, $modcontext->id, 'mod_forum', 'attachment', empty($post->id)?null:$post->id, mod_forum_post_form::attachment_options($forum));
echo $OUTPUT->notification(get_string('qandanotify','forum'));
}
-if (!empty($thresholdwarning)) {
+// If there is a warning message and we are not editing a post we need to handle the warning.
+if (!empty($thresholdwarning) && !$edit) {
+ // Here we want to throw an exception if they are no longer allowed to post.
if (!$thresholdwarning->canpost) {
print_error($thresholdwarning->errorcode, $thresholdwarning->module, $thresholdwarning->link,
$thresholdwarning->additional);
$modcontext = $this->_customdata['modcontext'];
$forum = $this->_customdata['forum'];
$post = $this->_customdata['post'];
+ $edit = $this->_customdata['edit'];
$thresholdwarning = $this->_customdata['thresholdwarning'];
$mform->addElement('header', 'general', '');//fill in the data depending on page params later using set_data
- if (!empty($thresholdwarning)) {
+ // If there is a warning message and we are not editing a post we need to handle the warning.
+ if (!empty($thresholdwarning) && !$edit) {
+ // Here we want to display a warning if they can still post but have reached the warning threshold.
if ($thresholdwarning->canpost) {
$message = get_string($thresholdwarning->errorcode, $thresholdwarning->module, $thresholdwarning->additional);
$mform->addElement('html', $OUTPUT->notification($message));
// NOTE: this is an extremely nasty hack! It is not a bug if this confirmation fails badly. --skodak.
$confirm_regrade = optional_param('confirm_regrade', 0, PARAM_INT);
if (!$confirm_regrade) {
- $message = get_string('gradeitemislocked', 'grades');
- $back_link = $CFG->wwwroot . '/mod/quiz/report.php?q=' . $quiz->id .
- '&mode=overview';
- $regrade_link = qualified_me() . '&confirm_regrade=1';
- echo $OUTPUT->box_start('generalbox', 'notice');
- echo '<p>'. $message .'</p>';
- echo $OUTPUT->container_start('buttons');
- echo $OUTPUT->single_button($regrade_link, get_string('regradeanyway', 'grades'));
- echo $OUTPUT->single_button($back_link, get_string('cancel'));
- echo $OUTPUT->container_end();
- echo $OUTPUT->box_end();
-
+ if (!AJAX_SCRIPT) {
+ $message = get_string('gradeitemislocked', 'grades');
+ $back_link = $CFG->wwwroot . '/mod/quiz/report.php?q=' . $quiz->id .
+ '&mode=overview';
+ $regrade_link = qualified_me() . '&confirm_regrade=1';
+ echo $OUTPUT->box_start('generalbox', 'notice');
+ echo '<p>'. $message .'</p>';
+ echo $OUTPUT->container_start('buttons');
+ echo $OUTPUT->single_button($regrade_link, get_string('regradeanyway', 'grades'));
+ echo $OUTPUT->single_button($back_link, get_string('cancel'));
+ echo $OUTPUT->container_end();
+ echo $OUTPUT->box_end();
+ }
return GRADE_UPDATE_ITEM_LOCKED;
}
}
print '<table id="completion-progress" class="generaltable flexible boxaligncenter completionreport" style="text-align: left" cellpadding="5" border="1">';
// Print criteria group names
- print PHP_EOL.'<tr style="vertical-align: top">';
+ print PHP_EOL.'<thead><tr style="vertical-align: top">';
echo '<th scope="row" class="rowheader" colspan="' . $leftcols . '">' .
get_string('criteriagroup', 'completion') . '</th>';
print '<img src="'.$OUTPUT->pix_url('i/course').'" class="icon" alt="'.get_string('course').'" title="'.get_string('coursecomplete', 'completion').'" />';
print '</th>';
- print '</tr>';
+ print '</tr></thead>';
+ echo '<tbody>';
} else {
// The CSV headers
$row = array();
if ($csv) {
$export->download_file();
+} else {
+ echo '</tbody>';
}
print '</table>';
}
print '<div id="completion-progress-wrapper" class="no-overflow">';
- print '<table id="completion-progress" class="generaltable flexible boxaligncenter" style="text-align:left"><tr style="vertical-align:top">';
+ print '<table id="completion-progress" class="generaltable flexible boxaligncenter" style="text-align:left"><thead><tr style="vertical-align:top">';
// User heading / sort option
print '<th scope="col" class="completion-sortchoice">';
if ($csv) {
print $line;
} else {
- print '</tr>';
+ print '</tr></thead><tbody>';
}
// Row for each user
if ($csv) {
exit;
}
-print '</table>';
+print '</tbody></table>';
print '</div>';
print $pagingbar;
+++ /dev/null
-// We need to actually use the code manually here as this is tricky do in
-// themes at present.
-YUI().use('moodle-theme_bootstrap-bootstrap', function(Y) {
- Y.Moodle.theme_bootstrap.bootstrap.init();
-});
+++ /dev/null
-
-Analyzing the following files: style/generated.css
-
-Error reading file: style/generated.css
-
+++ /dev/null
-The generated.css file is created from .less files via the method described in the readme
-in the /less/ folder. It's unwise to directly the edit the generated.css as your changes
-may be overwritten.
*less CSS
Less CSS is a Object Oriented way of writing CSS code. All Less CSS files
-for this theme are stored in the /less folder. A developer can run a command
-line script to generate the single CSS file called /style/generated.css. For more
+for this theme are stored in the /less folder. A developer can use recess
+to generate the CSS files in the /style folder. For more
information read /less/README
JavaScript Libraries
$THEME->doctype = 'html5';
$THEME->yuicssmodules = array();
-$THEME->name = 'bootstrap';
+$THEME->name = 'bootstrapbase';
$THEME->parents = array('');
-$THEME->sheets = array('generated');
+$THEME->sheets = array('moodle');
$THEME->supportscssoptimisation = false;
$THEME->editor_sheets = array('editor');
--- /dev/null
+// We need to actually use the code manually here as this is tricky do in
+// themes at present.
+YUI().use('moodle-theme_bootstrapbase-bootstrap', function(Y) {
+ Y.Moodle.theme_bootstrapbase.bootstrap.init();
+});
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-$string['pluginname'] = 'Bootstrap';
+$string['pluginname'] = 'Bootstrap Base';
$string['region-side-post'] = 'Right';
$string['region-side-pre'] = 'Left';
$string['choosereadme'] = '
-<div class="clearfix"><div class="theme_screenshot"><h2>Bootstrap</h2>
+<div class="clearfix"><div class="theme_screenshot"><h2>Bootstrap Base</h2>
<img class=img-polaroid src="bootstrap/pix/screenshot.jpg" />
<h3>Theme Credits</h3>
<p>
If you want to make changes to the .css generated from these .less files then you
need to install recess (https://github.com/twitter/recess) to compile the .less files,
-then run these commands in the bootstrap/less/ folder:
+then run these commands in the bootstrapbase/less/ folder:
-recess --compile --compress moodle.less > ../style/generated.css
+recess --compile --compress moodle.less > ../style/moodle.css
You can add --watch to make sure it updates every time you make a change.
To update to the latest release of twitter bootstrap:
* remove all files from less/bootstrap,
* download the new less files and store them in less/bootstrap
-* regenerate files using recess: recess --compile --compress moodle.less > ../style/generated.css **
+* regenerate files using recess: recess --compile --compress moodle.less > ../style/moodle.css **
+* regenerate files using recess: recess --compile --compress editor.less > ../style/editor.css **
* update lib/thirdpartylibs.xml
** If you want to make changes to the .css generated from these .less files then you
need to install recess (https://github.com/twitter/recess) to compile the .less files,
-then run these commands in the bootstrap/less/ folder:
+then run these commands in the bootstrapbase/less/ folder:
html5shiv.js
functionality consider switching to the original jQuery version of these file
If you do want to update use these file locations:
-theme/bootstrap/yui/src/bootstrap/js/bootstrap-collapse.js
-theme/bootstrap/yui/src/bootstrap/js/bootstrap-dropdown.js
-theme/bootstrap/yui/src/bootstrap/js/bootstrap-engine.js
+theme/bootstrapbase/yui/src/bootstrap/js/bootstrap-collapse.js
+theme/bootstrapbase/yui/src/bootstrap/js/bootstrap-dropdown.js
+theme/bootstrapbase/yui/src/bootstrap/js/bootstrap-engine.js
/**
* Renderers to align Moodle's HTML with that expected by Bootstrap
*
- * @package theme_bootstrap
+ * @package theme_bootstrapbase
* @copyright 2012
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
/**
* Renderers to align Moodle's HTML with that expected by Bootstrap
*
- * @package theme_bootstrap
+ * @package theme_bootstrapbase
* @copyright 2012
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class theme_bootstrap_core_renderer extends core_renderer {
+class theme_bootstrapbase_core_renderer extends core_renderer {
/*
* This renders a notification message.
--- /dev/null
+These css files are created from .less files via the method described in the readme
+in the /theme/bootstrap/less/ folder. It's unwise to directly the edit the css files as your changes
+may be overwritten.
* Theme version info
*
* @package theme
- * @subpackage bootstrap
+ * @subpackage bootstrapbase
* @copyright 2013 Bas Brands, www.basbrands.nl
* @authors Bas Brands, David Scotson
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
$plugin->version = 2013032800;
$plugin->requires = 2012112900;
-$plugin->component = 'theme_bootstrap';
+$plugin->component = 'theme_bootstrapbase';
{
- "name": "moodle-theme_bootstrap-bootstrap",
+ "name": "moodle-theme_bootstrapbase-bootstrap",
"builds": {
- "moodle-theme_bootstrap-bootstrap": {
+ "moodle-theme_bootstrapbase-bootstrap": {
"prependfiles": [
"bootstrapengine.js",
"bootstrapcollapse.js",
The Moodle Bootstrap theme's bootstrap JavaScript
@namespace Moodle
-@module theme_bootstrap-bootstrap
+@module theme_bootstrapbase-bootstrap
**/
/**
The Moodle Bootstrap theme's bootstrap JavaScript
-@class Moodle.theme_bootstrap.bootstrap
+@class Moodle.theme_bootstrapbase.bootstrap
@uses node
@uses selector-css3
@constructor
TOGGLECOLLAPSE: '*[data-disabledtoggle="collapse"]',
NAV_COLLAPSE: '.nav-collapse'
},
- NS = Y.namespace('Moodle.theme_bootstrap.bootstrap');
+ NS = Y.namespace('Moodle.theme_bootstrapbase.bootstrap');
/**
* Initialise the Moodle Bootstrap theme JavaScript
{
- "moodle-theme_bootstrap-bootstrap": {
+ "moodle-theme_bootstrapbase-bootstrap": {
"requires": [
"node",
"selector-css3"
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Moodle's Simple theme, an example of how to make a Bootstrap theme
+ * Moodle's Clean theme, an example of how to make a Bootstrap theme
*
* DO NOT MODIFY THIS THEME!
* COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
//////////////////////////////////
//
$THEME->doctype = 'html5';
-$THEME->parents = array('bootstrap');
+$THEME->parents = array('bootstrapbase');
$THEME->sheets = array('custom');
$THEME->supportscssoptimisation = false;
$THEME->yuicssmodules = array();
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Moodle's Simple theme, an example of how to make a Bootstrap theme
+ * Moodle's Clean theme, an example of how to make a Bootstrap theme
*
* DO NOT MODIFY THIS THEME!
* COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
* For full information about creating Moodle themes, see:
* http://docs.moodle.org/dev/Themes_2.0
*
- * @package theme_simple
+ * @package theme_clean
* @copyright 2013 Moodle, moodle.org
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
<?php if ($layout !== 'content-only') {
if ($layout === 'pre-and-post') { ?>
- <aside id="region-pre" class="span4 desktop-first-column">
+ <aside class="span4 desktop-first-column">
<?php } else if ($layout === 'side-pre-only') { ?>
- <aside id="region-pre" class="span3 desktop-first-column">
+ <aside class="span3 desktop-first-column">
<?php } ?>
<div id="region-pre" class="block-region">
<div class="region-content">
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Moodle's Simple theme, an example of how to make a Bootstrap theme
+ * Moodle's Clean theme, an example of how to make a Bootstrap theme
*
* DO NOT MODIFY THIS THEME!
* COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Moodle's Simple theme, an example of how to make a Bootstrap theme
+ * Moodle's Clean theme, an example of how to make a Bootstrap theme
*
* DO NOT MODIFY THIS THEME!
* COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Moodle's Simple theme, an example of how to make a Bootstrap theme
+ * Moodle's Clean theme, an example of how to make a Bootstrap theme
*
* DO NOT MODIFY THIS THEME!
* COPY IT FIRST, THEN RENAME THE COPY AND MODIFY IT INSTEAD.
defined('MOODLE_INTERNAL') || die();
-$version = 2013042500.00; // YYYYMMDD = weekly release date of this DEV branch
+$version = 2013042600.00; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
-$release = '2.5beta+ (Build: 20130425)';// Human-friendly version name
+$release = '2.5beta+ (Build: 20130426)';// Human-friendly version name
$branch = '25'; // this version's branch
$maturity = MATURITY_BETA; // this version's maturity level
