Permalink
Browse files

MDL-26400 - base_rtl theme - switch column support, menu fix, missing…

… images, minor ui updates in core and rtl css
  • Loading branch information...
1 parent 1609f98 commit 78387499b35322b71482be6fd732c6a78011b68c @nadavkav committed Apr 11, 2012
@@ -37,9 +37,17 @@
$bodyclasses = array();
if ($showsidepre && !$showsidepost) {
- $bodyclasses[] = 'side-pre-only';
+ if (!right_to_left()) {
+ $bodyclasses[] = 'side-pre-only';
+ }else{
+ $bodyclasses[] = 'side-post-only';
+ }
} else if ($showsidepost && !$showsidepre) {
- $bodyclasses[] = 'side-post-only';
+ if (!right_to_left()) {
+ $bodyclasses[] = 'side-post-only';
+ }else{
+ $bodyclasses[] = 'side-pre-only';
+ }
} else if (!$showsidepost && !$showsidepre) {
$bodyclasses[] = 'content-only';
}
@@ -62,10 +70,9 @@
<div id="page">
<div id="menublock">
- <?php if ($hascustommenu) { ?>
+ <?php if ($hascustommenu) { ?>
<div id="custommenu"><?php echo $custommenu; ?></div>
- <?php
-} ?>
+ <?php } ?>
</div>
<div id="page-header" class="clearfix">
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
@@ -86,30 +93,30 @@
</div>
</div>
- <?php if ($hassidepre) { ?>
+ <?php if ($hassidepre OR (right_to_left() AND $hassidepost)) { ?>
<div id="region-pre" class="block-region">
- <div class="region-content">
- <?php
- if (right_to_left()) {
- echo $OUTPUT->blocks_for_region('side-post');
- } else {
- echo $OUTPUT->blocks_for_region('side-pre');
- } ?>
+ <div class="region-content">
+ <?php
+ if (!right_to_left()) {
+ echo $OUTPUT->blocks_for_region('side-pre');
+ } elseif ($hassidepost) {
+ echo $OUTPUT->blocks_for_region('side-post');
+ } ?>
- </div>
+ </div>
</div>
<?php } ?>
- <?php if ($hassidepost) { ?>
+ <?php if ($hassidepost OR (right_to_left() AND $hassidepre)) { ?>
<div id="region-post" class="block-region">
- <div class="region-content">
- <?php
- if (right_to_left()) {
- echo $OUTPUT->blocks_for_region('side-pre');
- } else {
- echo $OUTPUT->blocks_for_region('side-post');
- } ?>
- </div>
+ <div class="region-content">
+ <?php
+ if (!right_to_left()) {
+ echo $OUTPUT->blocks_for_region('side-post');
+ } elseif ($hassidepre) {
+ echo $OUTPUT->blocks_for_region('side-pre');
+ } ?>
+ </div>
</div>
<?php } ?>
</div>
@@ -44,17 +44,15 @@
if ($showsidepre && !$showsidepost) {
if (!right_to_left()) {
$bodyclasses[] = 'side-pre-only';
- } else {
+ }else{
$bodyclasses[] = 'side-post-only';
}
- //$bodyclasses[] = 'side-pre-only';
} else if ($showsidepost && !$showsidepre) {
if (!right_to_left()) {
$bodyclasses[] = 'side-post-only';
- } else {
+ }else{
$bodyclasses[] = 'side-pre-only';
}
- //$bodyclasses[] = 'side-post-only';
} else if (!$showsidepost && !$showsidepre) {
$bodyclasses[] = 'content-only';
}
@@ -74,10 +72,9 @@
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
<div id="menublock">
- <?php if ($hascustommenu) { ?>
+ <?php if ($hascustommenu) { ?>
<div id="custommenu"><?php echo $custommenu; ?></div>
- <?php
-} ?>
+ <?php } ?>
</div>
<?php if ($hasheading || $hasnavbar) {
@@ -125,23 +122,26 @@
<?php if ($hassidepre OR (right_to_left() AND $hassidepost)) { ?>
<div id="region-pre" class="block-region">
<div class="region-content">
- <?php if (!right_to_left()) {
- echo $OUTPUT->blocks_for_region('side-pre');
- } elseif ($hassidepost) {
- echo $OUTPUT->blocks_for_region('side-post');
- } ?>
+ <?php
+ if (!right_to_left()) {
+ echo $OUTPUT->blocks_for_region('side-pre');
+ } elseif ($hassidepost) {
+ echo $OUTPUT->blocks_for_region('side-post');
+ } ?>
+
</div>
</div>
<?php } ?>
<?php if ($hassidepost OR (right_to_left() AND $hassidepre)) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
- <?php if (!right_to_left()) {
- echo $OUTPUT->blocks_for_region('side-post');
- } elseif ($hassidepre) {
- echo $OUTPUT->blocks_for_region('side-pre');
- } ?>
+ <?php
+ if (!right_to_left()) {
+ echo $OUTPUT->blocks_for_region('side-post');
+ } elseif ($hassidepre) {
+ echo $OUTPUT->blocks_for_region('side-pre');
+ } ?>
</div>
</div>
<?php } ?>
@@ -40,12 +40,11 @@
$bodyclasses = array();
if ($showsidepre) {
- if (right_to_left()) {
+ if (right_to_left()) {
$bodyclasses[] = 'side-post-only';
} else {
$bodyclasses[] = 'side-pre-only';
}
- //$bodyclasses[] = 'side-pre-only';
} else {
$bodyclasses[] = 'content-only';
}
@@ -65,10 +64,9 @@
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
<div id="menublock">
- <?php if ($hascustommenu) { ?>
+ <?php if ($hascustommenu) { ?>
<div id="custommenu"><?php echo $custommenu; ?></div>
- <?php
-} ?>
+ <?php } ?>
</div>
<?php if ($hasheading || $hasnavbar) {
@@ -113,13 +111,15 @@
</div>
</div>
- <?php if ($hassidepre and !right_to_left()) { ?>
- <div id="region-pre" class="block-region">
- <div class="region-content">
- <?php echo $OUTPUT->blocks_for_region('side-pre'); ?>
- </div>
- </div>
- <?php } ?>
+ <?php
+ if ($hassidepre and !right_to_left()) { ?>
+ <div id="region-pre" class="block-region">
+ <div class="region-content">
+ <?php echo $OUTPUT->blocks_for_region('side-pre');?>
+ </div>
+ </div>
+ <?php
+ } ?>
<?php if ($hassidepre and right_to_left() ) { ?>
<div id="region-post" class="block-region">
@@ -129,7 +129,6 @@
</div>
<?php } ?>
- </div>
</div>
</div>
</div>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -5,12 +5,10 @@ a, a:link, a:visited {
text-decoration: none;
}
a:active, a:hover {
- color: #abc;
- border-bottom: 1px dashed #036;
+ color: #036;
}
a:focus {
color: #c03;
- border-bottom: 1px dashed #c06;
}
h1.headermain {
font: 1.5em/1.1 sans-serif;
@@ -133,21 +131,3 @@ h1.headermain {
font-size: 25px;
margin: 1em 0 0;
}
-
-
-/* add some visual borders to make the course more usable [nadavkav 1/4/2012]*/
-.block .header { border:1px solid;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;}
-
-.block .header .block_action { padding-top: 3px; }
-
-.course-content ul.topics li.section .content { border-top: 3px double;}
-
-#completionprogressid, .headingblock {display: none;}
-
-#page-content, #region-main-box, #region-pre-box { margin-top: 5px;}
-
-#page { width: 100%; margin: 0% auto;}
-
@@ -0,0 +1,109 @@
+/**moodle dropdown css for yui menu **/
+
+.dir-rtl #custommenu {
+ width: 100%;
+ float: left;
+ background-color: #EEE;
+}
+.dir-rtl #custommenu .yui3-menu-label-active,
+.dir-rtl #custommenu .yui3-menu-label-menuvisible,
+.dir-rtl #custommenu .yui3-menu .yui3-menu .yui3-menu-label-active,
+.dir-rtl #custommenu .yui3-menu .yui3-menu .yui3-menu-label-menuvisible,
+.dir-rtl #custommenu .yui3-menuitem-active .yui3-menuitem-content,
+.dir-rtl #custommenu .yui3-menu .yui3-menu .yui3-menuitem-active .yui3-menuitem-content,
+.dir-rtl #custommenu .yui3-menu-horizontal.javascript-disabled li a:hover {
+ background-color:#DDD;
+ background-image: none;
+ color: #333;
+}
+.dir-rtl #custommenu .yui3-menu-content,
+.dir-rtl #custommenu .yui3-menu .yui3-menu .yui3-menu .yui3-menu-content {
+ background-image:none;
+ background-color:#EEE;
+ padding:0;
+ margin: 0;
+}
+
+.dir-rtl #custommenu .yui3-menu-label,
+.dir-rtl #custommenu .yui3-menu .yui3-menu .yui3-menu-label {
+ background-image:url([[pix:theme|rtl-vertical-menu-submenu-indicator]]);
+ background-position:5px center;
+ background-repeat:no-repeat;
+ color: #333;
+}
+.dir-rtl #custommenu .yui3-menu-label.yui3-menu-label-menuvisible,
+.dir-rtl #custommenu .yui3-menu .yui3-menu .yui3-menu-label.yui3-menu-label-menuvisible {
+ background-image:url([[pix:theme|horizontal-menu-submenu-indicator]]);
+ background-position: 5px center;
+ color: #333;
+}
+.dir-rtl #custommenu .yui3-menu-horizontal .yui3-menu-label,
+.dir-rtl #custommenu .yui3-menu-horizontal .yui3-menuitem-content {
+ border-width:0;
+ text-transform: uppercase;
+ text-decoration:none;
+ font-size:1em;
+ font-weight: 200;
+ line-height:30px;
+ cursor: pointer;
+ color: #333;
+}
+.dir-rtl #custommenu .yui3-menu-horizontal .yui3-menu-label {
+ padding: 0 30px;
+}
+.dir-rtl #custommenu .yui3-menu-horizontal .yui3-menuitem-content {
+ padding: 0 20px;
+}
+.dir-rtl #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content,
+.dir-rtl #custommenu .yui3-menu-horizontal.javascript-disabled .yui3-menu-content .ul {
+ border-width:0;
+}
+.dir-rtl #custommenu .yui3-menu-horizontal.javascript-disabled li a {
+ padding: 0 20px;
+ display: block;
+ float: right;
+}
+.dir-rtl #custommenu .yui3-menu.yui3-menu-horizontal {
+ float: right;
+}
+
+.dir-rtl #custommenu .yui3-menu-content li a {
+ cursor: pointer;
+ text-align: right;
+}
+
+.dir-rtl #custommenu .yui3-menu.custom_menu_submenu {
+ border: none;
+ min-width: 100px;
+ z-index: 99998;
+}
+
+.dir-rtl #custommenu .yui3-menu.custom_menu_submenu .yui3-menu.custom_menu_submenu {
+ background-color: transparent;
+ min-width: 100px;
+}
+
+.dir-rtl #custommenu .yui3-menu.custom_menu_submenu .yui3-menu-content {
+ background-color: #EEE;
+ z-index: 99999;
+ min-width: 200px;
+ margin: 0 0 0 -20px;
+ padding: 0;
+}
+
+/** below style to move sub subs to the left to keep from going off the page **/
+
+.dir-rtl #custommenu .yui3-menu.custom_menu_submenu .yui3-menu-content .yui3-menu.custom_menu_submenu .yui3-menu-content {
+ margin: 0;
+ position: absolute;
+ right: 300px;
+}
+
+.dir-rtl #custommenu .yui3-menu.custom_menu_submenu .yui3-menu-content .yui3-menuitm .yui-meuitem-content {
+ padding: 0;
+}
+
+/* make menu visible hack */
+.dir-rtl #custommenu .yui3-menu-hidden { left:0 !important; right: auto; top:0!important;}
+.dir-rtl .yui3-menuitem-content {float:right;}
+.dir-rtl #custommenu .yui3-menu.custom_menu_submenu .yui3-menu.custom_menu_submenu {left:100px !important;top:-30px!important;position: relative;}
Oops, something went wrong.

0 comments on commit 7838749

Please sign in to comment.