Merge branch 'm29_MDL-48317' of https://github.com/totara/moodle

patkira · Dec 4, 2014 · 5094463 · 5094463
2 parents 63015d8 + 270a8f1
commit 5094463
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 10 deletions.
diff --git a/group/index.php b/group/index.php
@@ -163,11 +163,9 @@
 echo '<div>'."\n";
 echo '<input type="hidden" name="id" value="' . $courseid . '" />'."\n";
 
-echo '<table cellpadding="6" class="generaltable generalbox groupmanagementtable boxaligncenter" summary="">'."\n";
-echo '<tr>'."\n";
+echo html_writer::start_tag('div', array('class' => 'groupmanagementtable boxaligncenter'));
+echo html_writer::start_tag('div', array('class' => 'groups'));
 
-
-echo "<td>\n";
 echo '<p><label for="groups"><span id="groupslabel">'.get_string('groups').':</span><span id="thegrouping">&nbsp;</span></label></p>'."\n";
 
 $onchange = 'M.core_group.membersCombo.refreshMembers();';
@@ -220,8 +218,8 @@
 echo '<p><input type="submit" name="act_showimportgroups" id="showimportgroups" value="'
         . get_string('importgroups', 'core_group') . '" /></p>'."\n";
 
-echo '</td>'."\n";
-echo '<td>'."\n";
+echo html_writer::end_tag('div');
+echo html_writer::start_tag('div', array('class' => 'members'));
 
 echo '<p><label for="members"><span id="memberslabel">'.
     get_string('membersofselectedgroup', 'group').
@@ -255,9 +253,8 @@
 
 echo '<p><input type="submit" ' . $showaddmembersform_disabled . ' name="act_showaddmembersform" '
         . 'id="showaddmembersform" value="' . get_string('adduserstogroup', 'group'). '" /></p>'."\n";
-echo '</td>'."\n";
-echo '</tr>'."\n";
-echo '</table>'."\n";
+echo html_writer::end_tag('div');
+echo html_writer::end_tag('div');
 
 //<input type="hidden" name="rand" value="om" />
 echo '</div>'."\n";

diff --git a/theme/base/style/user.css b/theme/base/style/user.css
@@ -64,3 +64,16 @@
 .dir-rtl .userprofile dl dt {float:right; width:110px; margin-left:10px;}
 .dir-rtl .userprofile dl dd {margin-right: 120px;}
 #page-my-index.dir-rtl .block h3 { text-align: right;}
+
+#groupeditform .groups,
+#groupeditform .members {
+    width: 49%;
+    float: left;
+    text-align: left;
+}
+
+.dir-rtl #groupeditform .groups,
+.dir-rtl #groupeditform .members {
+    float: right;
+    text-align: right;
+}
diff --git a/theme/bootstrapbase/less/moodle/user.less b/theme/bootstrapbase/less/moodle/user.less
@@ -211,3 +211,18 @@
         margin: 0 0.5em 0 0;
     }
 }
+#groupeditform {
+    .groups,
+    .members {
+        width: 49%;
+        float: left;
+        text-align: left;
+    }
+}
+.dir-rtl #groupeditform {
+    .groups,
+    .members {
+        float: right;
+        text-align: right;
+    }
+}
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css