Merge branch 'wip-MDL-38318_master' of git://github.com/gjb2048/moodle

theme/mymobile/config.php

@@ -33,8 +33,8 @@ $THEME->parents = array(
 
 // Set the stylesheets that we want to include for this theme
 $THEME->sheets = array(
-    'jmobile11',
-    'jmobile11_rtl',
+    'jmobile131',
+    'jmobile131_rtl',
     'core',
     'media'
 );

theme/mymobile/jquery/plugins.php

@@ -36,7 +36,16 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+/*
+ * Note: If you want to change the contents of 'custom131.js' because you are
+ *       developing but don't want to up the version until you are happy with
+ *       it, then 'Purge All Caches' does not work, you need to clear the browsers
+ *       cache at the client end so that it requests a new copy on page load.
+ *       This also applies to the small 'hack' that is contained witin
+ *       'jquery.mobile-1.3.1.js'.
+ *       G J Barnard 14th April 2013
+ */
 $plugins = array(
-    'mymobile'   => array('files' => array('custom.js')), // Do not forget to bump up version after modification!
-    'mobile'     => array('files' => array('jquery.mobile-1.1.1.js'))
-);
+    'mymobile'   => array('files' => array('custom131.js')), // Do not forget to bump up version after modification!
+    'mobile'     => array('files' => array('jquery.mobile-1.3.1.js'))
+);

theme/mymobile/lib.php

@@ -66,6 +66,7 @@ function mymobile_set_customcss($css, $customcss) {
 
 function theme_mymobile_page_init(moodle_page $page) {
     $page->requires->jquery();
+    // Remove 'migrate' when '.live' event handlers successfully converted to '.on' in 'custom131.js':...
     $page->requires->jquery_plugin('migrate');
     $page->requires->jquery_plugin('mymobile', 'theme_mymobile');
     $page->requires->jquery_plugin('mobile', 'theme_mymobile');

theme/mymobile/style/core.css

@@ -494,10 +494,6 @@ input[name="mailnow"] {
     color:inherit;
 }
 .loginbox .loginform .form-input #username, .loginbox .loginform .form-input #password {
-    margin: 0 0 .4em;
-}
-.loginbox .loginform .form-input #username, .loginbox .loginform .form-input #password {
-    border: 1px solid #ccc !important;
     color: inherit !important;
     font-family: inherit !important;
     font-size: 16px !important;
@@ -505,9 +501,6 @@ input[name="mailnow"] {
     padding: .4em !important;
     width: 98% !important;
 }
-.form-input #password {
-    margin-bottom: 1.2em !important;
-}
 .loginbox #loginbtn {
     width: 100% !important;
 }
@@ -1631,5 +1624,10 @@ div.tablets, #sliderdiv, .has-myblocks .jsetsbar {
     max-width: 100px;
     max-height: 100px;
 }
+
+/** Moodle 2.5 Changes */
+.coursebox .name {
+    width: 100%;
+}
 /** Custom CSS **/
 [[setting:customcss]]