Merge branch 'MDL-39355-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Apr 2013 23:07:26 +0000 (11:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Apr 2013 23:07:26 +0000 (11:07 +1200)
145 files changed:
backup/util/ui/base_moodleform.class.php
blocks/community/forms.php
course/publish/forms.php
course/publish/index.php
course/renderer.php
grade/edit/tree/grade_form.php
grade/export/grade_export_form.php
grade/import/grade_import_form.php
install/lang/sr_cr/install.php
install/lang/sr_lt/install.php
lang/en/grades.php
lib/pluginlib.php
lib/portfolio/caller.php
lib/thirdpartylibs.xml
mod/forum/post.php
mod/forum/post_form.php
mod/quiz/lib.php
report/completion/index.php
report/progress/index.php
theme/bootstrap/javascript/moodlebootstrap.js [deleted file]
theme/bootstrap/less/moodle/recess.txt [deleted file]
theme/bootstrap/style/README [deleted file]
theme/bootstrapbase/README.txt [moved from theme/bootstrap/README.txt with 97% similarity]
theme/bootstrapbase/config.php [moved from theme/bootstrap/config.php with 98% similarity]
theme/bootstrapbase/javascript/html5shiv.js [moved from theme/bootstrap/javascript/html5shiv.js with 100% similarity]
theme/bootstrapbase/javascript/moodlebootstrap.js [new file with mode: 0644]
theme/bootstrapbase/lang/en/theme_bootstrapbase.php [moved from theme/bootstrap/lang/en/theme_bootstrap.php with 97% similarity]
theme/bootstrapbase/layout/general.php [moved from theme/bootstrap/layout/general.php with 100% similarity]
theme/bootstrapbase/less/README [moved from theme/bootstrap/less/README with 85% similarity]
theme/bootstrapbase/less/bootstrap/accordion.less [moved from theme/bootstrap/less/bootstrap/accordion.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/alerts.less [moved from theme/bootstrap/less/bootstrap/alerts.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/bootstrap.less [moved from theme/bootstrap/less/bootstrap/bootstrap.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/breadcrumbs.less [moved from theme/bootstrap/less/bootstrap/breadcrumbs.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/button-groups.less [moved from theme/bootstrap/less/bootstrap/button-groups.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/buttons.less [moved from theme/bootstrap/less/bootstrap/buttons.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/carousel.less [moved from theme/bootstrap/less/bootstrap/carousel.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/close.less [moved from theme/bootstrap/less/bootstrap/close.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/code.less [moved from theme/bootstrap/less/bootstrap/code.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/component-animations.less [moved from theme/bootstrap/less/bootstrap/component-animations.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/dropdowns.less [moved from theme/bootstrap/less/bootstrap/dropdowns.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/forms.less [moved from theme/bootstrap/less/bootstrap/forms.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/grid.less [moved from theme/bootstrap/less/bootstrap/grid.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/hero-unit.less [moved from theme/bootstrap/less/bootstrap/hero-unit.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/labels-badges.less [moved from theme/bootstrap/less/bootstrap/labels-badges.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/layouts.less [moved from theme/bootstrap/less/bootstrap/layouts.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/media.less [moved from theme/bootstrap/less/bootstrap/media.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/mixins.less [moved from theme/bootstrap/less/bootstrap/mixins.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/modals.less [moved from theme/bootstrap/less/bootstrap/modals.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/navbar.less [moved from theme/bootstrap/less/bootstrap/navbar.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/navs.less [moved from theme/bootstrap/less/bootstrap/navs.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/pager.less [moved from theme/bootstrap/less/bootstrap/pager.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/pagination.less [moved from theme/bootstrap/less/bootstrap/pagination.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/popovers.less [moved from theme/bootstrap/less/bootstrap/popovers.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/progress-bars.less [moved from theme/bootstrap/less/bootstrap/progress-bars.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/reset.less [moved from theme/bootstrap/less/bootstrap/reset.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive-1200px-min.less [moved from theme/bootstrap/less/bootstrap/responsive-1200px-min.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive-767px-max.less [moved from theme/bootstrap/less/bootstrap/responsive-767px-max.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive-768px-979px.less [moved from theme/bootstrap/less/bootstrap/responsive-768px-979px.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive-navbar.less [moved from theme/bootstrap/less/bootstrap/responsive-navbar.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive-utilities.less [moved from theme/bootstrap/less/bootstrap/responsive-utilities.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/responsive.less [moved from theme/bootstrap/less/bootstrap/responsive.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/scaffolding.less [moved from theme/bootstrap/less/bootstrap/scaffolding.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/sprites.less [moved from theme/bootstrap/less/bootstrap/sprites.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/tables.less [moved from theme/bootstrap/less/bootstrap/tables.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/thumbnails.less [moved from theme/bootstrap/less/bootstrap/thumbnails.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/tooltip.less [moved from theme/bootstrap/less/bootstrap/tooltip.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/type.less [moved from theme/bootstrap/less/bootstrap/type.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/utilities.less [moved from theme/bootstrap/less/bootstrap/utilities.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/variables.less [moved from theme/bootstrap/less/bootstrap/variables.less with 100% similarity]
theme/bootstrapbase/less/bootstrap/wells.less [moved from theme/bootstrap/less/bootstrap/wells.less with 100% similarity]
theme/bootstrapbase/less/editor.less [moved from theme/bootstrap/less/editor.less with 100% similarity]
theme/bootstrapbase/less/moodle.less [moved from theme/bootstrap/less/moodle.less with 100% similarity]
theme/bootstrapbase/less/moodle/admin.less [moved from theme/bootstrap/less/moodle/admin.less with 100% similarity]
theme/bootstrapbase/less/moodle/backup-restore.less [moved from theme/bootstrap/less/moodle/backup-restore.less with 100% similarity]
theme/bootstrapbase/less/moodle/blocks.less [moved from theme/bootstrap/less/moodle/blocks.less with 100% similarity]
theme/bootstrapbase/less/moodle/buttons.less [moved from theme/bootstrap/less/moodle/buttons.less with 100% similarity]
theme/bootstrapbase/less/moodle/calendar.less [moved from theme/bootstrap/less/moodle/calendar.less with 100% similarity]
theme/bootstrapbase/less/moodle/core.less [moved from theme/bootstrap/less/moodle/core.less with 100% similarity]
theme/bootstrapbase/less/moodle/course.less [moved from theme/bootstrap/less/moodle/course.less with 100% similarity]
theme/bootstrapbase/less/moodle/debug.less [moved from theme/bootstrap/less/moodle/debug.less with 100% similarity]
theme/bootstrapbase/less/moodle/expendable.less [moved from theme/bootstrap/less/moodle/expendable.less with 100% similarity]
theme/bootstrapbase/less/moodle/filemanager.less [moved from theme/bootstrap/less/moodle/filemanager.less with 100% similarity]
theme/bootstrapbase/less/moodle/forms.less [moved from theme/bootstrap/less/moodle/forms.less with 100% similarity]
theme/bootstrapbase/less/moodle/grade.less [moved from theme/bootstrap/less/moodle/grade.less with 100% similarity]
theme/bootstrapbase/less/moodle/message.less [moved from theme/bootstrap/less/moodle/message.less with 100% similarity]
theme/bootstrapbase/less/moodle/modules.less [moved from theme/bootstrap/less/moodle/modules.less with 100% similarity]
theme/bootstrapbase/less/moodle/question.less [moved from theme/bootstrap/less/moodle/question.less with 100% similarity]
theme/bootstrapbase/less/moodle/responsive.less [moved from theme/bootstrap/less/moodle/responsive.less with 100% similarity]
theme/bootstrapbase/less/moodle/tables.less [moved from theme/bootstrap/less/moodle/tables.less with 100% similarity]
theme/bootstrapbase/less/moodle/tabs.less [moved from theme/bootstrap/less/moodle/tabs.less with 100% similarity]
theme/bootstrapbase/less/moodle/undo.less [moved from theme/bootstrap/less/moodle/undo.less with 100% similarity]
theme/bootstrapbase/less/moodle/user.less [moved from theme/bootstrap/less/moodle/user.less with 100% similarity]
theme/bootstrapbase/less/moodle/yui_fixes.less [moved from theme/bootstrap/less/moodle/yui_fixes.less with 100% similarity]
theme/bootstrapbase/pix/favicon.ico [moved from theme/bootstrap/pix/favicon.ico with 100% similarity]
theme/bootstrapbase/pix/fp/alias.png [moved from theme/bootstrap/pix/fp/alias.png with 100% similarity]
theme/bootstrapbase/pix/fp/alias_sm.png [moved from theme/bootstrap/pix/fp/alias_sm.png with 100% similarity]
theme/bootstrapbase/pix/fp/check.png [moved from theme/bootstrap/pix/fp/check.png with 100% similarity]
theme/bootstrapbase/pix/fp/cross.png [moved from theme/bootstrap/pix/fp/cross.png with 100% similarity]
theme/bootstrapbase/pix/fp/dnd_arrow.gif [moved from theme/bootstrap/pix/fp/dnd_arrow.gif with 100% similarity]
theme/bootstrapbase/pix/fp/link.png [moved from theme/bootstrap/pix/fp/link.png with 100% similarity]
theme/bootstrapbase/pix/fp/link_sm.png [moved from theme/bootstrap/pix/fp/link_sm.png with 100% similarity]
theme/bootstrapbase/pix/fp/path_folder.png [moved from theme/bootstrap/pix/fp/path_folder.png with 100% similarity]
theme/bootstrapbase/pix/fp/path_folder_rtl.png [moved from theme/bootstrap/pix/fp/path_folder_rtl.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_icon_active.png [moved from theme/bootstrap/pix/fp/view_icon_active.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_icon_inactive.png [moved from theme/bootstrap/pix/fp/view_icon_inactive.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_icon_selected.png [moved from theme/bootstrap/pix/fp/view_icon_selected.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_list_active.png [moved from theme/bootstrap/pix/fp/view_list_active.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_list_inactive.png [moved from theme/bootstrap/pix/fp/view_list_inactive.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_list_selected.png [moved from theme/bootstrap/pix/fp/view_list_selected.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_tree_active.png [moved from theme/bootstrap/pix/fp/view_tree_active.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_tree_inactive.png [moved from theme/bootstrap/pix/fp/view_tree_inactive.png with 100% similarity]
theme/bootstrapbase/pix/fp/view_tree_selected.png [moved from theme/bootstrap/pix/fp/view_tree_selected.png with 100% similarity]
theme/bootstrapbase/pix/glyphicons-halflings-white.png [moved from theme/bootstrap/pix/glyphicons-halflings-white.png with 100% similarity]
theme/bootstrapbase/pix/glyphicons-halflings.png [moved from theme/bootstrap/pix/glyphicons-halflings.png with 100% similarity]
theme/bootstrapbase/pix/header.jpg [moved from theme/bootstrap/pix/header.jpg with 100% similarity]
theme/bootstrapbase/pix/horizontal-menu-submenu-indicator.png [moved from theme/bootstrap/pix/horizontal-menu-submenu-indicator.png with 100% similarity]
theme/bootstrapbase/pix/screenshot.jpg [moved from theme/bootstrap/pix/screenshot.jpg with 100% similarity]
theme/bootstrapbase/pix/sprite.png [moved from theme/bootstrap/pix/sprite.png with 100% similarity]
theme/bootstrapbase/pix/vertical-menu-submenu-indicator.png [moved from theme/bootstrap/pix/vertical-menu-submenu-indicator.png with 100% similarity]
theme/bootstrapbase/pix/yui2-treeview-sprite-rtl.gif [moved from theme/bootstrap/pix/yui2-treeview-sprite-rtl.gif with 100% similarity]
theme/bootstrapbase/readme_moodle.txt [moved from theme/bootstrap/readme_moodle.txt with 84% similarity]
theme/bootstrapbase/renderers.php [moved from theme/bootstrap/renderers.php with 96% similarity]
theme/bootstrapbase/renderers/core.php [moved from theme/bootstrap/renderers/core.php with 98% similarity]
theme/bootstrapbase/style/README [new file with mode: 0644]
theme/bootstrapbase/style/editor.css [moved from theme/bootstrap/style/editor.css with 100% similarity]
theme/bootstrapbase/style/moodle.css [moved from theme/bootstrap/style/generated.css with 100% similarity]
theme/bootstrapbase/version.php [moved from theme/bootstrap/version.php with 93% similarity]
theme/bootstrapbase/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap-debug.js [moved from theme/bootstrap/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap-debug.js with 100% similarity]
theme/bootstrapbase/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap-min.js [moved from theme/bootstrap/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap-min.js with 100% similarity]
theme/bootstrapbase/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap.js [moved from theme/bootstrap/yui/build/moodle-theme_bootstrap-bootstrap/moodle-theme_bootstrap-bootstrap.js with 100% similarity]
theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-debug.js [new file with mode: 0644]
theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-min.js [new file with mode: 0644]
theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap.js [new file with mode: 0644]
theme/bootstrapbase/yui/src/bootstrap/build.json [moved from theme/bootstrap/yui/src/bootstrap/build.json with 68% similarity]
theme/bootstrapbase/yui/src/bootstrap/js/bootstrap.js [moved from theme/bootstrap/yui/src/bootstrap/js/bootstrap.js with 95% similarity]
theme/bootstrapbase/yui/src/bootstrap/js/bootstrapcollapse.js [moved from theme/bootstrap/yui/src/bootstrap/js/bootstrapcollapse.js with 100% similarity]
theme/bootstrapbase/yui/src/bootstrap/js/bootstrapdropdown.js [moved from theme/bootstrap/yui/src/bootstrap/js/bootstrapdropdown.js with 100% similarity]
theme/bootstrapbase/yui/src/bootstrap/js/bootstrapengine.js [moved from theme/bootstrap/yui/src/bootstrap/js/bootstrapengine.js with 100% similarity]
theme/bootstrapbase/yui/src/bootstrap/meta/bootstrap.json [moved from theme/bootstrap/yui/src/bootstrap/meta/bootstrap.json with 62% similarity]
theme/clean/config.php
theme/clean/layout/general.php
theme/clean/lib.php
theme/clean/settings.php
theme/clean/version.php
version.php

index f0604a5..04ccc81 100644 (file)
@@ -97,6 +97,10 @@ abstract class base_moodleform extends moodleform {
                 $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);
                 }
             }
         }
index 3e00e62..cb8d7d3 100644 (file)
@@ -93,7 +93,9 @@ class community_hub_search_form extends moodleform {
 
         //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';
@@ -298,7 +300,7 @@ class community_hub_search_form extends moodleform {
             $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'));
         }
index 3b5e8df..ceb6b10 100644 (file)
@@ -59,6 +59,7 @@ class hub_publish_selector_form extends moodleform {
 
             $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;
             }
@@ -69,13 +70,16 @@ class hub_publish_selector_form extends moodleform {
         }
 
         $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);
@@ -104,7 +108,9 @@ class course_publication_form extends moodleform {
 
         //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();
@@ -200,12 +206,13 @@ class course_publication_form extends moodleform {
         $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);
@@ -220,7 +227,9 @@ class course_publication_form extends moodleform {
                 $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');
@@ -230,7 +239,7 @@ class course_publication_form extends moodleform {
                 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');
@@ -250,17 +259,19 @@ class course_publication_form extends moodleform {
         $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');
 
@@ -268,6 +279,7 @@ class course_publication_form extends moodleform {
                 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'));
@@ -357,6 +369,7 @@ class course_publication_form extends moodleform {
             }
 
             $mform->addElement('hidden', 'existingscreenshotnumber', $screenshotsnumber);
+            $mform->setType('existingscreenshotnumber', PARAM_INT);
         }
 
         $mform->addElement('filemanager', 'screenshots', get_string('addscreenshots', 'hub'), null,
index d401e5c..2e11f5b 100644 (file)
@@ -118,6 +118,7 @@ if (has_capability('moodle/course:publish', context_course::instance($id))) {
         $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;
index 4ef5b14..f1206bb 100644 (file)
@@ -1134,21 +1134,26 @@ class core_course_renderer extends plugin_renderer_base {
         }
 
         // 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()) {
@@ -1367,7 +1372,10 @@ class core_course_renderer extends plugin_renderer_base {
 
         // 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)) {
index d4611f7..06e5162 100644 (file)
@@ -58,6 +58,7 @@ class edit_grade_form extends moodleform {
         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');
 
index 282a8d8..9081f00 100644 (file)
@@ -86,6 +86,8 @@ class grade_export_form extends moodleform {
             $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');
         }
index 9723be2..9f86e48 100644 (file)
@@ -48,6 +48,8 @@ class grade_import_form extends moodleform {
             $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');
         }
index 6a243d6..ac1d9e2 100644 (file)
@@ -45,8 +45,8 @@ $string['datarootpermission'] = 'Овлашћења над директориј
 $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}" се не може преузети. Процес инсталације биће настављен на енглеском језику.';
index 817b854..a7509c3 100644 (file)
@@ -45,8 +45,8 @@ $string['datarootpermission'] = 'Ovlašćenja nad direktorijumom podataka';
 $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.';
index 6af26b5..04578b8 100644 (file)
@@ -539,7 +539,9 @@ $string['selectalloroneuser'] = 'Select all or one user';
 $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.';
index 3f4e607..0a3dd82 100644 (file)
@@ -809,10 +809,10 @@ class plugin_manager {
             ),
 
             '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'
             ),
 
index 1a3fd3e..bc08ec8 100644 (file)
@@ -513,11 +513,13 @@ abstract class portfolio_module_caller_base extends portfolio_caller_base {
     /**
      * 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);
     }
 
index a86bc93..3699c00 100644 (file)
     <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>
index ba95c46..69913bf 100644 (file)
@@ -514,7 +514,8 @@ $mform_post = new mod_forum_post_form('post.php', array('course' => $course,
                                                         '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));
@@ -871,7 +872,9 @@ if ($forum->type == 'qanda'
     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);
index 3de6387..1cb99ec 100644 (file)
@@ -75,11 +75,14 @@ class mod_forum_post_form extends moodleform {
         $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));
index e5e01c4..8c82d00 100644 (file)
@@ -729,18 +729,19 @@ function quiz_grade_item_update($quiz, $grades = null) {
             // 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 .
-                        '&amp;mode=overview';
-                $regrade_link = qualified_me() . '&amp;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 .
+                            '&amp;mode=overview';
+                    $regrade_link = qualified_me() . '&amp;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;
             }
         }
index 217383d..89f0830 100644 (file)
@@ -314,7 +314,7 @@ if (!$csv) {
     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>';
 
@@ -511,8 +511,9 @@ if (!$csv) {
     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();
@@ -730,6 +731,8 @@ foreach ($progress as $user) {
 
 if ($csv) {
     $export->download_file();
+} else {
+    echo '</tbody>';
 }
 
 print '</table>';
index 8997c14..6bae97a 100644 (file)
@@ -280,7 +280,7 @@ if (!$csv) {
     }
 
     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">';
@@ -343,7 +343,7 @@ foreach($activities as $activity) {
 if ($csv) {
     print $line;
 } else {
-    print '</tr>';
+    print '</tr></thead><tbody>';
 }
 
 // Row for each user
@@ -415,7 +415,7 @@ foreach($progress as $user) {
 if ($csv) {
     exit;
 }
-print '</table>';
+print '</tbody></table>';
 print '</div>';
 print $pagingbar;
 
diff --git a/theme/bootstrap/javascript/moodlebootstrap.js b/theme/bootstrap/javascript/moodlebootstrap.js
deleted file mode 100644 (file)
index 52a79b8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-// 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();
-});
diff --git a/theme/bootstrap/less/moodle/recess.txt b/theme/bootstrap/less/moodle/recess.txt
deleted file mode 100644 (file)
index cc08db8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-
-Analyzing the following files: style/generated.css
-
-Error reading file: style/generated.css
-
diff --git a/theme/bootstrap/style/README b/theme/bootstrap/style/README
deleted file mode 100644 (file)
index 8f378b5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-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.
similarity index 97%
rename from theme/bootstrap/README.txt
rename to theme/bootstrapbase/README.txt
index cec1b21..c20c74c 100644 (file)
@@ -23,8 +23,8 @@ accessibility and Search Engine Optimization (SEO).
 
 *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
similarity index 98%
rename from theme/bootstrap/config.php
rename to theme/bootstrapbase/config.php
index 38c1670..bd144fc 100644 (file)
@@ -31,9 +31,9 @@
 
 $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');
diff --git a/theme/bootstrapbase/javascript/moodlebootstrap.js b/theme/bootstrapbase/javascript/moodlebootstrap.js
new file mode 100644 (file)
index 0000000..a809219
--- /dev/null
@@ -0,0 +1,5 @@
+// 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>
similarity index 85%
rename from theme/bootstrap/less/README
rename to theme/bootstrapbase/less/README
index ccc6048..9899bc1 100644 (file)
@@ -1,8 +1,8 @@
 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.
 
similarity index 84%
rename from theme/bootstrap/readme_moodle.txt
rename to theme/bootstrapbase/readme_moodle.txt
index 96d5f75..a9168a1 100644 (file)
@@ -10,12 +10,13 @@ https://github.com/twitter/bootstrap.git
 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
@@ -44,6 +45,6 @@ The YUI port of the Twitter bootstrap libs are now longer maintained. If you nee
 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
similarity index 96%
rename from theme/bootstrap/renderers.php
rename to theme/bootstrapbase/renderers.php
index a216411..445fe8d 100644 (file)
@@ -17,7 +17,7 @@
 /**
  * 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
  */
similarity index 98%
rename from theme/bootstrap/renderers/core.php
rename to theme/bootstrapbase/renderers/core.php
index 203826b..056d334 100644 (file)
 /**
  * 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.
diff --git a/theme/bootstrapbase/style/README b/theme/bootstrapbase/style/README
new file mode 100644 (file)
index 0000000..f80ce0d
--- /dev/null
@@ -0,0 +1,3 @@
+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.
similarity index 93%
rename from theme/bootstrap/version.php
rename to theme/bootstrapbase/version.php
index 773ff81..f1319ce 100644 (file)
@@ -18,7 +18,7 @@
  * 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
@@ -28,4 +28,4 @@ defined('MOODLE_INTERNAL') || die;
 
 $plugin->version   = 2013032800;
 $plugin->requires  = 2012112900;
-$plugin->component = 'theme_bootstrap';
+$plugin->component = 'theme_bootstrapbase';
diff --git a/theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-debug.js b/theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-debug.js
new file mode 100644 (file)
index 0000000..4284bd1
Binary files /dev/null and b/theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-debug.js differ
diff --git a/theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-min.js b/theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-min.js
new file mode 100644 (file)
index 0000000..ebc87bf
Binary files /dev/null and b/theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap-min.js differ
diff --git a/theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap.js b/theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap.js
new file mode 100644 (file)
index 0000000..9d753b3
Binary files /dev/null and b/theme/bootstrapbase/yui/build/moodle-theme_bootstrapbase-bootstrap/moodle-theme_bootstrapbase-bootstrap.js differ
@@ -1,7 +1,7 @@
 {
-  "name": "moodle-theme_bootstrap-bootstrap",
+  "name": "moodle-theme_bootstrapbase-bootstrap",
   "builds": {
-    "moodle-theme_bootstrap-bootstrap": {
+    "moodle-theme_bootstrapbase-bootstrap": {
       "prependfiles": [
         "bootstrapengine.js",
         "bootstrapcollapse.js",
@@ -2,13 +2,13 @@
 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
@@ -22,7 +22,7 @@ var CSS = {
         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
@@ -1,5 +1,5 @@
 {
-  "moodle-theme_bootstrap-bootstrap": {
+  "moodle-theme_bootstrapbase-bootstrap": {
     "requires": [
         "node",
         "selector-css3"
index 7a33c1f..0517f37 100644 (file)
@@ -15,7 +15,7 @@
 // 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.
@@ -37,7 +37,7 @@ $THEME->name = 'clean';
 //////////////////////////////////
 //
 $THEME->doctype = 'html5';
-$THEME->parents = array('bootstrap');
+$THEME->parents = array('bootstrapbase');
 $THEME->sheets = array('custom');
 $THEME->supportscssoptimisation = false;
 $THEME->yuicssmodules = array();
index 8da341b..e69a5d0 100644 (file)
@@ -15,7 +15,7 @@
 // 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.
@@ -23,7 +23,7 @@
  * 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
  */
@@ -160,9 +160,9 @@ echo $OUTPUT->doctype() ?>
 
 <?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">
index 47844de..3325ca9 100644 (file)
@@ -15,7 +15,7 @@
 // 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.
index 6a4d43c..cf0df83 100644 (file)
@@ -15,7 +15,7 @@
 // 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.
index a18fdaf..e6d5fe4 100644 (file)
@@ -15,7 +15,7 @@
 // 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.
index 0f0e47c..37c2268 100644 (file)
 
 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