Permalink
Browse files

MDL-38422 theme_mymobile: TinyMCE editor difficulties.

  • Loading branch information...
1 parent 5c8860f commit bc8e5bce361bbe8f9e0f527b02d58336ac937703 @gjb2048 gjb2048 committed Mar 11, 2013
Showing with 34 additions and 35 deletions.
  1. +3 −4 theme/mymobile/layout/embedded.php
  2. +31 −31 theme/mymobile/layout/general.php
@@ -55,7 +55,6 @@
<div data-role="page" id="chatpage" data-fullscreen="true" data-title="<?php p($SITE->shortname) ?>">
<?php echo $OUTPUT->main_content(); ?>
<input type="button" value="back" data-role="none" id="chatback" onClick="history.back()">
- </div>
<?php } else { ?>
<div id="content2" data-role="page" data-title="<?php p($SITE->shortname) ?>" data-theme="<?php echo $datatheme;?>">
<div data-role="header" data-theme="<?php echo $datatheme;?>">
@@ -67,9 +66,9 @@
<div data-role="content" class="mymobilecontent" data-theme="<?php echo $databodytheme;?>">
<?php echo $OUTPUT->main_content(); ?>
</div>
- </div>
<?php } ?>
- <!-- START OF FOOTER -->
- <?php echo $OUTPUT->standard_end_of_body_html() ?>
+ <!-- START OF FOOTER -->
+ <?php echo $OUTPUT->standard_end_of_body_html() ?>
+ </div>
</body>
</html>
@@ -132,7 +132,7 @@
<?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 id="page-header" data-role="header" <?php echo($datatheme);?> class="mymobileheader" data-position="fixed">
<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>
@@ -161,7 +161,6 @@
</div>
<!-- end navbar -->
</div>
- <div id="page-header"><!-- empty page-header needed by moodle yui --></div>
<!-- end header -->
<!-- main content -->
@@ -256,39 +255,40 @@
<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>
- <li><a id="mycal" class="callink" href="<?php p($CFG->wwwroot) ?>/calendar/view.php" data-icon="info" data-iconpos="top" ><?php p(get_string('calendar', 'calendar')); ?></a></li>
- <?php if (!empty($CFG->messaging)) { ?>
- <li><a id="mymess" href="<?php p($CFG->wwwroot) ?>/message/index.php" data-iconpos="top" data-icon="mymessage" ><?php p(get_string('messages', 'message')); ?></a></li>
- <?php } ?>
- <?php if ($mypagetype != 'site-index') { ?>
- <li><a href="#" data-inline="true" data-role="button" data-iconpos="top" data-icon="arrow-u" id="uptotop"><?php p(get_string('up')); ?></a></li>
- <?php } ?>
- </ul>
+ <div id="page-footer">
+ <div data-role="footer" class="mobilefooter" <?php echo $datatheme;?>>
+ <div data-role="navbar" class="jnav" >
+ <ul>
+ <li><a id="mycal" class="callink" href="<?php p($CFG->wwwroot) ?>/calendar/view.php" data-icon="info" data-iconpos="top" ><?php p(get_string('calendar', 'calendar')); ?></a></li>
+ <?php if (!empty($CFG->messaging)) { ?>
+ <li><a id="mymess" href="<?php p($CFG->wwwroot) ?>/message/index.php" data-iconpos="top" data-icon="mymessage" ><?php p(get_string('messages', 'message')); ?></a></li>
+ <?php } ?>
+ <?php if ($mypagetype != 'site-index') { ?>
+ <li><a href="#" data-inline="true" data-role="button" data-iconpos="top" data-icon="arrow-u" id="uptotop"><?php p(get_string('up')); ?></a></li>
+ <?php } ?>
+ </ul>
+ </div>
</div>
- </div>
- <!-- end footer -->
- <div id="underfooter">
- <?php
- echo $OUTPUT->login_info_footer();
- echo '<div class="noajax">';
- echo $OUTPUT->standard_footer_html();
- echo '</div>';
- ?>
+ <div id="underfooter">
+ <?php
+ echo $OUTPUT->login_info_footer();
+ echo '<div class="noajax">';
+ echo $OUTPUT->standard_footer_html();
+ echo '</div>';
+ ?>
+ </div>
</div>
- </div><!-- ends page -->
+ <!-- end footer -->
- <!-- empty divs with info for the JS to use -->
- <div id="<?php echo sesskey(); ?>" class="mobilesession"></div>
- <div id="<?php p($CFG->wwwroot); ?>" class="mobilesiteurl"></div>
- <div id="<?php echo $dtheme;?>" class="datatheme"></div>
- <div id="<?php echo $dthemeb;?>" class="datathemeb"></div>
- <div id="page-footer"><!-- empty page footer needed by moodle yui for embeds --></div>
- <!-- end js divs -->
+ <!-- empty divs with info for the JS to use -->
+ <div id="<?php echo sesskey(); ?>" class="mobilesession"></div>
+ <div id="<?php p($CFG->wwwroot); ?>" class="mobilesiteurl"></div>
+ <div id="<?php echo $dtheme;?>" class="datatheme"></div>
+ <div id="<?php echo $dthemeb;?>" class="datathemeb"></div>
+ <!-- end js divs -->
- <?php echo $OUTPUT->standard_end_of_body_html() ?>
+ <?php echo $OUTPUT->standard_end_of_body_html() ?>
+ </div><!-- ends page -->
</body>
</html>

0 comments on commit bc8e5bc

Please sign in to comment.