Merge branch '42317-27' of git://github.com/samhemelryk/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css

backup/restore.php

@@ -12,7 +12,7 @@ list($context, $course, $cm) = get_context_info_array($contextid);
 navigation_node::override_active_url(new moodle_url('/backup/restorefile.php', array('contextid'=>$contextid)));
 $PAGE->set_url(new moodle_url('/backup/restore.php', array('contextid'=>$contextid)));
 $PAGE->set_context($context);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 
 require_login($course, null, $cm);
 require_capability('moodle/restore:restorecourse', $context);

badges/edit.php

@@ -53,7 +53,7 @@ if ($badge->type == BADGE_TYPE_COURSE) {
     }
     require_login($badge->courseid);
     $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
-    $PAGE->set_pagelayout('standard');
+    $PAGE->set_pagelayout('course');
     navigation_node::override_active_url($navurl);
 } else {
     $PAGE->set_pagelayout('admin');

blocks/completionstatus/details.php

@@ -75,7 +75,7 @@ $page = get_string('completionprogressdetails', 'block_completionstatus');
 $title = format_string($course->fullname) . ': ' . $page;
 
 $PAGE->navbar->add($page);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('report');
 $PAGE->set_url('/blocks/completionstatus/details.php', array('course' => $course->id, 'user' => $user->id));
 $PAGE->set_title(get_string('course') . ': ' . $course->fullname);
 $PAGE->set_heading($title);

blocks/rss_client/editfeed.php

@@ -176,7 +176,7 @@ if ($returnurl) {
 $managefeeds = new moodle_url('/blocks/rss_client/managefeeds.php', $urlparams);
 
 $PAGE->set_url('/blocks/rss_client/editfeed.php', $urlparams);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 
 if ($rssid) {
     $isadding = false;

blog/external_blog_edit.php

@@ -44,7 +44,7 @@ if ($id !== null) {
 }
 $PAGE->set_url($url);
 $PAGE->set_context($context);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 
 $returnurl = new moodle_url('/blog/external_blogs.php');
 

blog/preferences.php

@@ -53,7 +53,7 @@ if ($groupid !== null) {
 }
 
 $PAGE->set_url($url);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 
 $sitecontext = context_system::instance();
 $PAGE->set_context($sitecontext);

calendar/event.php

@@ -86,7 +86,7 @@ if ($courseid != SITEID) {
 }
 
 $PAGE->set_url($url);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 
 if ($courseid != SITEID && !empty($courseid)) {
     $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);

calendar/managesubscriptions.php

@@ -41,7 +41,7 @@ if ($courseid != SITEID) {
 }
 navigation_node::override_active_url(new moodle_url('/calendar/view.php', array('view' => 'month')));
 $PAGE->set_url($url);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 $PAGE->navbar->add(get_string('managesubscriptions', 'calendar'));
 
 if ($courseid != SITEID && !empty($courseid)) {

course/completion.php

@@ -65,7 +65,7 @@ $PAGE->set_course($course);
 $PAGE->set_url('/course/completion.php', array('id' => $course->id));
 $PAGE->set_title($course->shortname);
 $PAGE->set_heading($course->fullname);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 
 // Create the settings form instance.
 $form = new course_completion_form('completion.php?id='.$id, array('course' => $course));

group/assign.php

@@ -122,7 +122,7 @@ $straddgroupstogroupings = get_string('addgroupstogroupings', 'group');
 $groupingname = format_string($grouping->name);
 
 navigation_node::override_active_url(new moodle_url('/group/index.php', array('id'=>$course->id)));
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 
 $PAGE->navbar->add($strparticipants, new moodle_url('/user/index.php', array('id'=>$courseid)));
 $PAGE->navbar->add($strgroups, new moodle_url('/group/index.php', array('id'=>$courseid)));

group/autogroup.php

@@ -52,7 +52,7 @@ $strautocreategroups = get_string('autocreategroups', 'group');
 
 $PAGE->set_title($strgroups);
 $PAGE->set_heading($course->fullname. ': '.$strgroups);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $courseid)));
 
 // Print the page and form

group/group.php

@@ -77,7 +77,7 @@ require_capability('moodle/course:managegroups', $context);
 $strgroups = get_string('groups');
 $PAGE->set_title($strgroups);
 $PAGE->set_heading($course->fullname . ': '.$strgroups);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id)));
 
 $returnurl = $CFG->wwwroot.'/group/index.php?id='.$course->id.'&group='.$id;

group/grouping.php

@@ -69,7 +69,7 @@ require_capability('moodle/course:managegroups', $context);
 $strgroupings = get_string('groupings', 'group');
 $PAGE->set_title($strgroupings);
 $PAGE->set_heading($course->fullname. ': '.$strgroupings);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id)));
 
 $returnurl = $CFG->wwwroot.'/group/groupings.php?id='.$course->id;

group/import.php

@@ -45,7 +45,7 @@ $PAGE->navbar->add($strimportgroups);
 navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id)));
 $PAGE->set_title("$course->shortname: $strimportgroups");
 $PAGE->set_heading($course->fullname);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 
 $returnurl = new moodle_url('/group/index.php', array('id'=>$id));
 

portfolio/add.php

@@ -49,7 +49,7 @@ $callerformats = optional_param('callerformats', null, PARAM_TAGLIST); // Comma
 require_login();  // this is selectively called again with $course later when we know for sure which one we're in.
 $PAGE->set_context(context_system::instance());
 $PAGE->set_url('/portfolio/add.php', array('id' => $dataid, 'sesskey' => sesskey()));
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 $exporter = null;
 
 if ($postcontrol && $type && !$dataid) {

theme/bootstrapbase/less/moodle/forms.less

@@ -389,7 +389,7 @@ fieldset.coursesearchbox label {
 #region-main .mform:not(.unresponsive) .fitem .fitemtitle label {
     font-weight: bold;
 }
-@media (max-width: 1199px) {
+.makeFormsVertical() {
     #region-main .mform:not(.unresponsive) {
         .fitem {
             .fitemtitle {
@@ -434,7 +434,7 @@ fieldset.coursesearchbox label {
             }
         }
     }
-    .dir-rtl #region-main .mform:not(.unresponsive) {
+    &.dir-rtl #region-main .mform:not(.unresponsive) {
         .femptylabel .fitemtitle {
             margin-right: 0px;
             margin-left: 8px;
@@ -455,3 +455,28 @@ fieldset.coursesearchbox label {
         }
     }
 }
+
+/**
+ * Make forms vertical when the screen is less than 1200px;
+ */
+@media (max-width: 1199px) {
+    body {
+        .makeFormsVertical;
+    }
+}
+
+/**
+ * Make forms vertical when the screen is less than 1474px AND both side-pre and side-post contain blocks.
+ * This is an extra special media rule.
+ * It causes forms to show vertically when the screen size is calculated as:
+ * 1199px + (1199px * 23%)
+ * Where 23% is the width of span3
+ * Full calculation is:
+ *   @maxWidthForVerticalForms: 1199px * (unit(((@fluidGridColumnWidth1200 * 3) + (@fluidGridGutterWidth * (3 - 1)))) / 100) + 1199px;
+ */
+@maxWidthForVerticalForms: 1474px;
+@media (max-width: @maxWidthForVerticalForms) {
+    .used-region-side-pre.used-region-side-post {
+        .makeFormsVertical;
+    }
+}

user/managetoken.php

@@ -34,7 +34,7 @@ $PAGE->set_context($usercontext);
 $PAGE->set_url('/user/managetoken.php');
 $PAGE->set_title(get_string('securitykeys', 'webservice'));
 $PAGE->set_heading(get_string('securitykeys', 'webservice'));
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 
 $rsstokenboxhtml = $webservicetokenboxhtml = '';
 // Manage user web service tokens.

user/portfolio.php

@@ -60,7 +60,7 @@ $PAGE->set_url($url);
 $PAGE->set_context(context_user::instance($user->id));
 $PAGE->set_title("$course->fullname: $fullname: $strportfolios");
 $PAGE->set_heading($course->fullname);
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('admin');
 
 echo $OUTPUT->header();
 $showroles = 1;
@@ -120,4 +120,4 @@ if ($display) {
     echo html_writer::table($table);
     echo $OUTPUT->box_end();
 }
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();

user/portfoliologs.php

@@ -60,7 +60,7 @@ $PAGE->set_url($url);
 $PAGE->set_title("$course->fullname: $fullname: $strportfolios");
 $PAGE->set_heading($course->fullname);
 $PAGE->set_context(context_user::instance($user->id));
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('report');
 
 echo $OUTPUT->header();