moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dan Poltawski 2014-12-01 17:30:27 +00:00
commit 50944630bd
4 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
group/index.php
View file

@ -163,11 +163,9 @@ echo '<form id="groupeditform" action="index.php" method="post">'."\n";
echo '<div>'."\n"; echo '<div>'."\n";
echo '<input type="hidden" name="id" value="' . $courseid . '" />'."\n"; echo '<input type="hidden" name="id" value="' . $courseid . '" />'."\n";
echo '<table cellpadding="6" class="generaltable generalbox groupmanagementtable boxaligncenter" summary="">'."\n"; echo html_writer::start_tag('div', array('class' => 'groupmanagementtable boxaligncenter'));
echo '<tr>'."\n"; 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"; 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();'; $onchange = 'M.core_group.membersCombo.refreshMembers();';
@ -220,8 +218,8 @@ echo '<p><input type="submit" name="act_showautocreategroupsform" id="showautocr
echo '<p><input type="submit" name="act_showimportgroups" id="showimportgroups" value="' echo '<p><input type="submit" name="act_showimportgroups" id="showimportgroups" value="'
. get_string('importgroups', 'core_group') . '" /></p>'."\n"; . get_string('importgroups', 'core_group') . '" /></p>'."\n";
echo '</td>'."\n"; echo html_writer::end_tag('div');
echo '<td>'."\n"; echo html_writer::start_tag('div', array('class' => 'members'));
echo '<p><label for="members"><span id="memberslabel">'. echo '<p><label for="members"><span id="memberslabel">'.
get_string('membersofselectedgroup', 'group'). get_string('membersofselectedgroup', 'group').
@ -255,9 +253,8 @@ echo '</select>'."\n";
echo '<p><input type="submit" ' . $showaddmembersform_disabled . ' name="act_showaddmembersform" ' echo '<p><input type="submit" ' . $showaddmembersform_disabled . ' name="act_showaddmembersform" '
. 'id="showaddmembersform" value="' . get_string('adduserstogroup', 'group'). '" /></p>'."\n"; . 'id="showaddmembersform" value="' . get_string('adduserstogroup', 'group'). '" /></p>'."\n";
echo '</td>'."\n"; echo html_writer::end_tag('div');
echo '</tr>'."\n"; echo html_writer::end_tag('div');
echo '</table>'."\n";
//<input type="hidden" name="rand" value="om" /> //<input type="hidden" name="rand" value="om" />
echo '</div>'."\n"; echo '</div>'."\n";

13
theme/base/style/user.css
View file

@ -64,3 +64,16 @@
.dir-rtl .userprofile dl dt {float:right; width:110px; margin-left:10px;} .dir-rtl .userprofile dl dt {float:right; width:110px; margin-left:10px;}
.dir-rtl .userprofile dl dd {margin-right: 120px;} .dir-rtl .userprofile dl dd {margin-right: 120px;}
#page-my-index.dir-rtl .block h3 { text-align: right;} #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;
}

15
theme/bootstrapbase/less/moodle/user.less
View file

@ -211,3 +211,18 @@
margin: 0 0.5em 0 0; 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;
}
}

2
theme/bootstrapbase/style/moodle.css
View file

File diff suppressed because one or more lines are too long