Merged branch 'wip-MDL-30361-master-rtlpatches' of git://github.com/nadavkav/moodle.git with changes

This commit is contained in:
Sam Hemelryk 2011-11-29 13:51:25 +13:00
commit bada16d35c
5 changed files with 25 additions and 7 deletions

View File

@ -539,6 +539,14 @@ table#user-grades td.ajax {
text-align:left;
}
.dir-rtl table#user-grades td.userfield,
.dir-rtl table#user-grades th,
.path-grade-report-grader.dir-rtl div.gradeparent,
.path-grade-report-grader.dir-rtl .ie6 form,
.dir-rtl table#user-grades td.ajax {
text-align:right;
}
.path-grade-report-grader .gradeparent {
overflow:auto;
}

View File

@ -34,7 +34,6 @@
#page-mod-assignment-submissions .mform.optionspref .fitem .fitemtitle {width:50%;}
#page-mod-assignment-submissions .mform.optionspref .fitem .felement {width: 30%; margin-left: 51%;}
#page-mod-assignment-submissions.dir-rtl .mform .fitem .felement {margin-right: 51%; margin-left: 0;}
#page-mod-assignment-submissions .optionspref {width: 50%;}
#page-mod-assignment-submissions .fastgbutton {text-align: center;}

View File

@ -83,6 +83,15 @@ echo $OUTPUT->header();
$fmtoptions = array(
'context' => $context);
if (right_to_left()) { // RTL table alignment support
$rightalignment = 'left';
$leftalignment = 'right';
} else {
$rightalignment = 'right';
$leftalignment = 'left';
}
if ( $hook >0 ) {
if ( $action == "edit" ) {
@ -135,7 +144,7 @@ if ( $hook >0 ) {
<table border="0" width="100" class="confirmbuttons">
<tr>
<td align="right" style="width:50%">
<td align="$rightalignment" style="width:50%">
<form id="form" method="post" action="editcategories.php">
<div>
<input type="hidden" name="id" value="<?php p($cm->id) ?>" />
@ -147,7 +156,7 @@ if ( $hook >0 ) {
</div>
</form>
</td>
<td align="left" style="width:50%">
<td align="$leftalignment" style="width:50%">
<?php
unset($options);
@ -217,7 +226,7 @@ if ( $action ) {
?>
<tr>
<td style="width:80%" align="left">
<td style="width:80%" align="$leftalignment">
<?php
echo "<span class=\"bold\">".format_string($category->name, true, $fmtoptions)."</span> <span>($num_entries " . get_string("entries","glossary") . ")</span>";
?>
@ -245,9 +254,9 @@ if ( $action ) {
$options['id'] = $cm->id;
$options['action'] = "add";
echo "<table class=\"editbuttons\" border=\"0\"><tr><td align=\"right\">";
echo "<table class=\"editbuttons\" border=\"0\"><tr><td align=\"$rightalignment\">";
echo $OUTPUT->single_button(new moodle_url("editcategories.php", $options), get_string("add") . " " . get_string("category","glossary"));
echo "</td><td align=\"left\">";
echo "</td><td align=\"$leftalignment\">";
unset($options['action']);
$options['mode'] = 'cat';
$options['hook'] = $hook;

View File

@ -743,7 +743,8 @@ body.tag .managelink {padding: 5px;}
.dir-rtl .mod-indent-15,
.dir-rtl .mod-indent-huge {margin-right:300px;margin-left:0;}
.dir-rtl .felement.feditor select {margin-right:18.75%;}
.dir-rtl .felement.feditor select {margin-right:18.75%;margin-left:auto;}
.dir-rtl .mform .fitem .felement {margin-right: 16%;margin-left:auto;}
/* Resourcelib mp3 player size: only width could be changed here, height hardcoded in JS */
.resourcecontent .resourcemediaplugin_mp3 object {height:25px; width: 600px}

View File

@ -22,6 +22,7 @@ td.grade div.overridden {background-color: #DDDDDD;}
.path-grade-edit-scale .scale_options,
#page-admin-grade-edit-scale-index .scale_options {font-size: 0.8em;}
.path-grade-edit-scale .generaltable {margin: 10px auto;}
.gradetreebox {margin:10px auto;width:90%;}
.gradetreebox table {font-size: 0.8em;border: 1px solid #AAA;}