projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 12f6aae)
theme-binarius MDL-23188 Added support for the custom menu... remaining changes
authorSam Hemelryk <sam@moodle.com>
Fri, 27 Aug 2010 08:55:03 +0000 (08:55 +0000)
committerSam Hemelryk <sam@moodle.com>
Fri, 27 Aug 2010 08:55:03 +0000 (08:55 +0000)
theme/binarius/config.php patch | blob | blame | history
theme/binarius/layout/general.php patch | blob | blame | history

diff --git a/theme/binarius/config.php b/theme/binarius/config.php
index 307d0bd..071a13d 100644 (file)
--- a/theme/binarius/config.php
+++ b/theme/binarius/config.php
@@ -38,8 +38,8 @@ $THEME->name = 'binarius';
 
 
 $THEME->parents = array(
-       'canvas',
-       'base',
+    'canvas',
+    'base',
 );
 
 /////////////////////////////////////////////////////
@@ -54,8 +54,8 @@ $THEME->parents = array(
 
 
 $THEME->sheets = array(
-       'core',
-       'pagelayout',
+    'core',
+    'pagelayout',
 );
 
 ////////////////////////////////////////////////////
@@ -64,12 +64,12 @@ $THEME->sheets = array(
 ////////////////////////////////////////////////////
 
 $THEME->parents_exclude_sheets = array(
-               'base'=>array(
-                       'pagelayout',
-               ),
-               'canvas'=>array(
-                       'pagelayout',
-               ),
+        'base'=>array(
+            'pagelayout',
+        ),
+        'canvas'=>array(
+            'pagelayout',
+        ),
 );
 
 
@@ -142,7 +142,7 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
@@ -152,19 +152,19 @@ $THEME->layouts = array(
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
     ),
     'embedded' => array(
-       'theme' => 'canvas',
+        'theme' => 'canvas',
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>false),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>false, 'nocustommenu'=>true),
     ),
 );
 
@@ -206,14 +206,14 @@ $THEME->layouts = array(
 // As above but will be included in the page footer.
 ////////////////////////////////////////////////////
 
-//$THEME->larrow       = '&lang;';
+//$THEME->larrow    = '&lang;';
 
 ////////////////////////////////////////////////////
 // Overrides the left arrow image used throughout
 // Moodle
 ////////////////////////////////////////////////////
 
-//$THEME->rarrow       = '&rang;';
+//$THEME->rarrow    = '&rang;';
 
 ////////////////////////////////////////////////////
 // Overrides the right arrow image used throughout Moodle
diff --git a/theme/binarius/layout/general.php b/theme/binarius/layout/general.php
index 318a656..2395d0a 100644 (file)
--- a/theme/binarius/layout/general.php
+++ b/theme/binarius/layout/general.php
@@ -6,6 +6,9 @@ $hasfooter = (empty($PAGE->layout_options['nofooter']));
 $hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
 $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT));
 
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
+
 $bodyclasses = array();
 if ($showsidepost) {
     $bodyclasses[] = 'side-post-only';
@@ -13,6 +16,10 @@ if ($showsidepost) {
     $bodyclasses[] = 'content-only';
 }
 
+if ($hascustommenu) {
+    $bodyclasses[] = 'has-custom-menu';
+}
+
 echo $OUTPUT->doctype() ?>
 <html <?php echo $OUTPUT->htmlattributes() ?>>
 <head>
@@ -26,90 +33,92 @@ echo $OUTPUT->doctype() ?>
 
 <div id="page">
 
-       <?php if ($hasheading || $hasnavbar) { ?>
-               <div id="wrapper" class="clearfix">
+    <?php if ($hasheading || $hasnavbar) { ?>
+           <div id="wrapper" class="clearfix">
 
 <!-- START OF HEADER -->
 
-               <div id="page-header" class="inside">
-                               <div id="page-header-wrapper" class="wrapper clearfix">
-                       
-                               <?php if ($hasheading) { ?>
-                               <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
-                                       <div class="headermenu"><?php
-                               echo $OUTPUT->login_info();
-                                               if (!empty($PAGE->layout_options['langmenu'])) {
-                                               echo $OUTPUT->lang_menu();
-                                               }
-                                           echo $PAGE->headingmenu ?>
-                                   </div>
-                           <?php } ?>
-                   
-                           </div>
-                       </div>
-
-           <?php if ($hasnavbar) { ?>
-                   <div class="navbar">
-                       <div class="wrapper clearfix">
-                           <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
-                       <div class="navbutton"> <?php echo $PAGE->button; ?></div>
-                       </div>
-               </div>
-               <?php } ?>
+            <div id="page-header" class="inside">
+                <div id="page-header-wrapper" class="wrapper clearfix">
+
+                    <?php if ($hasheading) { ?>
+                        <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
+                        <div class="headermenu"><?php
+                            echo $OUTPUT->login_info();
+                                if (!empty($PAGE->layout_options['langmenu'])) {
+                                    echo $OUTPUT->lang_menu();
+                                }
+                            echo $PAGE->headingmenu ?>
+                        </div>
+                    <?php } ?>
+                    <?php if ($hascustommenu) { ?>
+                    <div id="custommenu"><?php echo $custommenu; ?></div>
+                    <?php } ?>
+                </div>
+            </div>
+
+            <?php if ($hasnavbar) { ?>
+                <div class="navbar">
+                    <div class="wrapper clearfix">
+                        <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
+                        <div class="navbutton"> <?php echo $PAGE->button; ?></div>
+                    </div>
+                </div>
+            <?php } ?>
 
 <!-- END OF HEADER -->
 
-       <?php } ?>
+    <?php } ?>
 
 
 <!-- START OF CONTENT -->
 
-               <div id="page-content-wrapper" class="wrapper clearfix">
-                   <div id="page-content">
-                   <div id="region-main-box">
-                           <div id="region-post-box">
+        <div id="page-content-wrapper" class="wrapper clearfix">
+            <div id="page-content">
+                <div id="region-main-box">
+                    <div id="region-post-box">
             
-                           <div id="region-main-wrap">
-                           <div id="region-main">
-                                   <div class="region-content">
-                                   <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
-                                       </div>
-                               </div>
-                           </div>
+                        <div id="region-main-wrap">
+                            <div id="region-main">
+                                <div class="region-content">
+                                    <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+                                </div>
+                            </div>
+                        </div>
                 
-                               <?php if ($hassidepost) { ?>
-                           <div id="region-post" class="block-region">
-                                   <div class="region-content">
-                                   <?php echo $OUTPUT->blocks_for_region('side-post') ?>
-                                   </div>
-                               </div>
-                           <?php } ?>
+                        <?php if ($hassidepost) { ?>
+                        <div id="region-post" class="block-region">
+                            <div class="region-content">
+                                <?php echo $OUTPUT->blocks_for_region('side-post') ?>
+                            </div>
+                        </div>
+                        <?php } ?>
                 
-                   </div>
-                   </div>
-               </div>
-       </div>
+                    </div>
+                </div>
+            </div>
+        </div>
 
 <!-- END OF CONTENT -->
 
-       <?php if ($hasheading || $hasnavbar) { ?>
-       <div class="myclear"></div>
-               </div>
-       <?php } ?>
-       
+    <?php if ($hasheading || $hasnavbar) { ?>
+    <div class="myclear"></div>
+        </div>
+    <?php } ?>
+
 <!-- START OF FOOTER -->
 
-       <?php if ($hasfooter) { ?>
-                   <div id="page-footer" class="wrapper">
-                       <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
-                       <?php
-                               echo $OUTPUT->login_info();
-                           echo $OUTPUT->home_link();
-                               echo $OUTPUT->standard_footer_html();
-                       ?>
-                   </div>
-           <?php } ?>
-           
+        <?php if ($hasfooter) { ?>
+            <div id="page-footer" class="wrapper">
+                <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
+                <?php
+                    echo $OUTPUT->login_info();
+                    echo $OUTPUT->home_link();
+                    echo $OUTPUT->standard_footer_html();
+                ?>
+            </div>
+        <?php } ?>
+
 </div>
 <?php echo $OUTPUT->standard_end_of_body_html() ?>
 </body>
Moodle official production repository