2.7.4c

gjb2048 · Jul 29, 2014 · d3f8a51 · d3f8a51
2 parents db43087 + d9260dd
commit d3f8a51
Show file tree

Hide file tree

Showing 15 changed files with 368 additions and 314 deletions.
diff --git a/README.txt b/README.txt
@@ -26,9 +26,13 @@ New in 2.7.4
 - FIX: Alternative colour sets all now have the same CSS, docking fixed and consistent with settings.
 - FIX: Moved all RTL to separate sheet from main CSS.  Sheet 'essential-rtl' uses 'flipped' technology whilst 'rtl' sheet has manual styles.
 - FIX: Issue #78.  Category icon issue in RTL.
+- FIX: Issue #90.  XML Editor last used.
+- FIX: Issue #88.  XML editor contrast issues.
+- FIX: Issue #89.  Dock causes horizontal scroll bar.
 - NEW: Alternative colour sets have text and link colour settings.
 - NEW: Optimised svg's to be smaller.
 - NEW: Warning about IE8 as M2.6 does not support it - http://docs.moodle.org/dev/Moodle_2.6_release_notes#Requirements.
+- NEW: If the page width setting is narrow and there are custom menu items the navigation bar and page adjusts to cope.
 
 New in 2.7.3
 ========================

diff --git a/lang/en/theme_essential.php b/lang/en/theme_essential.php
diff --git a/layout/columns1.php b/layout/columns1.php
@@ -50,10 +50,10 @@
 
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
+<div id="page" class="container-fluid">
 <?php require_once(dirname(__FILE__).'/includes/header.php'); ?>
 
-<section role="main-content">
-    <div id="page" class="container-fluid">
+    <section role="main-content">
         <!-- Start Main Regions -->
         <div id="page-content" class="row-fluid">
             <section id="region-main" class="span12">
@@ -70,9 +70,9 @@
         </div>
         <!-- End Main Regions -->
 
-    </div>
-</section>
+    </section>
 
-<?php require_once(dirname(__FILE__).'/includes/footer.php'); ?>
+    <?php require_once(dirname(__FILE__).'/includes/footer.php'); ?>
+</div>
 </body>
 </html>
diff --git a/layout/columns2.php b/layout/columns2.php
@@ -50,11 +50,11 @@
 
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
-<?php require_once(dirname(__FILE__).'/includes/header.php'); ?>
+<div id="page" class="container-fluid">
+    <?php require_once(dirname(__FILE__).'/includes/header.php'); ?>
 
-<section role="main-content">
-    <!-- Start Main Regions -->
-    <div id="page" class="container-fluid">
+    <section role="main-content">
+        <!-- Start Main Regions -->
         <div id="page-content" class="row-fluid">
             <section id="<?php echo $regionbsid;?>" class="span9<?php if ($left) { echo ' pull-right'; } ?>">
                 <div id="page-navbar" class="clearfix">
@@ -77,10 +77,10 @@
             ?>
         </div>
         <!-- End Main Regions -->
-    </div>
-</section>
+    </section>
 
-<?php require_once(dirname(__FILE__).'/includes/footer.php'); ?>
+    <?php require_once(dirname(__FILE__).'/includes/footer.php'); ?>
+</div>
 
 </body>
 </html>
diff --git a/layout/columns3.php b/layout/columns3.php
@@ -50,11 +50,11 @@
 
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
-<?php require_once(dirname(__FILE__).'/includes/header.php'); ?>
+<div id="page" class="container-fluid">
+    <?php require_once(dirname(__FILE__).'/includes/header.php'); ?>
 
-<section role="main-content">
-    <!-- Start Main Regions -->
-    <div id="page" class="container-fluid">
+    <section role="main-content">
+        <!-- Start Main Regions -->
         <div id="page-content" class="row-fluid">
             <div id="<?php echo $regionbsid ?>" class="span9">
                 <div class="row-fluid">
@@ -83,10 +83,10 @@
             <?php echo $OUTPUT->blocks('side-post', 'span3'); ?>
         </div>
         <!-- End Main Regions -->
-    </div>
-</section>
+    </section>
 
-<?php require_once(dirname(__FILE__).'/includes/footer.php'); ?>
+    <?php require_once(dirname(__FILE__).'/includes/footer.php'); ?>
+</div>
 
 </body>
 </html>
diff --git a/layout/embedded.php b/layout/embedded.php
@@ -51,15 +51,15 @@
 
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
-<section role="main-content">
-    <div id="page">
+<div id="page">
+    <section role="main-content">
         <div id="page-content" class="clearfix">
             <?php echo $OUTPUT->main_content(); ?>
         </div>
-    </div>
-</section>
+    </section>
 
-<?php echo $OUTPUT->standard_end_of_body_html() ?>
+    <?php echo $OUTPUT->standard_end_of_body_html() ?>
 
+</div>
 </body>
 </html>
diff --git a/layout/frontpage.php b/layout/frontpage.php
@@ -55,113 +55,113 @@
 
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
-<?php require_once(dirname(__FILE__).'/includes/header.php');?>
-<section class="slideshow">
-    <!-- Start Slideshow -->
-    <?php 
-        if($PAGE->theme->settings->toggleslideshow==1) {
-            require_once(dirname(__FILE__).'/includes/slideshow.php');
-        } else if($PAGE->theme->settings->toggleslideshow==2 && !isloggedin()) {
-            require_once(dirname(__FILE__).'/includes/slideshow.php');
-        } else if($PAGE->theme->settings->toggleslideshow==3 && isloggedin()) {
-            require_once(dirname(__FILE__).'/includes/slideshow.php');
-        } 
-    ?>
-    <!-- End Slideshow -->
-</section>
-
-<section role="main-content">
+<div id="page" class="container-fluid">
+    <?php require_once(dirname(__FILE__).'/includes/header.php');?>
+    <section class="slideshow">
+        <!-- Start Slideshow -->
+        <?php 
+            if($PAGE->theme->settings->toggleslideshow==1) {
+                require_once(dirname(__FILE__).'/includes/slideshow.php');
+            } else if($PAGE->theme->settings->toggleslideshow==2 && !isloggedin()) {
+                require_once(dirname(__FILE__).'/includes/slideshow.php');
+            } else if($PAGE->theme->settings->toggleslideshow==3 && isloggedin()) {
+                require_once(dirname(__FILE__).'/includes/slideshow.php');
+            } 
+        ?>
+        <!-- End Slideshow -->
+    </section>
+
+    <section role="main-content">
     <!-- Start Main Regions -->
-    <div id="page" class="container-fluid">
 
     <!-- Start Alerts -->
 
-    <!-- Alert #1 -->
-    <?php if ($PAGE->theme->settings->enable1alert) { ?>  
-        <div class="useralerts alert alert-<?php echo $PAGE->theme->settings->alert1type ?>">  
-        <a class="close" data-dismiss="alert" href="#"><i class="fa fa-times-circle"></i></a>
-        <?php 
-        if ($PAGE->theme->settings->alert1type == 'info') {
-            $alert1icon = $alertinfo;
-        } else if ($PAGE->theme->settings->alert1type == 'error') {
-            $alert1icon = $alertwarning;
-        } else {
-            $alert1icon = $alertsuccess;
-        } 
-        $alert1title = 'alert1title';
-        $alert1text = 'alert1text';
-        echo $alert1icon.'<span class="title">'.$PAGE->theme->settings->$alert1title.'</span>'.$PAGE->theme->settings->$alert1text; ?> 
-    </div>
-    <?php } ?>
+        <!-- Alert #1 -->
+        <?php if ($PAGE->theme->settings->enable1alert) { ?>  
+            <div class="useralerts alert alert-<?php echo $PAGE->theme->settings->alert1type ?>">  
+            <a class="close" data-dismiss="alert" href="#"><i class="fa fa-times-circle"></i></a>
+            <?php 
+            if ($PAGE->theme->settings->alert1type == 'info') {
+                $alert1icon = $alertinfo;
+            } else if ($PAGE->theme->settings->alert1type == 'error') {
+                $alert1icon = $alertwarning;
+            } else {
+                $alert1icon = $alertsuccess;
+            } 
+            $alert1title = 'alert1title';
+            $alert1text = 'alert1text';
+            echo $alert1icon.'<span class="title">'.$PAGE->theme->settings->$alert1title.'</span>'.$PAGE->theme->settings->$alert1text; ?> 
+        </div>
+        <?php } ?>
+
+        <!-- Alert #2 -->
+        <?php if ($PAGE->theme->settings->enable2alert) { ?>  
+            <div class="useralerts alert alert-<?php echo $PAGE->theme->settings->alert2type ?>">  
+            <a class="close" data-dismiss="alert" href="#"><i class="fa fa-times-circle"></i></a>
+            <?php 
+            if ($PAGE->theme->settings->alert2type == 'info') {
+                $alert2icon = $alertinfo;
+            } else if ($PAGE->theme->settings->alert2type == 'error') {
+                $alert2icon = $alertwarning;
+            } else {
+                $alert2icon = $alertsuccess;
+            } 
+            $alert2title = 'alert2title';
+            $alert2text = 'alert2text';
+            echo $alert2icon.'<span class="title">'.$PAGE->theme->settings->$alert2title.'</span>'.$PAGE->theme->settings->$alert2text; ?> 
+        </div>
+        <?php } ?>
 
-    <!-- Alert #2 -->
-    <?php if ($PAGE->theme->settings->enable2alert) { ?>  
-        <div class="useralerts alert alert-<?php echo $PAGE->theme->settings->alert2type ?>">  
-        <a class="close" data-dismiss="alert" href="#"><i class="fa fa-times-circle"></i></a>
+        <!-- Alert #3 -->
+        <?php if ($PAGE->theme->settings->enable3alert) { ?>  
+            <div class="useralerts alert alert-<?php echo $PAGE->theme->settings->alert3type ?>">  
+            <a class="close" data-dismiss="alert" href="#"><i class="fa fa-times-circle"></i></a>
+            <?php 
+            if ($PAGE->theme->settings->alert3type == 'info') {
+                $alert3icon = $alertinfo;
+            } else if ($PAGE->theme->settings->alert3type == 'error') {
+                $alert3icon = $alertwarning;
+            } else {
+                $alert3icon = $alertsuccess;
+            } 
+            $alert3title = 'alert3title';
+            $alert3text = 'alert3text';
+            echo $alert3icon.'<span class="title">'.$PAGE->theme->settings->$alert3title.'</span>'.$PAGE->theme->settings->$alert3text; ?> 
+        </div>
+        <?php } ?>
+        <!-- End Alerts -->
+
+        <!-- Start Frontpage Content -->
+        <?php if($PAGE->theme->settings->usefrontcontent ==1) { 
+            echo $PAGE->theme->settings->frontcontentarea;
+        ?>
+        <div class="bor" style="margin-top: 10px;"></div>   
+        <?php }?>
+        <!-- End Frontpage Content -->
+
+        <!-- Start Marketing Spots -->
         <?php 
-        if ($PAGE->theme->settings->alert2type == 'info') {
-            $alert2icon = $alertinfo;
-        } else if ($PAGE->theme->settings->alert2type == 'error') {
-            $alert2icon = $alertwarning;
-        } else {
-            $alert2icon = $alertsuccess;
-        } 
-        $alert2title = 'alert2title';
-        $alert2text = 'alert2text';
-        echo $alert2icon.'<span class="title">'.$PAGE->theme->settings->$alert2title.'</span>'.$PAGE->theme->settings->$alert2text; ?> 
-    </div>
-    <?php } ?>
+            if($PAGE->theme->settings->togglemarketing==1) {
+                require_once(dirname(__FILE__).'/includes/marketingspots.php');
+            } else if($PAGE->theme->settings->togglemarketing==2 && !isloggedin()) {
+                require_once(dirname(__FILE__).'/includes/marketingspots.php');
+            } else if($PAGE->theme->settings->togglemarketing==3 && isloggedin()) {
+                require_once(dirname(__FILE__).'/includes/marketingspots.php');
+            }
+        ?>
+        <!-- End Marketing Spots -->
 
-    <!-- Alert #3 -->
-    <?php if ($PAGE->theme->settings->enable3alert) { ?>  
-        <div class="useralerts alert alert-<?php echo $PAGE->theme->settings->alert3type ?>">  
-        <a class="close" data-dismiss="alert" href="#"><i class="fa fa-times-circle"></i></a>
+        <!-- Start Middle Blocks -->
         <?php 
-        if ($PAGE->theme->settings->alert3type == 'info') {
-            $alert3icon = $alertinfo;
-        } else if ($PAGE->theme->settings->alert3type == 'error') {
-            $alert3icon = $alertwarning;
-        } else {
-            $alert3icon = $alertsuccess;
-        } 
-        $alert3title = 'alert3title';
-        $alert3text = 'alert3text';
-        echo $alert3icon.'<span class="title">'.$PAGE->theme->settings->$alert3title.'</span>'.$PAGE->theme->settings->$alert3text; ?> 
-    </div>
-    <?php } ?>
-    <!-- End Alerts -->
-
-    <!-- Start Frontpage Content -->
-    <?php if($PAGE->theme->settings->usefrontcontent ==1) { 
-        echo $PAGE->theme->settings->frontcontentarea;
+            if($PAGE->theme->settings->frontpagemiddleblocks==1) {
+                require_once(dirname(__FILE__).'/includes/middleblocks.php');
+            } else if($PAGE->theme->settings->frontpagemiddleblocks==2 && !isloggedin()) {
+                require_once(dirname(__FILE__).'/includes/middleblocks.php');
+            } else if($PAGE->theme->settings->frontpagemiddleblocks==3 && isloggedin()) {
+                require_once(dirname(__FILE__).'/includes/middleblocks.php');
+            }
         ?>
-        <div class="bor" style="margin-top: 10px;"></div>   
-    <?php }?>
-    <!-- End Frontpage Content -->
-
-    <!-- Start Marketing Spots -->
-    <?php 
-        if($PAGE->theme->settings->togglemarketing==1) {
-            require_once(dirname(__FILE__).'/includes/marketingspots.php');
-        } else if($PAGE->theme->settings->togglemarketing==2 && !isloggedin()) {
-            require_once(dirname(__FILE__).'/includes/marketingspots.php');
-        } else if($PAGE->theme->settings->togglemarketing==3 && isloggedin()) {
-            require_once(dirname(__FILE__).'/includes/marketingspots.php');
-        } 
-    ?>
-    <!-- End Marketing Spots -->
-
-    <!-- Start Middle Blocks -->
-    <?php 
-        if($PAGE->theme->settings->frontpagemiddleblocks==1) {
-            require_once(dirname(__FILE__).'/includes/middleblocks.php');
-        } else if($PAGE->theme->settings->frontpagemiddleblocks==2 && !isloggedin()) {
-            require_once(dirname(__FILE__).'/includes/middleblocks.php');
-        } else if($PAGE->theme->settings->frontpagemiddleblocks==3 && isloggedin()) {
-            require_once(dirname(__FILE__).'/includes/middleblocks.php');
-        } 
-    ?>
-    <!-- End Middle Blocks -->
+        <!-- End Middle Blocks -->
 
         <div id="page-content" class="row-fluid">
             <?php if ($PAGE->theme->settings->frontpageblocks) { ?>
@@ -201,9 +201,9 @@
         </div>
         <?php } ?>
 
-    </div>
-</section>
+    </section>
 
-<?php require_once(dirname(__FILE__).'/includes/footer.php'); ?>
+    <?php require_once(dirname(__FILE__).'/includes/footer.php'); ?>
+</div>
 </body>
 </html>
diff --git a/layout/includes/header.php b/layout/includes/header.php
@@ -30,6 +30,26 @@
 <![endif]-->
 
 <header role="banner">
+    <nav role="navigation">
+        <div class="navbar<?php echo ($oldnavbar)? ' oldnavbar': '';?>">
+            <div class="container-fluid navbar-inner">
+                <a class="brand" href="<?php echo $CFG->wwwroot;?>"><?php echo $SITE->shortname; ?></a>
+                <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </a>
+                <div class="nav-collapse collapse">
+                    <?php echo $OUTPUT->custom_menu(); ?>
+                    <ul class="nav pull-right">
+                        <li><?php echo $OUTPUT->page_heading_menu(); ?></li>
+                        <li class="navbar-text"><?php echo $OUTPUT->login_info(); ?></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </nav>
+
     <div id="page-header" class="clearfix<?php echo ($oldnavbar)? ' oldnavbar': '';?>">
         <div class="container-fluid">
             <div class="row-fluid">
@@ -98,24 +118,4 @@
             </div>
         </div>
     </div>
-
-    <nav role="navigation">
-        <div class="navbar<?php echo ($oldnavbar)? ' oldnavbar': '';?>">
-            <div class="container-fluid navbar-inner">
-                <a class="brand" href="<?php echo $CFG->wwwroot;?>"><?php echo $SITE->shortname; ?></a>
-                <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </a>
-                <div class="nav-collapse collapse">
-                    <?php echo $OUTPUT->custom_menu(); ?>
-                    <ul class="nav pull-right">
-                        <li><?php echo $OUTPUT->page_heading_menu(); ?></li>
-                        <li class="navbar-text"><?php echo $OUTPUT->login_info(); ?></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </nav>
 </header>