From 9ffb841eeeeaaf129c5fe56dfb8033a931c93eec Mon Sep 17 00:00:00 2001
From: Seth Meranda <smeranda2@unl.edu>
Date: Thu, 30 Sep 2010 14:47:32 +0000
Subject: [PATCH] clean up invalid markup, make to work better with the new
 mobile PEAR package.

---
 .../views/mobile/page_elements/footer.php       | 16 +++-------------
 .../mobile/page_elements/header_contents.php    | 17 ++++++++---------
 .../views/mobile/pageshells/pageshell.php       |  9 ++-------
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/plugins/mobile_unl/views/mobile/page_elements/footer.php b/plugins/mobile_unl/views/mobile/page_elements/footer.php
index cad936e1..087871fb 100755
--- a/plugins/mobile_unl/views/mobile/page_elements/footer.php
+++ b/plugins/mobile_unl/views/mobile/page_elements/footer.php
@@ -11,17 +11,10 @@
  */
 
 ?>
-
-<div class="clearfloat"></div>
-
-
-<div class="clearfloat"></div>
-
-</div><!-- /#page_wrapper -->
-</div><!-- /#page_container -->
+	</div>
+</div>
 
 <div id="layout_footer">
-
 		
 		<?php if (isloggedin()){ ?>
 		<div id="mobile_logout">
@@ -30,9 +23,6 @@
         <?php } ?>
 	
 </div><!-- /#layout_footer -->
-<!-- insert an analytics view to be extended -->
 <?php
 	echo elgg_view('footer/analytics');
-?>
-</body>
-</html>
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/plugins/mobile_unl/views/mobile/page_elements/header_contents.php b/plugins/mobile_unl/views/mobile/page_elements/header_contents.php
index 1ad18ab2..50869772 100755
--- a/plugins/mobile_unl/views/mobile/page_elements/header_contents.php
+++ b/plugins/mobile_unl/views/mobile/page_elements/header_contents.php
@@ -13,12 +13,11 @@
 ?>
 
 <div id="page_container">
-<div id="page_wrapper">
-
-<div id="layout_header">
-<div id="wrapper_header">
-
-<div class="navigation"><?php echo elgg_view('page_elements/elgg_topbar',"",false,false,"mobile");?></div>
-	
-</div><!-- /#wrapper_header -->
-</div><!-- /#layout_header -->
\ No newline at end of file
+	<div id="page_wrapper">
+		<div id="layout_header">
+			<div id="wrapper_header">
+				<div class="navigation">
+					<?php echo elgg_view('page_elements/elgg_topbar',"",false,false,"mobile");?>
+				</div>
+			</div><!-- /#wrapper_header -->
+		</div><!-- /#layout_header -->
\ No newline at end of file
diff --git a/plugins/mobile_unl/views/mobile/pageshells/pageshell.php b/plugins/mobile_unl/views/mobile/pageshells/pageshell.php
index fcdde97c..c5eeb456 100755
--- a/plugins/mobile_unl/views/mobile/pageshells/pageshell.php
+++ b/plugins/mobile_unl/views/mobile/pageshells/pageshell.php
@@ -38,11 +38,6 @@ $page = UNL_Templates::factory('Mobile');
 $page->doctitle = '<title>'.$vars['title'].'</title>';
 $page->titlegraphic = '<h1><a href="'.$vars['config']->url.'" title="Planet Red Home">'.$vars['config']->sitename.'</a></h1>';
 $page->head .= '<link rel="stylesheet" href="' . $vars['url'] .'_css/css.css?lastcache='.$vars['config']->lastcache.'>&amp;viewtype=mobile&view=mobile" type="text/css" />';
-$page->head .= '<script type="text/javascript" src="' . $vars['url'] . 'mod/mobile_unl/mobile.js"></script>';
-$page->head .= <<<END
-<link media="only screen and (max-device-width: 480px)" href="http://m.unl.edu/mobile.css" type="text/css" rel="stylesheet" />
-<link media="screen" href="http://m.unl.edu/mobile.css" type="text/css" rel="stylesheet" />
-END;
 
 $page->maincontentarea = <<<END
 <ul id="mobile_breadcrumbs">
@@ -64,9 +59,9 @@ Planet Red Mobile &copy; 2010 University of Nebraska&ndash;Lincoln
 <!-- footer -->
 END;
 
-$page->maincontentarea .= elgg_view('page_elements/footer', $vars);
+//$page->maincontentarea .= elgg_view('page_elements/footer', $vars);
 
-//$page->footercontent = elgg_view('page_elements/footer', $vars);
+$page->footercontent = "";
 
 echo $page;
 ?>
\ No newline at end of file
-- 
GitLab