Merge branch 'MDL-33934_master' of git://github.com/lazydaisy/moodle

theme/mymobile/config.php

@@ -34,8 +34,7 @@ $THEME->parents = array(
 
 // Set the stylesheets that we want to include for this theme
 $THEME->sheets = array(
-    'jmobile11',
-    'jmobile11_rtl',
+    'jmobile120',
     'core',
     'media'
 );
@@ -105,34 +104,34 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
+        'options' => array('nofooter'=>true),
     ),
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true),
     ),
     'embedded' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
     ),
      // The pagelayout used when a redirection is occuring.
     'redirect' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
     ),
      // The pagelayout used for reports
     'report' => array(
@@ -156,9 +155,9 @@ if ($thisdevice == "default" || $thisdevice == "tablet" || optional_param('mymob
 
 // Add the required JavaScript to the page
 $THEME->javascripts = array(
-    'jquery-1.7.1.min',
+    'jquery-1.8.2.min',
     'custom',
-    'jquery.mobile-1.1.1'
+    'jquery.mobile-1.2.0'
 );
 
 // Sets a custom render factory to use with the theme, used when working with custom renderers.

theme/mymobile/javascript/custom.js

@@ -1,16 +1,16 @@
 $(document).bind("mobileinit", function(){
-//mobile init stuff 11/12/10
-//turn off ajax forms...
 $.mobile.defaultPageTransition = "slide";
 });
 
 $(document).ready(function() {
     //get some vars to start
-    var siteurl = $('.mobilesiteurl').attr("id");
-    var mytheme = $(".datatheme").attr("id");
-    var mythemeb = $(".datathemeb").attr("id");
-
+    var siteurl = $('head meta[name=wwwroot]').attr('wwwroot');
+    var mytheme = $('head meta[name=datatheme]').attr('datatheme');
+    var mythemeb = $('head meta[name=datathemeb]').attr('datathemeb');
 
+    if ($('body').hasClass('ajaxno')) {
+    $.mobile.ajaxEnabled = false;
+    }
     //function below does generic stuff before creating all pages...
     $('div').live('pagebeforecreate', function(event, ui) {
         //turn off ajax on all forms for now as of beta1
@@ -60,8 +60,8 @@ $(document).ready(function() {
             return false;
         });
 
-        //calendar and other links that need to be external
-        $('.maincalendar .filters a, li.activity.scorm a, div.files a, #page-user-filesPAGE li div a, .maincalendar .bottom a, .section li.url.modtype_url a, .resourcecontent .resourcemediaplugin a, #underfooter .noajax a, .block_mnet_hosts .content a, .block_private_files .content a, a.portfolio-add-link, #attempts td a').attr("data-ajax", "false");
+       //calendar and other links that need to be external
+        $('.maincalendar .filters a, li.activity.scorm a, div.files a, #page-user-filesPAGE li div a, .maincalendar .bottom a, .section li.url.modtype_url a, .resourcecontent .resourcemediaplugin a, #underfooter .noajax a, .block_mnet_hosts .content a, .block_private_files .content a, a.portfolio-add-link, #attempts td a, .settingsul li a, .foldertree li a').attr("data-ajax", "false");
 
         //add blank to open in window for some
         $('#page-mod-url-viewPAGE div.urlworkaround a, #page-mod-resource-viewPAGE div.resourceworkaround a, .mediaplugin a.mediafallbacklink, #page-mod-resource-viewPAGE .resourcemp3 a, .foldertree li a').attr("target", "_blank").attr("data-role", "button").attr("data-icon", "plus");
@@ -81,6 +81,7 @@ $(document).ready(function() {
             var meb = encodeURI($(this).val());
             $(this).val("-1");
             if (meb != "" && meb != "-1") {
+            $.mobile.showPageLoadingMsg();
                 $.mobile.changePage(meb);
             }
        });
@@ -89,13 +90,19 @@ $(document).ready(function() {
 
 
     //course page only js
-    $('div.path-site, div.path-course-view, .path-course-view div.generalpage').live('pagebeforecreate', function(event, ui) {
+    $('div.path-course-view, .path-course-view div.generalpage').live('pagebeforecreate', function(event, ui) {
         //course listing
-        $('.section li img.activityicon').addClass("ui-li-icon");
-        $('.course-content ul.section, .sitetopic ul.section').attr("data-role", "listview").attr("data-inset", "true").attr("data-theme", mythemeb);
+        $('.section li img').addClass("ui-li-icon");
+        $('.course-content ul.section').attr("data-role", "listview").attr("data-inset", "true").attr("data-theme", mythemeb);
+        $('.sitetopic ul.section').attr("data-role", "listview").attr("data-inset", "true").attr("data-theme", mythemeb);
+        $('.section-navigation.header.headingblock, .section-navigation.mdl-bottom').attr("data-role", "controlgroup");
+        $('.section-navigation.header.headingblock .mdl-left a, .section-navigation.mdl-bottom .mdl-left a').attr("data-role", "button").attr("data-icon", "arrow-l");
+        $('.section-navigation.header.headingblock .mdl-right a, .section-navigation.mdl-bottom .mdl-right a').attr("data-role", "button").attr("data-icon", "arrow-r").attr("data-iconpos", "right");
+        $('.section-navigation.header.headingblock .mdl-align.title, .section-navigation.mdl-bottom .mdl-align a').attr("data-role", "button");
         $('.topics div.left.side').addClass("ui-bar-" + mytheme);
         $('.section.hidden div.headingwrap').attr("data-theme", mythemeb);
         //$('.topics #section-0 div.left.side').removeClass("ui-li ui-li-divider ui-btn ui-bar-a");
+        $('h3.section-title a').attr("data-role", "button");
         $('.section .resource.modtype_resource a, .section .modtype_survey a').attr("data-ajax", "false");
 
         //toggle completion checkmarks and form fixes
@@ -107,12 +114,6 @@ $(document).ready(function() {
             this.form.submit();
             return false;
         });
-
-        // Force the class ui-li-desc on non-detected elements.
-        $('ul.section div.availabilityinfo, ul.section div.contentafterlink').addClass('ui-li-desc');
-
-        // Force some classes on dimmed elements.
-        $('ul.section div.dimmed_text > span').addClass('instancename');
     });
 
     //forum listing only stuff
@@ -132,10 +133,18 @@ $(document).ready(function() {
 
     //forum discussion page only stuff
     $('div#page-mod-forum-discussPAGE, #page-mod-forum-discuss div.generalpage, div.forumtype-single, .forumtype-single div.generalpage, div#page-mod-forum-postPAGE').live('pagebeforecreate',function(event, ui){
+        //remove parent post because of hash remove this if has listening is fixed
+        $('.options div.commands a').each(function(index) {
+            var url = $(this).attr("href");
+            if (url.indexOf("#") != -1) {
+                $(this).remove();
+            }
+        });
+
         //actual forum posting
         $('.forumpost div.row.header').addClass("ui-li ui-li-divider ui-btn ui-bar-" + mytheme);
         $('.options div.commands').attr("data-role", "controlgroup").attr("data-type", "horizontal");
-        $('.options div.commands a').attr("data-role", "button").attr("data-ajax", "false").attr("data-inline", "true");
+        $('.options div.commands a').attr("data-role", "button").attr("data-ajax", "false").attr("data-mini", "true").attr("data-inline", "true");
         $('.forumpost div.author a').attr("data-inline", "true");
         $('.options div.commands').contents().filter(function() {
             return this.nodeType == 3; //Node.TEXT_NODE
@@ -150,6 +159,7 @@ $(document).ready(function() {
         $('.forumpost div.row.header').addClass("ui-li ui-li-divider ui-btn ui-bar-" + mytheme);
         $('div.subscribelink a').attr("data-role", "button").attr("data-inline", "true");
         $('.unlist').attr("data-role", "controlgroup");
+        //$('.unlist li:last-child div.coursebox h3 a').addClass("ui-corner-bottom ui-controlgroup-last"); moved to init at bottom
         $('div.coursebox a').attr("data-role", "button").attr("data-icon", "arrow-r").attr("data-iconpos", "right").attr("data-theme", mythemeb);
         $('.box.categorybox').attr("data-role", "controlgroup");
         $('div.categorylist div.category a').attr("data-role", "button").attr("data-theme", mythemeb);
@@ -243,21 +253,9 @@ $(document).ready(function() {
         $('.path-mod-hotpot button').attr("data-role", "none");
     });
 
-    //collapsed topic only stuff
-    $('div#page-course-view-topcollPAGE').live('pagebeforecreate',function(event, ui){
-        $('#page-course-view-topcollPAGE ul.section').attr("data-role", "none");
-        $('.section li img').removeClass("ui-li-icon");
-        $.getScript('../course/format/topcoll/module.js');
-        $('#page-course-view-topcollPAGE tr.cps a').attr("data-role", "button").attr("data-icon", "arrow-r");
-        $('#page-course-view-topcollPAGE #thetopics').attr("data-role", "controlgroup");
-        $('#page-course-view-topcollPAGE td.cps_centre').each(function(index) {
-            var cpsc = $(this).text().replace('<br>','').replace(')','');
-            $(this).prev('td').find('a').append('<span class="ui-li-count ui-btn-up-a ui-btn-corner-all">' + cpsc + '</span>');
-        });
-    });
-
     ///// functions below does stuff after creating page for some cleaning...
     $('div').live('pageinit',function(event, ui){
+        $('div#page-site-indexPAGE .unlist li:last-child div.coursebox h3 a').addClass("ui-corner-bottom ui-controlgroup-last");
         $('.path-calendar div.ui-radio label:first-child, .path-mod-lesson div.ui-radio label:first-child, #page-mod-wiki-createPAGE div.ui-radio label:first-child').addClass("afirst");
         $('.forumpost div.author a').removeAttr('data-role');
         //$('.questionflagimage2').removeClass("ui-btn-hidden");a#notificationyes

theme/mymobile/lang/en/theme_mymobile.php

@@ -40,6 +40,8 @@ $string['showfullsizeimages'] = 'Show full images on site index and course pages
 $string['showfullsizeimages_desc'] = 'Show full size images on site index and course pages instead of replaced thumb icon method. Default is to not show full size images.';
 $string['usetableview'] = 'Tablet View';
 $string['usetableview_desc'] = 'Use the tablet view for larger devices (yes by default).';
+$string['useajax'] = 'Use Ajax Page Loading';
+$string['useajax_desc'] = 'Use ajax page loading. Turn off if experiencing problems (yes by default).';
 $string['yes'] = 'Yes';
 $string['customcss'] = 'Custom CSS';
 $string['customcssdesc'] = 'Any CSS you enter here will be added to every page allowing your to easily customise this theme.';

theme/mymobile/layout/general.php

@@ -71,10 +71,16 @@ if (!empty($PAGE->theme->settings->usetableview)) {
     $showusetableview = 'tabshow';
 }
 
-// TODO: Fix this hardcoding there are other course formats that peopleuse.
-//       Probably changing to an appropriate regex will do.
-if ($mypagetype == 'course-view-topics' || $mypagetype == 'course-view-weeks') {
-    // jump to current topic only in course pages
+if (!empty($PAGE->theme->settings->useajax)) {
+    $useajax = $PAGE->theme->settings->useajax;
+} else {
+    $useajax = 'ajaxyes';
+}
+
+
+// Course format
+if ($mylayoutype == 'course') {
+    // Jump to current topic only in course pages.
     $jumptocurrent = 'true';
 } else {
     $jumptocurrent = 'false';
@@ -89,19 +95,10 @@ $hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
 $hasfooter = (empty($PAGE->layout_options['nofooter']));
 $hasmyblocks = $PAGE->blocks->region_has_content('myblocks', $OUTPUT);
 
-$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
-if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
-    $courseheader = $OUTPUT->course_header();
-    $coursecontentheader = $OUTPUT->course_content_header();
-    if (empty($PAGE->layout_options['nocoursefooter'])) {
-        $coursecontentfooter = $OUTPUT->course_content_footer();
-        $coursefooter = $OUTPUT->course_footer();
-    }
-}
-
 $bodyclasses = array();
 $bodyclasses[] = (string)$hasithumb;
 $bodyclasses[] = (string)$showsitetopic;
+$bodyclasses[] = (string)$useajax;
 // add ithumb class to decide whether to show or hide images and site topic
 
 // TODO: Better illustrate preceedence
@@ -124,7 +121,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="apple-touch-icon-precomposed" href="<?php echo $OUTPUT->pix_url('m2m', 'theme')?>" />
 
     <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
-    <meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1" />
+    <meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1">
 
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
@@ -132,16 +129,13 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_top_of_body_html() ?>
     <div id="<?php p($PAGE->bodyid) ?>PAGE" data-role="page" class="generalpage <?php echo 'ajaxedclass '; p($PAGE->bodyclasses.' '.join(' ', $bodyclasses));  ?> <?php if ($hasmyblocks && $usercol) { echo 'has-myblocks'; } ?> " data-title="<?php p($SITE->shortname) ?>">
         <!-- start header -->
-        <div data-role="header" <?php echo($datatheme);?> class="mymobileheader" data-position="fixed">
+        <div data-role="header" <?php echo($datatheme);?> class="mymobileheader">
             <h1><?php echo $PAGE->heading ?></h1>
             <?php if (isloggedin() && $mypagetype != 'site-index') { ?>
             <a class="ui-btn-right" data-icon="home" href="<?php p($CFG->wwwroot) ?>" data-iconpos="notext" data-ajax="false"><?php p(get_string('home')); ?></a>
             <?php } else if (!isloggedin()) {
                 echo $OUTPUT->login_info();
             } ?>
-            <?php if (!empty($courseheader)) { ?>
-            <div data-role="course-header"><?php echo $courseheader; ?></div>
-            <?php } ?>
             <!-- start navbar -->
             <div data-role="navbar">
                 <ul>
@@ -186,9 +180,7 @@ echo $OUTPUT->doctype() ?>
                     <?php if ($hasshowmobileintro && $mypagetype == 'site-index') { ?>
                         <?php echo $PAGE->theme->settings->showmobileintro; ?>
                     <?php } ?>
-                    <?php echo $coursecontentheader; ?>
                     <?php echo $OUTPUT->main_content(); ?>
-                    <?php echo $coursecontentfooter; ?>
                 <?php } ?>
                 </div>
             </div>
@@ -225,7 +217,7 @@ echo $OUTPUT->doctype() ?>
 
                 <div data-role="fieldcontain" id="sliderdiv">
                     <label for="slider"><?php p(get_string('mtoggle','theme_mymobile')); ?>:</label>
-                    <select name="slider" class="slider" data-role="slider" id="slider">
+                    <select name="slider" class="slider" data-role="slider">
                         <option value="on">On</option>
                         <option value="off">Off</option>
                     </select>
@@ -252,10 +244,6 @@ echo $OUTPUT->doctype() ?>
         <!-- end main content -->
 
         <!-- start footer -->
-        <?php if (!empty($coursefooter)) { ?>
-        <div data-role="course-footer"><?php echo $coursefooter; ?></div>
-        <?php } ?>
-
         <div data-role="footer" class="mobilefooter" <?php echo $datatheme;?>>
             <div data-role="navbar" class="jnav" >
                 <ul>