[root@dywang theme]# diff -urNwbBE leatherbound/layout/frontpage.php dywang/layout/frontpage.php
--- leatherbound/layout/frontpage.php 2011-12-06 17:23:00.000000000 +0800
+++ dywang/layout/frontpage.php 2014-03-02 19:55:42.926256282 +0800
@@ -41,7 +41,7 @@
<!-- START OF HEADER -->
<div id="page-header">
<div id="page-header-wrapper" class="wrapper clearfix">
- <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
+ <!--h1 class="headermain"><?php echo $PAGE->heading ?></h1 dywang-->
<div class="headermenu">
<?php
echo $OUTPUT->login_info();
[root@dywang theme]# diff -urNwbBE leatherbound/layout/general.php dywang/layout/general.php
--- leatherbound/layout/general.php 2011-12-06 17:23:00.000000000 +0800
+++ dywang/layout/general.php 2014-03-02 20:01:21.056203984 +0800
@@ -35,16 +35,16 @@
<?php if ($hasheading || $hasnavbar) { ?>
<div id="page-header">
<div id="page-header-wrapper" class="wrapper clearfix">
- <?php if ($hasheading) { ?>
- <h1 class="headermain inside"><?php echo $PAGE->heading ?></h1>
<div class="headermenu"><?php
echo $OUTPUT->login_info();
- if (!empty($PAGE->layout_options['langmenu'])) {
echo $OUTPUT->lang_menu();
- }
- echo $PAGE->headingmenu ?>
</div>
- <?php } ?>
</div>
</div>
@@ -56,13 +56,25 @@
<div class="navbar">
<div class="wrapper clearfix">
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
- <div class="navbutton"> <?php echo $PAGE->button; ?></div>
+ <div class="navbutton"> <?php echo $PAGE->button; echo $PAGE->headingmenu ?></div>
</div>
</div>
<?php } ?>
<?php } ?>
<!-- END OF HEADER -->
+<?php if ($PAGE->bodyid == 'page-mod-openmeetings-view') { ?>
+ <div id="region-main-wrap">
+ <div id="region-main">
+ <div class="region-content">
+ <?php echo $OUTPUT->main_content() ?>
+ </div>
+ </div>
+ </div>
+<?php } ?>
+<?php if ($PAGE->bodyid != 'page-mod-openmeetings-view') { ?>
<div id="page-content-wrapper" class="wrapper clearfix">
<div id="page-content">
<div id="region-main-box">
@@ -96,6 +108,10 @@
</div>
</div>
</div>
+<?php } ?>
[root@dywang theme]# diff -urNwbBE leatherbound/layout/report.php dywang/layout/report.php
--- leatherbound/layout/report.php 2011-12-06 17:23:00.000000000 +0800
+++ dywang/layout/report.php 2013-10-09 22:58:03.000000000 +0800
@@ -35,16 +35,16 @@
<?php if ($hasheading || $hasnavbar) { ?>
<div id="page-header">
<div id="page-header-wrapper" class="wrapper clearfix">
- <?php if ($hasheading) { ?>
- <h1 class="headermain inside"><?php echo $PAGE->heading ?></h1>
<div class="headermenu"><?php
echo $OUTPUT->login_info();
- if (!empty($PAGE->layout_options['langmenu'])) {
echo $OUTPUT->lang_menu();
- }
- echo $PAGE->headingmenu ?>
</div>
- <?php } ?>
</div>
</div>
@@ -56,7 +56,8 @@
<div class="navbar">
<div class="wrapper clearfix">
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
- <div class="navbutton"> <?php echo $PAGE->button; ?></div>
+ <div class="navbutton"> <?php echo $PAGE->button; echo $PAGE->headingmenu ?></div>
</div>
</div>
<?php } ?>