diff --git a/README.txt b/README.txt index fa441858..50e819f3 100644 --- a/README.txt +++ b/README.txt @@ -86,15 +86,69 @@ It is essential that you provide as much information as possible, the critical i 'version.php' file. Other version information such as specific Moodle version, theme name and version also helps. A screen shot can be really useful in visualising the issue along with any files you consider to be relevant. +New in 2.7.7 +============ +- FIX: Issue #173: Message menu shows wrong time difference in Russian. +- FIX: Issue #175: Gradebook several bugs. +- FIX: Issue #179: User picture error. +- FIX: Issue #189: Gradebook - column text and sorting doesn't fit the column. +- FIX: Issue #191: Blocks not showing on the right of the frontpage for non-admins. +- FIX: Issue #196: Gradebook - vertical size in fixed column view. +- FIX: Issue #200: Category Edit / Delete Missing in newest version of Essential. +- FIX: Issue #208: Bug: Undefined function is_loggedin(). +- FIX: Issue #209: Showing white background. +- FIX: Issue #211: Image size in message menu. +- FIX: Issue #220: Standard Moodle Chat interface fails to load. +- FIX: Issue #221: Missing string 'unreadnewnotification'. +- FIX: Issue #225: Blank pages after some times. +- FIX: Issue #228: Incorrect z-index in menu. +- FIX: Issue #233: User image wrong in IE. +- FIX: Issue #237: Homepage main content block layout issues. +- FIX: Issue #238: Logged in user block styling. +- FIX: Issue #241: Background image appears as text box background. +- FIX: Issue #243: View Full toggle button not functional 2.6.9b. +- FIX: Issue #246: Menu bar down arrow caret causes shift of menu. +- NEW: Issue #74 : Fonts are CDN only. +- NEW: Issue #139: Enter own CDN font names. +- NEW: Issue #149: Add setting to not show the site shortname. +- NEW: Issue #170: Option in settings to choose how the site title in header appears. +- NEW: Issue #176: Option to Hide Calendar, Private Files, Forum Posts and Discussions from Dropdown. +- NEW: Issue #178: Error when editing user preferences. +- NEW: Issue #180: Same height marketing spots. +- NEW: Issue #181: Marketing spot header same as navbar. +- NEW: Issue #185: Custom background image dimensions. +- NEW: Issue #186: Add edit links to custom frontpage content items. +- NEW: Issue #197: Gradebook overall average font colour. +- NEW: Issue #204: Windows Mobile Apps. +- NEW: Issue #212: Upgrade FontAwesome 4.2.0. +- NEW: Issue #223: How to make a sub menu from custom menu. +- NEW: Issue #226: Move slideshow slides loading to function in lib.php. +- NEW: Issue #235: Color of course navigation block. +- NEW: Issue #240: Header title not wrapping in mobile view. + +New in 2.7.6b +============= +- FIX: Issue #205: Has the eye icon used to Enable/Disable an element been reversed in functionality? +- FIX: Issue #207: Fixed solution for #175 #196 - thanks @ppv1979. +- FIX: main site regions clean-up to prevent issues with blocks. +- FIX: huge code rewrite for menu items. +- FIX: optimized more icons to be loaded from font. +- NEW: New loading gif, reducing size by 500%. +- NEW: Issue #198: Collapsed Topics and other course formats (like core weeks) need print single page the same. + Course formats catered for: Topics, Weeks, Collapsed Topics, Columns, Grid and Noticeboard. If you require others, + please let us know. + NOTE: If you are using the Collapsed Topics course format then you MUST have version 2.6.1.3 or above installed. + If you are using the Columns course format then you MUST have version 2.6.1.1 or above installed. + New in 2.7.6a -======================== +============= - FIX: Issue #159: Custom Category Icons not displaying in 2.7.5h (Build: 2014081404). - FIX: Various code optimizations - NEW: Issue #172: Google font character sets. Implemented in #174 - thanks @vgango - NEW: Issue #194: Centred slide show caption. New in 2.7.6 -======================== +============ - FIX: Issue #159: Custom Category Icons not displaying in 2.7.5h (Build: 2014081404). - FIX: Issue #155: Social Icons Missing 2.7.5h - FIX: Issue #156, #70, #56: Caption background colour frontpage slider & active slide colours @@ -111,7 +165,7 @@ New in 2.7.6 - HELP WANTED: All language strings are now in AMOS (Moodle Language packs) please update your own language! New in 2.7.5 -======================== +============ - FIX: Issue #96: 2.7.4 breaks 'oldnavbar' setting. - FIX: Issue #98: Lang en/iosicondesc - Change 'them' to 'theme'. Thanks to Skylar Kelty. - FIX: Issue #101: Navbar not expanding properly on android mobile and tablet. @@ -153,7 +207,7 @@ New in 2.7.5 - NEW: Persistent link to your own grade report, available as long as you are enrolled in one visible course New in 2.7.4 -======================== +============ - FIX: Issue #68. Expand all not showing on Edit course settings. - FIX: Issue #58. Add font colour setting. - FIX: Issue #63. Slider caption overlap. @@ -180,7 +234,7 @@ New in 2.7.4 lots of redundant CSS. This presents problems when it comes to portable devices and bandwidth. New in 2.7.3 -======================== +============ - FIX: Fixed slide show by replacing with Bootstrap 2.3.2 one. Issue #18. - FIX: Make background image fixed and set a background transparent colour - FIX: Permanently replace edit icons with FontAwesome icons @@ -206,14 +260,14 @@ New in 2.7.3 - NEW: Transparent fixed background when setting a background image New in 2.7.2 -======================== +============ - FIX: Slideshow CSS fixes - FIX: Image alignment on slideshow - NEW: Select slideshow background color - NEW: Option to bring back the old navbar location New in 2.7.1 -======================== +============ - FIX: Numerous CSS fixes - FIX: Translation fixes - FIX: Updated Google Analytics code @@ -227,7 +281,7 @@ New in 2.7.1 - NEW: New slideshow design (WIP) New in 2.6.3 -======================== +============ - FIX: Numerous CSS fixes - FIX: Due to popular request reports are now 2 column again - FIX: Significantly improved RTL support @@ -239,7 +293,7 @@ New in 2.6.3 - NEW: Start Dutch translation New in 2.6.2 -======================== +============ - FIX: Numerous CSS fixes - FIX: Third level dropdown in custom menu now works - FIX: iOS7 custom menu now works when changed to a sing dropdown in portrait view @@ -248,7 +302,7 @@ New in 2.6.2 - NEW: Frontpage content now goes full width if all blocks removed. New in 2.6.1 -======================== +============ - NEW: MAJOR UPDATES for 2.6 compatibility. - NEW: Moved layouts to a more "Moodle standard" 1, 2 and 3 column layout. - NEW: Can now add three columns of blocks to middle of the homepage under marketing spots. @@ -263,7 +317,7 @@ New in 2.6.1 - FIX: Numerous CSS fixes and cleanup New in 2.6 -======================== +========== - Added ability to select from 21 preset Google Font combinations or disable their use completely. - Now includes additional Bootstrap JS plugins to allow for more dynamic formatting as shown on http://getbootstrap.com/javascript/ - New Frontpage Slideshow settings to allow to display; all the time, only before login, only after login or never. @@ -273,7 +327,7 @@ New in 2.6 - Further minor bug fixes and tidy up. New in 2.5.4 -======================== +============ - Display current enrolled courses in dropdown menu and choose terminology (modules, courses, classes or units). - New 'My Dashboard" in custommenu provides quick links to student tools. Can be disabled in theme settings. - iOS home screen icons now built in. Can upload your own via settings. @@ -286,7 +340,7 @@ New in 2.5.4 - New "Frontpage Content" box to add custom content in between the slideshow and marketing spots. Fixes in 2.5.4 -======================= +============== - Fix to frontpage slideshow. First slide now loads properly. - Updated include method to minimise conflicts with 3rd party plugins - Code significantly optimised. (about 1/5 less lines!) @@ -294,7 +348,7 @@ Fixes in 2.5.4 - IMPORTANT: Theme requires Moodle 2.5.1 or higher New in 2.5.3 -======================== +============ - New Settings screen just for colour selection - Admin can now toggle to use "autohide" functionality in courses. - Admin now upload their own background image @@ -311,7 +365,7 @@ New in 2.5.3 - EXPERIMENTAL: New course editing icons formatted and built with Font Awesome can now be used. New in 2.5.2 -======================== +============= - New theme setting to have user image show in the header when logged in. - Admin can choose to revert courses to a "standard" layout with blocks on the left and right sides - Admin can choose the default Navbar/breadcrumb separator @@ -321,7 +375,7 @@ New in 2.5.2 - Minor CSS fixes See the theme in Action -======================== +======================= A video showing many of the core features is available for viewing at http://vimeo.com/69683774 Documentation @@ -329,10 +383,17 @@ Documentation As always, documentation is a work in progress. Available documentation is available at http://docs.moodle.org/25/en/Essential_theme If you have questions you can post them in the issue tracker at https://github.com/DBezemer/moodle-theme_essential/issues +Original Author +=============== +Julian Ridden +Moodle profile: https://moodle.org/user/profile.php?id=39680 +Web profile: http://au.linkedin.com/in/eduridden/ + Maintained by -======================== +============= David Bezemer Moodle profile: https://moodle.org/user/profile.php?id=1416592 +Web profile: http://www.davidbezemer.nl G J Barnard MSc. BSc(Hons)(Sndw). MBCS. CEng. CITP. PGCE. Moodle profile: http://moodle.org/user/profile.php?id=442195 diff --git a/config.php b/config.php index 90b9a9ad..18919c70 100644 --- a/config.php +++ b/config.php @@ -42,66 +42,71 @@ $THEME->sheets[] = 'essential'; } -if ((get_config('theme_essential', 'enablealternativethemecolors1')) || - (get_config('theme_essential', 'enablealternativethemecolors2')) || - (get_config('theme_essential', 'enablealternativethemecolors3'))) -{ +if ((get_config('theme_essential', 'enablealternativethemecolors1')) || + (get_config('theme_essential', 'enablealternativethemecolors2')) || + (get_config('theme_essential', 'enablealternativethemecolors3')) +) { $THEME->sheets[] = 'alternative'; } $THEME->sheets[] = 'custom'; $THEME->supportscssoptimisation = false; -$THEME->enable_dock = true; + +if (intval($CFG->version) >= 2013111800) { + $THEME->enable_dock = true; + $THEME->javascripts_footer[] = 'dock'; +} $THEME->editor_sheets = array('editor'); -if (get_config('theme_essential','frontpagemiddleblocks') == 1 || - (get_config('theme_essential','frontpagemiddleblocks') == 2 && is_loggedin())) { +$addregions = array(); +if (get_config('theme_essential', 'frontpagemiddleblocks') > 0) { $addregions = array('home-left', 'home-middle', 'home-right'); -} else { - $addregions = array(); -} -if (is_siteadmin()){ - $addregions[] = 'hidden-dock'; } + + $THEME->layouts = array( // Most backwards compatible layout without the blocks - this is the layout used by default. 'base' => array( 'file' => 'columns1.php', - 'regions' => array(), + 'regions' => array('footer-left', 'footer-middle', 'footer-right'), 'defaultregion' => '', - 'options' => array('noblocks'=>true), ), // Front page. 'frontpage' => array( 'file' => 'frontpage.php', - 'regions' => array_merge(array('side-pre', 'footer-left', 'footer-middle', 'footer-right'), $addregions), + 'regions' => array_merge(array('side-pre', 'footer-left', 'footer-middle', 'footer-right', 'hidden-dock'), $addregions), 'defaultregion' => 'side-pre', ), // Standard layout with blocks, this is recommended for most pages with general information. 'standard' => array( - 'file' => 'columns3.php', - 'regions' => array('side-pre', 'side-post', 'footer-left', 'footer-middle', 'footer-right'), - 'defaultregion' => 'side-post', + 'file' => 'columns2.php', + 'regions' => array('side-pre', 'footer-left', 'footer-middle', 'footer-right'), + 'defaultregion' => 'side-pre', + ), + // Standard layout with blocks, this is recommended for most pages with general information. + 'message-index' => array( + 'file' => 'columns2.php', + 'regions' => array('side-pre', 'footer-left', 'footer-middle', 'footer-right'), + 'defaultregion' => 'side-pre', ), // Main course page. 'course' => array( 'file' => 'columns3.php', 'regions' => array('side-pre', 'side-post', 'footer-left', 'footer-middle', 'footer-right'), 'defaultregion' => 'side-post', - 'options' => array('langmenu'=>true), ), 'coursecategory' => array( - 'file' => 'columns3.php', - 'regions' => array('side-pre', 'side-post', 'footer-left', 'footer-middle', 'footer-right'), - 'defaultregion' => 'side-post', + 'file' => 'columns2.php', + 'regions' => array('side-pre', 'footer-left', 'footer-middle', 'footer-right'), + 'defaultregion' => 'side-pre', ), // part of course, typical for modules - default page layout if $cm specified in require_login(). 'incourse' => array( - 'file' => 'columns3.php', - 'regions' => array('side-pre','side-post', 'footer-left', 'footer-middle', 'footer-right'), - 'defaultregion' => 'side-post', + 'file' => 'columns2.php', + 'regions' => array('side-pre', 'footer-left', 'footer-middle', 'footer-right'), + 'defaultregion' => 'side-pre', ), // Server administration scripts. 'admin' => array( @@ -138,7 +143,7 @@ 'file' => 'columns1.php', 'regions' => array('footer-left', 'footer-middle', 'footer-right'), 'defaultregion' => 'footer-right', - 'options' => array('nofooter'=>true, 'nocoursefooter'=>true), + 'options' => array('nofooter' => true, 'nocoursefooter' => true), ), // Embeded pages, like iframe/object embeded in moodleform - it needs as much space as possible. 'embedded' => array( @@ -158,18 +163,18 @@ 'print' => array( 'file' => 'columns1.php', 'regions' => array('footer-left', 'footer-middle', 'footer-right'), - 'defaultregion' => 'footer-right', - 'options' => array('nofooter'=>true), + 'defaultregion' => '', + 'options' => array('nofooter' => true), ), // The pagelayout used when a redirection is occuring. 'redirect' => array( - 'file' => 'embedded.php', + 'file' => 'redirect.php', 'regions' => array(), 'defaultregion' => '', ), // The pagelayout used for reports. 'report' => array( - 'file' => 'columns2.php', + 'file' => 'report.php', 'regions' => array('side-pre', 'footer-left', 'footer-middle', 'footer-right'), 'defaultregion' => 'side-pre', ), @@ -182,7 +187,6 @@ ); $THEME->javascripts_footer[] = 'coloursswitcher'; -$THEME->javascripts_footer[] = 'dock'; $THEME->rendererfactory = 'theme_overridden_renderer_factory'; $THEME->csspostprocess = 'theme_essential_process_css'; \ No newline at end of file diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf index 3461e3fc..81c9ad94 100644 Binary files a/fonts/FontAwesome.otf and b/fonts/FontAwesome.otf differ diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot index 6cfd5660..84677bc0 100755 Binary files a/fonts/fontawesome-webfont.eot and b/fonts/fontawesome-webfont.eot differ diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg index a9f84695..d907b25a 100755 --- a/fonts/fontawesome-webfont.svg +++ b/fonts/fontawesome-webfont.svg @@ -32,473 +32,489 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf index 5cd6cff6..96a3639c 100755 Binary files a/fonts/fontawesome-webfont.ttf and b/fonts/fontawesome-webfont.ttf differ diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff index 9eaecb37..628b6a52 100755 Binary files a/fonts/fontawesome-webfont.woff and b/fonts/fontawesome-webfont.woff differ diff --git a/javascript/coloursswitcher.js b/javascript/coloursswitcher.js index bd149bb7..9ff3e3bf 100644 --- a/javascript/coloursswitcher.js +++ b/javascript/coloursswitcher.js @@ -1,66 +1,66 @@ -YUI.add('moodle-theme_essential-coloursswitcher', function(Y) { +YUI.add('moodle-theme_essential-coloursswitcher', function (Y) { // Available color schemes. -var SCHEMES = ['default', 'alternative1', 'alternative2', 'alternative3']; + var SCHEMES = ['default', 'alternative1', 'alternative2', 'alternative3']; -/** - * Essential theme colours switcher class. - * Initialise this class by calling M.theme_essential.init - */ -var ColoursSwitcher = function() { - ColoursSwitcher.superclass.constructor.apply(this, arguments); -}; -ColoursSwitcher.prototype = { /** - * Constructor for this class - * @param {object} config + * Essential theme colours switcher class. + * Initialise this class by calling M.theme_essential.init */ - initializer : function(config) { - var i, s; - // Attach events to the links to change colours scheme so we can do it with - // JavaScript without refreshing the page. - for (i in SCHEMES) { - s = SCHEMES[i]; - // Check if this is the current colour. - if (Y.one(document.body).hasClass('essential-colours-' + s)) { - this.set('scheme', s); + var ColoursSwitcher = function () { + ColoursSwitcher.superclass.constructor.apply(this, arguments); + }; + ColoursSwitcher.prototype = { + /** + * Constructor for this class + * @param {object} config + */ + initializer: function (config) { + var i, s; + // Attach events to the links to change colours scheme so we can do it with + // JavaScript without refreshing the page. + for (i in SCHEMES) { + s = SCHEMES[i]; + // Check if this is the current colour. + if (Y.one(document.body).hasClass('essential-colours-' + s)) { + this.set('scheme', s); + } + Y.all(config.div + ' .colours-' + s).each(function (node) { + node.ancestor().on('click', this.setScheme, this, s); + }, this); } - Y.all(config.div + ' .colours-' + s).each(function(node) { - node.ancestor().on('click', this.setScheme, this, s); - }, this); + }, + /** + * Sets the colour being used for the essential theme + * @param {Y.Event} e The event that fired + * @param {string} colours The new colours scheme + */ + setScheme: function (e, scheme) { + // Prevent the event from refreshing the page. + e.preventDefault(); + // Switch over the CSS classes on the body. + var prefix = 'essential-colours-'; + Y.one(document.body).replaceClass(prefix + this.get('scheme'), prefix + scheme); + // Update the current colour. + this.set('scheme', scheme); + // Store the users selection (Uses AJAX to save to the database). + M.util.set_user_preference('theme_essential_colours', scheme); } - }, - /** - * Sets the colour being used for the essential theme - * @param {Y.Event} e The event that fired - * @param {string} colours The new colours scheme - */ - setScheme : function(e, scheme) { - // Prevent the event from refreshing the page. - e.preventDefault(); - // Switch over the CSS classes on the body. - var prefix = 'essential-colours-'; - Y.one(document.body).replaceClass(prefix + this.get('scheme'), prefix + scheme); - // Update the current colour. - this.set('scheme', scheme); - // Store the users selection (Uses AJAX to save to the database). - M.util.set_user_preference('theme_essential_colours', scheme); - } -}; + }; // Make the colours switcher a fully fledged YUI module. -Y.extend(ColoursSwitcher, Y.Base, ColoursSwitcher.prototype, { - NAME : 'Essential theme colours scheme switcher', - ATTRS : { - scheme: { - value : 'default' + Y.extend(ColoursSwitcher, Y.Base, ColoursSwitcher.prototype, { + NAME: 'Essential theme colours scheme switcher', + ATTRS: { + scheme: { + value: 'default' + } } - } -}); + }); // Our Essential theme namespace -M.theme_essential = M.theme_essential || {}; + M.theme_essential = M.theme_essential || {}; // Initialisation function for the colours scheme switcher -M.theme_essential.initColoursSwitcher = function(cfg) { - return new ColoursSwitcher(cfg); -} + M.theme_essential.initColoursSwitcher = function (cfg) { + return new ColoursSwitcher(cfg); + } -}, '@VERSION@', {requires:['base','node']}); +}, '@VERSION@', {requires: ['base', 'node']}); diff --git a/javascript/dock.js b/javascript/dock.js index 3e29b497..93d1cd2f 100644 --- a/javascript/dock.js +++ b/javascript/dock.js @@ -11,13 +11,13 @@ function customise_dock_for_theme(dock) { // Add the "block" class to docked blocks. // This prevents having to restyle all docked blocks and simply use standard block styling. // First we wait until the panel has been generated. - dock.on('dock:panelgenerated', function() { + dock.on('dock:panelgenerated', function () { // Then we wait until the panel it is being shown for the first time. - dock.get('panel').once('dockpanel:beforeshow', function() { + dock.get('panel').once('dockpanel:beforeshow', function () { // Finally we add the block class. Y.all('.dockeditempanel_content').addClass('block'); }); - dock.get('panel').on('dockpanel:beforeshow', function() { + dock.get('panel').on('dockpanel:beforeshow', function () { var content = Y.all('.dockeditempanel_content'); // Finally set a responsible max width. content.setStyle('maxWidth', content.get('winWidth') - dock.get('dockNode').get('offsetWidth') - 10); @@ -27,7 +27,7 @@ function customise_dock_for_theme(dock) { // Handle the opening/closing of the bootstrap collapsible navbar on small screens. // This is a complex little bit of JS because we need to simulate Bootstrap actions in order to measure height changes // in the dom and apply them as spacing to the dock. - dock.on('dock:initialised', function() { + dock.on('dock:initialised', function () { var navbar = Y.one('header.navbar'), navbarbtn = Y.one('header.navbar .btn-navbar'), navcollapse = Y.one('header.navbar .nav-collapse'), @@ -38,7 +38,7 @@ function customise_dock_for_theme(dock) { if (navbar && navbarbtn && container) { margintop = parseInt(container.getStyle('marginTop').replace(/px$/, ''), 10); diff = margintop - parseInt(navbar.get('offsetHeight'), 10); - navbarbtn.ancestor().on('click', function() { + navbarbtn.ancestor().on('click', function () { // We need to fake the collapsible region being active, this JS *ALWAYS* executes before the bootstrap JS. navcollapse.toggleClass('active'); if (!this.hasClass('active')) { diff --git a/jquery/fitvids_1_1.js b/jquery/fitvids_1_1.js new file mode 100644 index 00000000..4d2ed54f --- /dev/null +++ b/jquery/fitvids_1_1.js @@ -0,0 +1,83 @@ +/*global jQuery */ +/*jshint browser:true */ +/*! + * FitVids 1.1 + * + * Copyright 2013, Chris Coyier - http://css-tricks.com + Dave Rupert - http://daverupert.com + * Credit to Thierry Koblentz - http://www.alistapart.com/articles/creating-intrinsic-ratios-for-video/ + * Released under the WTFPL license - http://sam.zoy.org/wtfpl/ + * + */ + +(function( $ ){ + + "use strict"; + + $.fn.fitVids = function( options ) { + var settings = { + customSelector: null, + ignore: null + }; + + if(!document.getElementById('fit-vids-style')) { + // appendStyles: https://github.com/toddmotto/fluidvids/blob/master/dist/fluidvids.js + var head = document.head || document.getElementsByTagName('head')[0]; + var css = '.fluid-width-video-wrapper{width:100%;position:relative;padding:0;}.fluid-width-video-wrapper iframe,.fluid-width-video-wrapper object,.fluid-width-video-wrapper embed {position:absolute;top:0;left:0;width:100%;height:100%;}'; + var div = document.createElement('div'); + div.innerHTML = '

x

'; + head.appendChild(div.childNodes[1]); + } + + if ( options ) { + $.extend( settings, options ); + } + + return this.each(function(){ + var selectors = [ + "iframe[src*='player.vimeo.com']", + "iframe[src*='youtube.com']", + "iframe[src*='youtube-nocookie.com']", + "iframe[src*='kickstarter.com'][src*='video.html']", + "object", + "embed" + ]; + + if (settings.customSelector) { + selectors.push(settings.customSelector); + } + + var ignoreList = '.fitvidsignore'; + + if(settings.ignore) { + ignoreList = ignoreList + ', ' + settings.ignore; + } + + var $allVideos = $(this).find(selectors.join(',')); + $allVideos = $allVideos.not("object object"); // SwfObj conflict patch + $allVideos = $allVideos.not(ignoreList); // Disable FitVids on this video. + + $allVideos.each(function(){ + var $this = $(this); + if($this.parents(ignoreList).length > 0) { + return; // Disable FitVids on this video. + } + if (this.tagName.toLowerCase() === 'embed' && $this.parent('object').length || $this.parent('.fluid-width-video-wrapper').length) { return; } + if ((!$this.css('height') && !$this.css('width')) && (isNaN($this.attr('height')) || isNaN($this.attr('width')))) + { + $this.attr('height', 9); + $this.attr('width', 16); + } + var height = ( this.tagName.toLowerCase() === 'object' || ($this.attr('height') && !isNaN(parseInt($this.attr('height'), 10))) ) ? parseInt($this.attr('height'), 10) : $this.height(), + width = !isNaN(parseInt($this.attr('width'), 10)) ? parseInt($this.attr('width'), 10) : $this.width(), + aspectRatio = height / width; + if(!$this.attr('id')){ + var videoID = 'fitvid' + Math.floor(Math.random()*999999); + $this.attr('id', videoID); + } + $this.wrap('
').parent('.fluid-width-video-wrapper').css('padding-top', (aspectRatio * 100)+"%"); + $this.removeAttr('height').removeAttr('width'); + }); + }); + }; +// Works with either jQuery or Zepto +})(window.jQuery); \ No newline at end of file diff --git a/jquery/plugins.php b/jquery/plugins.php index 48db5e2a..f5085bbc 100644 --- a/jquery/plugins.php +++ b/jquery/plugins.php @@ -46,4 +46,5 @@ 'bootstrap' => array('files' => array('bootstrap_2_3_2.js')), 'html5shiv' => array('files' => array('html5shiv_3_7_2.js')), 'breadcrumb' => array('files' => array('jBreadCrumb_1_1.js')), + 'fitvids' => array('files' => array('fitvids_1_1.js')), ); \ No newline at end of file diff --git a/lang/en/theme_essential.php b/lang/en/theme_essential.php index f38db7a0..40df6cb1 100644 --- a/lang/en/theme_essential.php +++ b/lang/en/theme_essential.php @@ -61,18 +61,34 @@ $string['footnote'] = 'Footnote'; $string['footnotedesc'] = 'Whatever you add to this textarea will be displayed in the footer throughout your Moodle site.'; -$string['invert'] = 'Invert navbar'; -$string['invertdesc'] = 'Swaps text and background for the navbar at the top of the page between black and white.'; - $string['logo'] = 'Logo'; -$string['logodesc'] = 'Please upload your custom logo here if you want to add it to the header.
The image should be 65px high and any reasonable width that suits.
If you upload a logo it will replace the standard icon and name that was displayed by default.'; +$string['logodesc'] = 'Please upload your custom logo here if you want to add it to the header. +
The image should be 65px high and any reasonable width that suits. +
If you upload a logo it will replace the standard icon and name that was displayed by default.'; + +/* Font settings */ +$string['fontheading'] = 'Font settings'; +$string['fontheadingdesc'] = 'Select and enter the fonts that you want to use in your Moodle environment.'; +$string['fontselect'] = 'Font type selector'; +$string['fontselectdesc'] = 'Choose from the list of available font types. Please save to show the options for your choice.'; +$string['fonttypestandard'] = 'Standard fonts'; +$string['fonttypegoogle'] = 'Google web fonts'; +$string['fonttypecustom'] = 'Custom font'; +$string['fontnameheading'] = 'Heading font'; +$string['fontnameheadingdesc'] = 'Enter the exact name of the font to use for headings.'; +$string['fontnamebody'] = 'Text font'; +$string['fontnamebodydesc'] = 'Enter the exact name of the font to use for all other text.'; + +/* Font files */ +$string['fontfiles'] = 'Font files'; +$string['fontfilesdesc'] = 'Upload your font files here, only TTF files are supported.'; +$string['fontfilettfheading'] = 'Heading TTF font file'; +$string['fontfilettfbody'] = 'Body TTF font file'; -$string['fontselect'] = 'Font selector'; -$string['fontselectdesc'] = 'Choose from the list of available font combinations. You can choose here to disable Google fonts if needed.'; $string['fontcharacterset'] = 'Google font additional character set'; -$string['fontcharactersetdesc'] = 'If a Google font is chosen, you can pick additional character sets for different languages. Using many character sets can slow down your webpage, so only select the character sets that you actually need on your webpage.'; -$string['fontcharactersetlatin'] = 'Latin'; +$string['fontcharactersetdesc'] = 'Pick additional character sets for different languages. + Using many character sets can slow down your Moodle, so only select the character sets that you actually need.'; $string['fontcharactersetlatinext'] = 'Latin Extended'; $string['fontcharactersetcyrillic'] = 'Cyrillic'; $string['fontcharactersetcyrillicext'] = 'Cyrillic Extended'; @@ -81,7 +97,8 @@ $string['fontcharactersetvietnamese'] = 'Vietnamese'; $string['bootstrapcdn'] = 'FontAwesome from CDN'; -$string['bootstrapcdndesc'] = 'If enabled this will load FontAwesome from the online Bootstrap CDN source. Enable this if you are having issues getting the Font Awesome icons to display in your site.'; +$string['bootstrapcdndesc'] = 'If enabled this will load FontAwesome from the online Bootstrap CDN source. + Enable this if you are having issues getting the Font Awesome icons to display in your site.'; $string['copyright'] = 'Copyright'; $string['copyrightdesc'] = 'The name of your organisation.'; @@ -172,7 +189,7 @@ $string['helplink'] = 'Help link'; $string['helplinkdesc'] = 'If you chose URL above fill in the complete URL to your help site (must include http:// or https://). If you chose Email address fill in your email address.'; -$string[ 'few'] = 'A few '; +$string['few'] = 'A few '; $string['loggedinas'] = ' logged in as '; $string['loggedinfrom'] = 'Logged in from '; @@ -234,7 +251,12 @@ $string['footerheadingcolordesc'] = 'Set the colour for block headings in the footer.'; $string['pagebackground'] = 'Page background image'; -$string['pagebackgrounddesc'] = 'Upload your own background image. This will be stretched in the background on all pages.'; +$string['pagebackgrounddesc'] = 'Upload your own background image. Select the style of the image below.'; +$string['pagebackgroundstyle'] = 'Page background style'; +$string['pagebackgroundstyledesc'] = 'Select the style for the uploaded image.'; +$string['backgroundstylefixed'] = 'Fixed'; +$string['backgroundstyletiled'] = 'Tiled'; +$string['backgroundstylestretch'] = 'Stretch'; /* Alternate Colour Switcher */ $string['themecolors'] = 'Theme colours'; @@ -422,7 +444,18 @@ /* Header Settings */ $string['headerheading'] = 'Header'; -$string['headerheadingsub'] = 'Configure the various features for the header here'; +$string['headertitle'] = 'Header title'; +$string['headertitledesc'] = 'Configure here what title to output in the header.'; +$string['navbartitle'] = 'Navigation bar title'; +$string['navbartitledesc'] = 'Configure here what title to output in the navigation bar.'; +$string['notitle'] = 'No Title'; +$string['fullname'] = 'Site full name'; +$string['shortname'] = 'Site short name'; +$string['fullnamesummary'] = 'Full name and summary'; +$string['shortnamesummary'] = 'Short name and summary'; + +/* Footer Settings */ +$string['footerheading'] = 'Footer'; /* Mobile Apps */ $string['mobileappsheading'] = 'Apps'; @@ -430,10 +463,16 @@ $string['mobileappsdesc'] = 'Have you got a web app on the App Store or Google Play Store? Provide a link here so your users can grab the apps online.'; $string['android'] = 'Android (Google Play)'; -$string['androiddesc'] = 'Provide an URL to your mobile App on the Google Play Store. If you do not have one of your own maybe consider linking to the free official Moodle Mobile app. (https://play.google.com/store/apps/details?id=com.moodle.moodlemobile)'; +$string['androiddesc'] = 'Provide an URL to your mobile App on the Google Play Store. If you do not have one of your own maybe consider linking to the official Moodle Mobile app. (https://play.google.com/store/apps/details?id=com.moodle.moodlemobile)'; + +$string['windows'] = 'Windows Desktop'; +$string['windowsdesc'] = 'Provide an URL to your mobile App on the Windows Store. If you do not have one of your own maybe consider linking to the official Moodle Mobile app. (http://apps.microsoft.com/windows/en-us/app/9df51338-015c-41b7-8a85-db2fdfb870bc)'; + +$string['winphone'] = 'Windows Mobile'; +$string['winphonedesc'] = 'Provide an URL to your mobile App on the Google Play Store. If you do not have one of your own maybe consider linking to the official Moodle Mobile app. (http://www.windowsphone.com/en-us/store/app/moodlemobile/d0732b88-3c6d-4127-8f24-3fca2452a4dc)'; $string['ios'] = 'iPhone/iPad (App Store)'; -$string['iosdesc'] = 'Provide an URL to your mobile App on the App Store. If you do not have one of your own maybe consider linking to the free official Moodle Mobile app (https://itunes.apple.com/en/app/moodle-mobile/id633359593).'; +$string['iosdesc'] = 'Provide an URL to your mobile App on the App Store. If you do not have one of your own maybe consider linking to the official Moodle Mobile app (https://itunes.apple.com/en/app/moodle-mobile/id633359593).'; /* iOS Icons */ $string['iosicon'] = 'iOS home screen icons'; @@ -451,22 +490,26 @@ $string['ipadretinaicon'] = 'iPad Icon (Retina)'; $string['ipadretinaicondesc'] = 'Icon should be a PNG files sized 144px by 144px.'; -/* Google Analytics */ -$string['analyticsheading'] = 'Google Analytics'; -$string['analyticsheadingsub'] = 'Powerful analytics from Google'; -$string['analyticsdesc'] = 'Here you can enable Google Analytics for your moodle site. You will need to sign up for a free account at the Google Analytics site (http://analytics.google.com)'; - -$string['useanalytics'] = 'Enable Google Analytics'; -$string['useanalyticsdesc'] = 'Enable or disable Google Analytics functionality.'; - -$string['analyticsid'] = 'Your Tracking ID'; -$string['analyticsiddesc'] = 'Enter the provided Tracking ID. Typically formatted like UA-XXXXXXXX-X'; - -$string['analyticsclean'] = 'Send Clean URLs'; -$string['analyticscleandesc'] = 'This fantastic feature was created by Gavin Henrick and Bas Brands and is implemented in this theme. Rather than standard Moodle URLs the theme will send out clean URLs making it easier to identify the page and provide advanced reporting. More information on using this feature and its uses can be found here.'; - -$string['analyticsadmin'] = 'Track admin users'; -$string['analyticsadmindesc'] = 'Enable to track admin users.'; +/* Analytics */ +$string['analytics'] = 'Analytics'; +$string['analyticsheadingsub'] = 'Powerful analytics for Moodle'; +$string['analyticsdesc'] = 'Choose the type of Analytics you want to insert and save to enable the other options.'; +$string['analyticssiteid'] = 'Site ID'; +$string['analyticssiteiddesc'] = 'Enter your Site ID'; +$string['analyticstrackingid'] = 'Site ID'; +$string['analyticstrackingiddesc'] = 'Enter your Tracking ID'; +$string['analyticssiteurl'] = 'Analytics URL'; +$string['analyticssiteurldesc'] = 'Enter your Piwik Analytics URL without http(s) or a trailing slash'; +$string['analyticsenabled'] = 'Enabled'; +$string['analyticsenableddesc'] = 'Enable Analytics for Moodle'; +$string['analyticsimagetrack'] = 'Image Tracking'; +$string['analyticscleanurl'] = 'Clean URLs'; +$string['analyticscleanurldesc'] = 'Generate clean URL for in advanced tracking'; +$string['analyticsimagetrackdesc'] = 'Enable Image Tracking for browsers with JavaScript disabled.'; +$string['analyticstrackadmin'] = 'Tracking Admins'; +$string['analyticstrackadmindesc'] = 'Enable tracking of Admin users (not recommended)'; +$string['analyticspiwik'] = 'Piwik'; +$string['analyticsguniversal'] = 'Google Universal Analytics'; /* Alerts */ $string['alertsheading'] = 'User alerts'; @@ -492,3 +535,12 @@ $string['alert_info'] = 'Information'; $string['alert_warning'] = 'Warning'; $string['alert_general'] = 'Announcement'; + +/* Message Menu */ +$string['unreadnewnotification'] = 'New notification'; +$string['nomessagesfound'] = 'No messages were found'; + +$string['blogpreferences'] = 'Blog preferences'; +$string['badgepreferences'] = 'Badge preferences'; +$string['messagepreferences'] = 'Message preferences'; + diff --git a/layout/columns1.php b/layout/columns1.php index c81a0f10..054e00f7 100644 --- a/layout/columns1.php +++ b/layout/columns1.php @@ -24,12 +24,14 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -require_once(dirname(__FILE__).'/includes/header.php'); ?> +require_once(dirname(__FILE__) . '/includes/header.php'); ?>
-
navbar(); ?>
- +
navbar(); ?>
+
@@ -37,11 +39,13 @@
id > 1) { echo $OUTPUT->heading($COURSE->fullname, 1, 'coursetitle'); - echo '
'; + echo '
'; } ?> course_content_header(); ?> main_content(); ?> - course_content_footer(); ?> + layout_options['nocoursefooter'])) { + echo $OUTPUT->course_content_footer(); + }?>
@@ -49,6 +53,6 @@ - + diff --git a/layout/columns2.php b/layout/columns2.php index 29ce23f0..5fa31a0d 100644 --- a/layout/columns2.php +++ b/layout/columns2.php @@ -24,12 +24,14 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -require_once(dirname(__FILE__).'/includes/header.php'); ?> +require_once(dirname(__FILE__) . '/includes/header.php'); ?>
-
navbar(); ?>
- +
navbar(); ?>
+
@@ -38,22 +40,24 @@
- -
- - id > 1) { - echo $OUTPUT->heading($COURSE->fullname, 1, 'coursetitle'); - echo '
'; - } ?> - course_content_header(); ?> - main_content(); ?> - course_content_footer(); ?> -
- - blocks('side-pre', 'span3 desktop-first-column'); ?> - - blocks('side-pre', 'span3 pull-right'); ?> - + +
+ + id > 1) { + echo $OUTPUT->heading($COURSE->fullname, 1, 'coursetitle'); + echo '
'; + } ?> + course_content_header(); ?> + main_content(); ?> + layout_options['nocoursefooter'])) { + echo $OUTPUT->course_content_footer(); + }?> +
+ + blocks('side-pre', 'span3 desktop-first-column'); ?> + + blocks('side-pre', 'span3 pull-right'); ?> +
@@ -61,7 +65,7 @@ - + diff --git a/layout/columns3.php b/layout/columns3.php index 3a8d50bb..60ed06fd 100644 --- a/layout/columns3.php +++ b/layout/columns3.php @@ -23,13 +23,15 @@ * @copyright 2014 Gareth J Barnard, David Bezemer * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -require_once(dirname(__FILE__).'/includes/header.php'); ?> + +require_once(dirname(__FILE__) . '/includes/header.php'); ?>
-
navbar(); ?>
- +
navbar(); ?>
+
@@ -38,22 +40,24 @@
- -
- - id > 1) { - echo $OUTPUT->heading($COURSE->fullname, 1, 'coursetitle'); - echo '
'; - } ?> - course_content_header(); ?> - main_content(); ?> - course_content_footer(); ?> -
- - blocks('side-pre', 'span4 desktop-first-column'); ?> - - blocks('side-pre', 'span4 pull-right'); ?> - + +
+ + id > 1) { + echo $OUTPUT->heading($COURSE->fullname, 1, 'coursetitle'); + echo '
'; + } ?> + course_content_header(); ?> + main_content(); ?> + layout_options['nocoursefooter'])) { + echo $OUTPUT->course_content_footer(); + }?> +
+ + blocks('side-pre', 'span4 desktop-first-column'); ?> + + blocks('side-pre', 'span4 pull-right'); ?> +
blocks('side-post', 'span3'); ?> @@ -62,7 +66,7 @@ - + diff --git a/layout/embedded.php b/layout/embedded.php index 306bd473..84755744 100644 --- a/layout/embedded.php +++ b/layout/embedded.php @@ -24,49 +24,30 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -require_once(dirname(__FILE__).'/includes/pagesettings.php'); - echo $OUTPUT->doctype() ?> htmlattributes(); ?>> <?php echo $OUTPUT->page_title(); ?> - + standard_head_html() ?> - - - - - - - - - -body_attributes($bodyclasses); ?>> +body_attributes(); ?>> standard_top_of_body_html() ?> -
-
-
- heading($PAGE->title); ?> -
-
-
-
-
+
main_content(); ?> -
+standard_end_of_body_html() ?> \ No newline at end of file diff --git a/layout/frontpage.php b/layout/frontpage.php index ff778bb6..69491257 100755 --- a/layout/frontpage.php +++ b/layout/frontpage.php @@ -24,146 +24,147 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -require_once(dirname(__FILE__).'/includes/header.php');?> +require_once(dirname(__FILE__) . '/includes/header.php');?>
-
- + - + - -
- - '.theme_essential_get_setting('alert1title', true).''.theme_essential_get_setting('alert1text', true); ?> -
+ +
+ + ' . theme_essential_get_setting('alert1title', true) . '' . theme_essential_get_setting('alert1text', true); ?> +
- -
- - '.theme_essential_get_setting('alert2title', true).''.theme_essential_get_setting('alert2text', true); ?> -
+ +
+ + ' . theme_essential_get_setting('alert2title', true) . '' . theme_essential_get_setting('alert2text', true); ?> +
- -
- - '.theme_essential_get_setting('alert3title', true).''.theme_essential_get_setting('alert3text', true); ?> -
+ +
+ + ' . theme_essential_get_setting('alert3title', true) . '' . theme_essential_get_setting('alert3text', true); ?> +
- +
-
- -
+
+ + +
- -
-
+
-
- +
+
- - + course_content_header(); - echo $OUTPUT->main_content(); + echo $OUTPUT->main_content(); echo $OUTPUT->course_content_footer(); - ?> + ?>
- blocks('side-pre', 'span3 desktop-first-column'); - } else { - echo $OUTPUT->blocks('side-pre', 'span3 pull-right'); - } - ?> -
+ blocks('side-pre', 'span3 desktop-first-column'); + } else { + echo $OUTPUT->blocks('side-pre', 'span3 pull-right'); + } + ?> +
- + -
-
-

- +
+

+ blocks('hidden-dock'); - ?> + ?> +
-
- + diff --git a/layout/includes/analytics.php b/layout/includes/analytics.php index 27aced13..2dd6c228 100644 --- a/layout/includes/analytics.php +++ b/layout/includes/analytics.php @@ -23,77 +23,11 @@ * @copyright 2014 Gareth J Barnard, David Bezemer * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -//Check for theme settings -function analytics_trackurl() { - global $DB, $PAGE, $COURSE; - $pageinfo = get_context_info_array($PAGE->context->id); - $trackurl = "'/"; - - // Adds course category name. - if (isset($pageinfo[1]->category)) { - if ($category = $DB->get_record('course_categories', array('id'=>$pageinfo[1]->category))) { - $cats=explode("/",$category->path); - foreach(array_filter($cats) as $cat) { - if ($categorydepth = $DB->get_record("course_categories", array("id" => $cat))) {; - $trackurl .= urlencode($categorydepth->name).'/'; - } - } - } - } - - // Adds course full name. - if (isset($pageinfo[1]->fullname)) { - if (isset($pageinfo[2]->name)) { - $trackurl .= urlencode($pageinfo[1]->fullname).'/'; - } else if ($PAGE->user_is_editing()) { - $trackurl .= urlencode($pageinfo[1]->fullname).'/'.get_string('edit'); - } else { - $trackurl .= urlencode($pageinfo[1]->fullname).'/'.get_string('view'); - } - } - - // Adds activity name. - if (isset($pageinfo[2]->name)) { - $trackurl .= urlencode($pageinfo[2]->modname).'/'.urlencode($pageinfo[2]->name); - } - - $trackurl .= "'"; - return $trackurl; -} - -function insert_analytics_tracking() { - global $PAGE; - $enabled = theme_essential_get_setting('useanalytics'); - $siteid = theme_essential_get_setting('analyticsid'); - $cleanurl = theme_essential_get_setting('analyticsclean'); - $trackadmin = theme_essential_get_setting('analyticsadmin'); - - if ($cleanurl) { - $addition = - "{'hitType' : 'pageview', - 'page' : ".analytics_trackurl().", - 'title' : '".addslashes($PAGE->heading)."' - }"; - } else { - $addition = "'pageview'"; +if (theme_essential_get_setting('analyticsenabled')) { + if (theme_essential_get_setting('analytics') === "piwik") { + require_once('piwik.php'); + } elseif (theme_essential_get_setting('analytics') === "guniversal") { + require_once('guniversal.php'); } - - - if ($enabled && (!is_siteadmin() || $trackadmin)) { - echo " - - "; - } -} - -insert_analytics_tracking(); \ No newline at end of file +} \ No newline at end of file diff --git a/layout/includes/fonts.php b/layout/includes/fonts.php index a8e3a8cf..2563c8cc 100644 --- a/layout/includes/fonts.php +++ b/layout/includes/fonts.php @@ -24,37 +24,6 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -switch ($fontselect) { -case 1: - $fonts[] = "'Open+Sans::".$fontcharacterset."'"; - break; -case 2: - $fonts[] = "'Oswald::".$fontcharacterset."'"; - $fonts[] = "'PT+Sans::".$fontcharacterset."'"; - break; -case 3: - $fonts[] = "'Roboto::".$fontcharacterset."'"; - break; -case 4: - $fonts[] = "'PT+Sans::".$fontcharacterset."'"; - break; -case 5: - $fonts[] = "'Ubuntu::".$fontcharacterset."'"; - break; -case 6: - $fonts[] = "'Arimo::".$fontcharacterset."'"; - break; -case 7: - $fonts[] = "'Lobster::".$fontcharacterset."'"; - $fonts[] = "'Raleway::".$fontcharacterset."'"; - break; -} - -if (!empty($fonts)) {?> - - +if ($fontselect === '2') { ?> + ' rel='stylesheet' type='text/css'> \ No newline at end of file diff --git a/layout/includes/footer.php b/layout/includes/footer.php index 4ac2643e..866faf1d 100755 --- a/layout/includes/footer.php +++ b/layout/includes/footer.php @@ -23,68 +23,72 @@ * @copyright 2014 Gareth J Barnard, David Bezemer * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -?> -
-
-
-
-
- blocks('footer-left'); ?> + +if (empty($PAGE->layout_options['nofooter'])) { + ?> +
+
+ +
+
+
+ blocks('footer-left'); ?> +
-
-
-
- blocks('footer-middle'); ?> +
+
+ blocks('footer-middle'); ?> +
-
-
-
- blocks('footer-right'); ?> +
+
+ blocks('footer-right'); ?> +
+
+
+ + + © + + ' . $hasfootnote . '
'; + } ?> +
+
+ standard_footer_html(); ?> +
+
+ + -
-
- - - © - - '.$hasfootnote.'
'; - } ?> -
-
- standard_footer_html(); ?> -
-
-
+ - + jQuery('.navbar').affix({ + offset: { + top: $('header').height() + } + }); + $('.breadcrumb').jBreadCrumb(); + $('body').fitVids(); + }); + standard_end_of_body_html() ?> \ No newline at end of file diff --git a/layout/includes/guniversal.php b/layout/includes/guniversal.php new file mode 100644 index 00000000..be6401f5 --- /dev/null +++ b/layout/includes/guniversal.php @@ -0,0 +1,103 @@ +. + +/** + * Analytics + * + * This module provides extensive analytics on a platform of choice + * Currently support Google Analytics and Piwik + * + * @package local_analytics + * @copyright David Bezemer , www.davidbezemer.nl + * @author David Bezemer , Bas Brands , Gavin Henrick + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +function analytics_trackurl() +{ + global $DB, $PAGE; + $pageinfo = get_context_info_array($PAGE->context->id); + $trackurl = "'/"; + + // Adds course category name. + if (isset($pageinfo[1]->category)) { + if ($category = $DB->get_record('course_categories', array('id' => $pageinfo[1]->category))) { + $cats = explode("/", $category->path); + foreach (array_filter($cats) as $cat) { + if ($categorydepth = $DB->get_record("course_categories", array("id" => $cat))) { + ; + $trackurl .= urlencode($categorydepth->name) . '/'; + } + } + } + } + + // Adds course full name. + if (isset($pageinfo[1]->fullname)) { + if (isset($pageinfo[2]->name)) { + $trackurl .= urlencode($pageinfo[1]->fullname) . '/'; + } else if ($PAGE->user_is_editing()) { + $trackurl .= urlencode($pageinfo[1]->fullname) . '/' . get_string('edit'); + } else { + $trackurl .= urlencode($pageinfo[1]->fullname) . '/' . get_string('view'); + } + } + + // Adds activity name. + if (isset($pageinfo[2]->name)) { + $trackurl .= urlencode($pageinfo[2]->modname) . '/' . urlencode($pageinfo[2]->name); + } + + $trackurl .= "'"; + return $trackurl; +} + +function insert_analytics_tracking() +{ + global $PAGE; + $trackingid = theme_essential_get_setting('analyticstrackingid'); + $trackadmin = theme_essential_get_setting('analyticstrackadmin'); + $cleanurl = theme_essential_get_setting('analyticscleanurl'); + $tracking = ''; + + if ($cleanurl) { + $addition = + "{'hitType' : 'pageview', + 'page' : " . analytics_trackurl() . ", + 'title' : '" . addslashes($PAGE->heading) . "' + }"; + } else { + $addition = "'pageview'"; + } + + + if (!is_siteadmin() || $trackadmin) { + $tracking = " + + "; + } + return $tracking; +} + +echo insert_analytics_tracking(); \ No newline at end of file diff --git a/layout/includes/header.php b/layout/includes/header.php index dc67c700..6ef9fc1e 100755 --- a/layout/includes/header.php +++ b/layout/includes/header.php @@ -23,25 +23,23 @@ * @copyright 2014 Gareth J Barnard, David Bezemer * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -require_once(dirname(__FILE__).'/pagesettings.php'); + +require_once(dirname(__FILE__) . '/pagesettings.php'); echo $OUTPUT->doctype() ?> htmlattributes(); ?> class="no-js"> <?php echo $OUTPUT->page_title(); ?> - + standard_head_html() ?> - + - - - - - - + + + + body_attributes($bodyclasses); ?>> @@ -49,76 +47,79 @@ standard_top_of_body_html() ?>
-
+
- -
- - - - - -
+ +
+ + + + + +
- - - - - -
- -
-

-
    - render_social_network('googleplus'); - echo $OUTPUT->render_social_network('twitter'); - echo $OUTPUT->render_social_network('facebook'); - echo $OUTPUT->render_social_network('linkedin'); - echo $OUTPUT->render_social_network('youtube'); - echo $OUTPUT->render_social_network('flickr'); - echo $OUTPUT->render_social_network('pinterest'); - echo $OUTPUT->render_social_network('instagram'); - echo $OUTPUT->render_social_network('vk'); - echo $OUTPUT->render_social_network('skype'); - echo $OUTPUT->render_social_network('website'); + + + + + + +
    + -
-
- -
-

-
    - render_social_network('ios'); - echo $OUTPUT->render_social_network('android'); +
    +

    +
      + render_social_network('googleplus'); + echo $OUTPUT->render_social_network('twitter'); + echo $OUTPUT->render_social_network('facebook'); + echo $OUTPUT->render_social_network('linkedin'); + echo $OUTPUT->render_social_network('youtube'); + echo $OUTPUT->render_social_network('flickr'); + echo $OUTPUT->render_social_network('pinterest'); + echo $OUTPUT->render_social_network('instagram'); + echo $OUTPUT->render_social_network('vk'); + echo $OUTPUT->render_social_network('skype'); + echo $OUTPUT->render_social_network('website'); + ?> +
    +
    + -
+
+

+
    + render_social_network('ios'); + echo $OUTPUT->render_social_network('android'); + echo $OUTPUT->render_social_network('winphone'); + echo $OUTPUT->render_social_network('windows'); + ?> +
+
+
- -
- -
- +
diff --git a/layout/includes/iosicons.php b/layout/includes/iosicons.php index 7a7735d3..eeb333bf 100755 --- a/layout/includes/iosicons.php +++ b/layout/includes/iosicons.php @@ -24,17 +24,29 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -if(theme_essential_get_setting('iphoneicon')) { $iphoneicon = theme_essential_get_setting('iphoneicon'); } - else { $iphoneicon = $OUTPUT->pix_url('homeicon/iphone', 'theme'); } -if(theme_essential_get_setting('ipadicon')) { $ipadicon = theme_essential_get_setting('ipadicon'); } - else { $ipadicon = $OUTPUT->pix_url('homeicon/ipad', 'theme'); } -if(theme_essential_get_setting('iphoneretinaicon')) { $iphoneretinaicon = theme_essential_get_setting('iphoneretinaicon'); } - else { $iphoneretinaicon = $OUTPUT->pix_url('homeicon/iphone_retina', 'theme'); } -if(theme_essential_get_setting('ipadretinaicon')) { $ipadretinaicon = theme_essential_get_setting('ipadretinaicon'); } - else { $ipadretinaicon = $OUTPUT->pix_url('homeicon/ipad_retina', 'theme'); } +if (theme_essential_get_setting('iphoneicon')) { + $iphoneicon = theme_essential_get_setting('iphoneicon'); +} else { + $iphoneicon = $OUTPUT->pix_url('homeicon/iphone', 'theme'); +} +if (theme_essential_get_setting('ipadicon')) { + $ipadicon = theme_essential_get_setting('ipadicon'); +} else { + $ipadicon = $OUTPUT->pix_url('homeicon/ipad', 'theme'); +} +if (theme_essential_get_setting('iphoneretinaicon')) { + $iphoneretinaicon = theme_essential_get_setting('iphoneretinaicon'); +} else { + $iphoneretinaicon = $OUTPUT->pix_url('homeicon/iphone_retina', 'theme'); +} +if (theme_essential_get_setting('ipadretinaicon')) { + $ipadretinaicon = theme_essential_get_setting('ipadretinaicon'); +} else { + $ipadretinaicon = $OUTPUT->pix_url('homeicon/ipad_retina', 'theme'); +} ?> - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/layout/includes/marketingspots.php b/layout/includes/marketingspots.php index 275316e0..41f3f8d3 100644 --- a/layout/includes/marketingspots.php +++ b/layout/includes/marketingspots.php @@ -23,62 +23,90 @@ * @copyright 2014 Gareth J Barnard, David Bezemer * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -require_once(dirname(__FILE__).'/pagesettings.php'); ?> -
-
- -
- -
- -
- - - -

- - - -

+ +
+ +
+
+ +
+ + +
+ + +
-
- -
- -
- -
- + +
+ +
+
+ +
+ + +
+ + + +
+
- -

- - - -

+ +
+ +
+
+ +
+ + +
+ + +
+
+
+ +
+ + + + +
+
- -
- -
- -
- + + + + +
- -

- - - -

-
+ +
+ + + +
\ No newline at end of file diff --git a/layout/includes/middleblocks.php b/layout/includes/middleblocks.php index 03364b6b..38a4c438 100644 --- a/layout/includes/middleblocks.php +++ b/layout/includes/middleblocks.php @@ -27,8 +27,8 @@
blocks('home-left', 'span4 pull-left'); - echo $OUTPUT->blocks('home-middle', 'span4 center'); - echo $OUTPUT->blocks('home-right', 'span4 pull-right'); + echo $OUTPUT->blocks('home-left', 'span4 pull-left'); + echo $OUTPUT->blocks('home-middle', 'span4 center'); + echo $OUTPUT->blocks('home-right', 'span4 pull-right'); ?>
\ No newline at end of file diff --git a/layout/includes/pagesettings.php b/layout/includes/pagesettings.php index 40f0dc9a..1ce09f77 100644 --- a/layout/includes/pagesettings.php +++ b/layout/includes/pagesettings.php @@ -23,30 +23,25 @@ * @copyright 2014 Gareth J Barnard, David Bezemer * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - + +/* Default globals */ +global $CFG, $PAGE, $USER, $SITE, $COURSE; + /* Group Body */ $bodyclasses = array(); -if (theme_essential_get_setting('enablealternativethemecolors1') || - theme_essential_get_setting('enablealternativethemecolors2') || - theme_essential_get_setting('enablealternativethemecolors3')) { - $colourswitcher = true; - theme_essential_check_colours_switch(); - theme_essential_initialise_colourswitcher($PAGE); - $bodyclasses[] = 'essential-colours-' . theme_essential_get_colours(); +if (theme_essential_get_setting('enablealternativethemecolors1') || + theme_essential_get_setting('enablealternativethemecolors2') || + theme_essential_get_setting('enablealternativethemecolors3') +) { + $colourswitcher = true; + theme_essential_check_colours_switch(); + theme_essential_initialise_colourswitcher($PAGE); + $bodyclasses[] = 'essential-colours-' . theme_essential_get_colours(); } else { $colourswitcher = false; } - -if (theme_essential_get_setting('slidecaptioncentred')) { - $bodyclasses[] = 'frontpageslidecaptioncentred'; -} - -if (theme_essential_get_setting('slidecaptionbelow')) { - $bodyclasses[] = 'frontpageslidercaptionbelow'; -} - switch (theme_essential_get_setting('pagewidth')) { case 100: $bodyclasses[] = 'pagewidthvariable'; @@ -68,66 +63,59 @@ $bodyclasses[] = 'categoryicons'; } +$regionbsid = 'region-bs-main-and-pre'; +$left = true; if (right_to_left()) { - $regionbsid = 'region-bs-main-and-post'; - $left = false; -} else { $regionbsid = 'region-bs-main-and-pre'; - $left = true; + $left = false; } $fontselect = theme_essential_get_setting('fontselect'); -$fontcharacterset = theme_essential_get_setting('fontcharacterset'); +$fontcharacterset = '&subset=latin'; +if(theme_essential_get_setting('fontcharacterset')) { + $fontcharacterset = '&subset=latin,'.theme_essential_get_setting('fontcharacterset'); +} +$headingfont = urlencode(theme_essential_get_setting('fontnameheading')); +$bodyfont = urlencode(theme_essential_get_setting('fontnamebody')); + /* Group Header */ -$hasanalytics = theme_essential_get_setting('useanalytics'); - -$hassocialnetworks = ( theme_essential_get_setting('facebook') || - theme_essential_get_setting('twitter') || - theme_essential_get_setting('googleplus') || - theme_essential_get_setting('linkedin') || - theme_essential_get_setting('youtube') || - theme_essential_get_setting('flickr') || - theme_essential_get_setting('vk') || - theme_essential_get_setting('pinterest') || - theme_essential_get_setting('instagram') || - theme_essential_get_setting('skype') || - theme_essential_get_setting('website') - ); -$hasmobileapps = ( theme_essential_get_setting('ios') || - theme_essential_get_setting('android') - ); +$hassocialnetworks = ( + theme_essential_get_setting('facebook') || + theme_essential_get_setting('twitter') || + theme_essential_get_setting('googleplus') || + theme_essential_get_setting('linkedin') || + theme_essential_get_setting('youtube') || + theme_essential_get_setting('flickr') || + theme_essential_get_setting('vk') || + theme_essential_get_setting('pinterest') || + theme_essential_get_setting('instagram') || + theme_essential_get_setting('skype') || + theme_essential_get_setting('website') +); +$hasmobileapps = (theme_essential_get_setting('ios') || + theme_essential_get_setting('android') +); $logoclass = 'span12'; -if ($hassocialnetworks && !($hasmobileapps)) { - $logoclass = 'span7'; -} else if (($hassocialnetworks) && !($hasmobileapps)) { - $logoclass = 'span10'; -} else if ($hassocialnetworks && $hasmobileapps) { - $logoclass = 'span5'; +if ($hassocialnetworks || $hasmobileapps) { + $logoclass = 'span6'; } $oldnavbar = theme_essential_get_setting('oldnavbar'); - $haslogo = theme_essential_get_setting('logo'); -/* Group Slideshow */ /* Group Frontpage */ $alertinfo = ''; $alerterror = ''; $alertsuccess = ''; -$hasmarketing1image = theme_essential_get_setting('marketing1image'); -$hasmarketing2image = theme_essential_get_setting('marketing2image'); -$hasmarketing3image = theme_essential_get_setting('marketing3image'); - /* Group Content */ $hasboringlayout = theme_essential_get_setting('layout'); /* Group Footer */ -$hashiddendock = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('hidden-dock', $OUTPUT)); $hascopyright = theme_essential_get_setting('copyright', true); $hasfootnote = theme_essential_get_setting('footnote', 'format_text'); \ No newline at end of file diff --git a/layout/includes/piwik.php b/layout/includes/piwik.php new file mode 100644 index 00000000..e0dbadc0 --- /dev/null +++ b/layout/includes/piwik.php @@ -0,0 +1,109 @@ +. + +/** + * Analytics + * + * This module provides extensive analytics on a platform of choice + * Currently support Google Analytics and Piwik + * + * @package local_analytics + * @copyright David Bezemer , www.davidbezemer.nl + * @author David Bezemer , Bas Brands , Gavin Henrick + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +function analytics_trackurl() +{ + global $DB, $PAGE; + $pageinfo = get_context_info_array($PAGE->context->id); + $trackurl = "'"; + + // Adds course category name. + if (isset($pageinfo[1]->category)) { + if ($category = $DB->get_record('course_categories', array('id' => $pageinfo[1]->category))) { + $cats = explode("/", $category->path); + foreach (array_filter($cats) as $cat) { + if ($categorydepth = $DB->get_record("course_categories", array("id" => $cat))) { + ; + $trackurl .= $categorydepth->name . '/'; + } + } + } + } + + // Adds course full name. + if (isset($pageinfo[1]->fullname)) { + if (isset($pageinfo[2]->name)) { + $trackurl .= $pageinfo[1]->fullname . '/'; + } else if ($PAGE->user_is_editing()) { + $trackurl .= $pageinfo[1]->fullname . '/' . get_string('edit'); + } else { + $trackurl .= $pageinfo[1]->fullname . '/' . get_string('view'); + } + } + + // Adds activity name. + if (isset($pageinfo[2]->name)) { + $trackurl .= $pageinfo[2]->modname . '/' . $pageinfo[2]->name; + } + + $trackurl .= "'"; + return $trackurl; +} + +function insert_analytics_tracking() +{ + $imagetrack = theme_essential_get_setting('analyticsimagetrack'); + $siteurl = theme_essential_get_setting('analyticssiteurl'); + $siteid = theme_essential_get_setting('analyticssiteid'); + $trackadmin = theme_essential_get_setting('analyticstrackadmin'); + $cleanurl = theme_essential_get_setting('analyticscleanurl'); + $tracking = ''; + + if (!empty($siteurl)) { + if ($imagetrack) { + $addition = ''; + } else { + $addition = ''; + } + + if ($cleanurl) { + $doctitle = "_paq.push(['setDocumentTitle', " . analytics_trackurl() . "]);"; + } else { + $doctitle = ""; + } + + if (!is_siteadmin() || $trackadmin) { + $tracking = " + + " . $addition; + } + } + return $tracking; +} + +echo insert_analytics_tracking(); \ No newline at end of file diff --git a/layout/includes/slideshow.php b/layout/includes/slideshow.php index dfc19292..a4fd7a5b 100644 --- a/layout/includes/slideshow.php +++ b/layout/includes/slideshow.php @@ -24,74 +24,24 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$numberofslides = theme_essential_showslider('numberofslides'); // In lib.php. +$numberofslides = theme_essential_showslider('numberofslides'); +$slideinterval = theme_essential_get_setting('slideinterval'); +$captionscenter = (theme_essential_get_setting('slidecaptioncentred'))? ' centred' : ''; +$captionsbelow = (theme_essential_get_setting('slidecaptionbelow'))? ' below' : ''; -if ($numberofslides) { - $slideinterval = theme_essential_get_setting('slideinterval'); - $slidecaptionbelow = theme_essential_get_setting('slidecaptionbelow'); -?> +if ($numberofslides) { ?>
- + \ No newline at end of file diff --git a/layout/login.php b/layout/login.php index 1491bebd..f5b5fb41 100644 --- a/layout/login.php +++ b/layout/login.php @@ -23,8 +23,8 @@ * @copyright 2014 Gareth J Barnard, David Bezemer * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -require_once(dirname(__FILE__).'/includes/header.php'); ?> + +require_once(dirname(__FILE__) . '/includes/header.php'); ?>
@@ -42,7 +42,7 @@
- + diff --git a/layout/maintenance.php b/layout/maintenance.php index d722ea70..82914546 100644 --- a/layout/maintenance.php +++ b/layout/maintenance.php @@ -34,13 +34,13 @@ * breaking installation or upgrade unwittingly. */ -require_once(dirname(__FILE__).'/includes/pagesettings.php'); +require_once(dirname(__FILE__) . '/includes/pagesettings.php'); echo $OUTPUT->doctype() ?> htmlattributes(); ?>> <?php echo $OUTPUT->page_title(); ?> - + standard_head_html() ?> @@ -50,11 +50,11 @@ standard_top_of_body_html() ?>
-
-
- page_heading(); ?> -
-
+
+
+ page_heading(); ?> +
+
@@ -70,11 +70,11 @@
-
-
- standard_footer_html(); ?> -
-
+
+
+ standard_footer_html(); ?> +
+
standard_end_of_body_html() ?> diff --git a/layout/popup.php b/layout/popup.php index 4d05b4ca..f2d077b7 100644 --- a/layout/popup.php +++ b/layout/popup.php @@ -22,72 +22,29 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +require_once(dirname(__FILE__) . '/includes/pagesettings.php'); + echo $OUTPUT->doctype() ?> htmlattributes(); ?>> <?php echo $OUTPUT->page_title(); ?> - + standard_head_html() ?> - - - - + + + + + body_attributes(); ?>> standard_top_of_body_html() ?> - - - -
-
-
navbar(); ?>
- -
-
- page_heading(); ?> -
- course_header(); ?> -
-
-
+ page_heading(); ?>
course_content_header(); diff --git a/layout/redirect.php b/layout/redirect.php new file mode 100644 index 00000000..027a9439 --- /dev/null +++ b/layout/redirect.php @@ -0,0 +1,54 @@ +. + +/** + * This is built using the bootstrapbase template to allow for new theme's using + * Moodle's new Bootstrap theme engine + * + * @package theme_essential + * @copyright 2013 Julian Ridden + * @copyright 2014 Gareth J Barnard, David Bezemer + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +echo $OUTPUT->doctype() ?> + +htmlattributes(); ?>> + + + <?php echo $OUTPUT->page_title(); ?> + + standard_head_html() ?> + + + +body_attributes(); ?>> + +standard_top_of_body_html() ?> +
+
+ +
+
+ main_content(); ?> + +
+
+ +
+
+standard_end_of_body_html() ?> + + \ No newline at end of file diff --git a/layout/report.php b/layout/report.php new file mode 100644 index 00000000..2b9ae577 --- /dev/null +++ b/layout/report.php @@ -0,0 +1,71 @@ +. + +/** + * This is built using the bootstrapbase template to allow for new theme's using + * Moodle's new Bootstrap theme engine + * + * @package theme_essential + * @copyright 2013 Julian Ridden + * @copyright 2014 Gareth J Barnard, David Bezemer + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +require_once(dirname(__FILE__) . '/includes/header.php'); ?> + +
+
+
navbar(); ?>
+ +
+
+ +
+
+
+ +
+ +
+ + id > 1) { + echo $OUTPUT->heading($COURSE->fullname, 1, 'coursetitle'); + echo '
'; + } ?> + course_content_header(); ?> + main_content(); ?> + layout_options['nocoursefooter'])) { + echo $OUTPUT->course_content_footer(); + }?> +
+ + blocks('side-pre', 'span3 desktop-first-column'); ?> + + blocks('side-pre', 'span3 pull-right'); ?> + +
+
+
+ +
+
+ + + + + diff --git a/layout/secure.php b/layout/secure.php index 58ed60dc..5f29b2de 100644 --- a/layout/secure.php +++ b/layout/secure.php @@ -23,14 +23,14 @@ * @copyright 2014 Gareth J Barnard, David Bezemer * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -require_once(dirname(__FILE__).'/includes/pagesettings.php'); + +require_once(dirname(__FILE__) . '/includes/pagesettings.php'); echo $OUTPUT->doctype() ?> htmlattributes(); ?>> <?php echo $OUTPUT->page_title(); ?> - + standard_head_html() ?> @@ -42,12 +42,13 @@