preliminary design for header & footer of tablet

diff --git a/docs/themes/mobile/include/footer.tmpl.php b/docs/themes/mobile/include/footer.tmpl.php
index c28443d..2a1cd83 100644 (file)
--- a/docs/themes/mobile/include/footer.tmpl.php
+++ b/docs/themes/mobile/include/footer.tmpl.php
@@ -1,16 +1,6 @@
 <?php if (!defined('AT_INCLUDE_PATH')) { exit; } ?>
 <?php if ($this->mobile_device_type != IPAD_DEVICE): ?><!-- begin footer template for iphone, android, and blackberry -->
-<?php //if (isset($_SESSION['course_id']) && $_SESSION['course_id'] > 0): ?>
-               <!--    GO TO TOP LINK REMOVED FOR MOBILE
-               <div id="gototop">              
-                               <br />
-                               <a href="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES); ?>#navigation-contentwrapper" title="<?php echo _AT('goto_content'); ?> Alt-c" ><?php echo _AT('goto_top'); ?>
-                               <img src="<?php echo $this->base_path; ?>themes/mobile/images/arrow-up.png" alt="<?php echo _AT('goto_top'); ?> Alt-c" border="0"/> 
-                               
-                               </a>
-                       </div>  
-                -->
-<?php // endif; ?> 
+
 
 </div> <!-- end innner-contentwrapper -->      
 </div> <!-- end contentcolumn -->
@@ -59,17 +49,7 @@
 </body>
 <?php endif;?><!--  end footer template for iphone, android and blackberry -->
 <?php if ($this->mobile_device_type == IPAD_DEVICE): ?> <!-- start footer template for ipad/talets -->
-<?php //if (isset($_SESSION['course_id']) && $_SESSION['course_id'] > 0): ?>
-               <!--    GO TO TOP LINK REMOVED FOR MOBILE
-               <div id="gototop">              
-                               <br />
-                               <a href="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES); ?>#navigation-contentwrapper" title="<?php echo _AT('goto_content'); ?> Alt-c" ><?php echo _AT('goto_top'); ?>
-                               <img src="<?php echo $this->base_path; ?>themes/mobile/images/arrow-up.png" alt="<?php echo _AT('goto_top'); ?> Alt-c" border="0"/> 
-                               
-                               </a>
-                       </div>  
-                -->
-<?php // endif; ?> 
+
 
 </div> <!-- end innner-contentwrapper -->      
 </div> <!-- end contentcolumn -->
@@ -95,10 +75,10 @@
                                <?php endif; ?>
                        <?php endif; ?>
                <?php endif; ?>
-               <!--  SEARCH MOVED TO #topnavlist 
+               
                <?php if(!$this->just_social): ?>
                        <li><a href="<?php echo $this->base_path; ?>search.php"><?php echo _AT('search'); ?></a> </li>
-               <?php endif; ?> -->
+               <?php endif; ?> 
                <li><a href="<?php echo $this->base_path; ?>help/index.php"><?php echo _AT('help'); ?></a></li>
 
                <?php if (isset($_SESSION['valid_user']) && $_SESSION['valid_user']): ?>                                         
@@ -109,6 +89,7 @@
 </ul>                  
  </div>                        
 </div>
+
 <div class="type-interior ui-page ui-body-c ui-page-active"> <!-- jQueryMobile only -->
        <script language="javascript" type="text/javascript">
 //<!--

diff --git a/docs/themes/mobile/include/header.tmpl.php b/docs/themes/mobile/include/header.tmpl.php
index 236884f..6286ef3 100644 (file)
--- a/docs/themes/mobile/include/header.tmpl.php
+++ b/docs/themes/mobile/include/header.tmpl.php
@@ -130,10 +130,9 @@ setTimeout(function() { window.scrollTo(0, 1) }, 100);
        <meta name="viewport" content="user-scalable=no, width=device-width" />
        <?php endif; ?>
        <?php if ($this->mobile_device_type == IPAD_DEVICE): ?>
-       <link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/iphone.css" type="text/css"/>
        <link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/tablet.css" type="text/css"/>
-       
        <meta name="viewport" content="width=768px, minimum-scale=1.0, maximum-scale=1.0" />
+       
        <?php endif; ?>
 <?php endif; ?>
 
@@ -329,53 +328,17 @@ setTimeout(function() { window.scrollTo(0, 1) }, 100);
                <a href="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES); ?>#content">
                <img src="<?php echo $this->base_path; ?>images/clr.gif" height="1" width="1" border="0" alt="<?php echo _AT('goto_content'); ?> ALT+c" /></a>          
 
-               <div id="header-section-title">
-                       <!-- <?php if (isset($_SESSION['valid_user']) && $_SESSION['valid_user']): 
-                                       echo '<div id="site-name">'.stripslashes(SITE_NAME).'</div>'; 
-                               endif; ?> --> 
-                       <h1 id="section-title"><?php echo $this->section_title; ?>
+               
+               
+               
+               <!--  Note: ARIA roles cause XHTML validation errors because the XHTML DTD does not yet support ARIA. Use ARIA anyway -->
+
+       <div id="navigation-contentwrapper">
+       <h1 id="section-title"><?php echo $this->section_title; ?>
                                <?php if ((isset($this->course_id) && $this->course_id > 0) && ($_SESSION['enroll'] == AT_ENROLL_NO)) : ?> 
                                <!-- <small><a href="<?php echo $this->base_path; ?>enroll.php?course=<?php echo $this->course_id; ?>"><?php echo _AT('enroll_me'); ?></a></small>-->
                                <?php endif; ?>
                                </h1>
-               </div>
-       </div> <!--  END HEADER -->
-
-
-       <div id="contentwrapper">
-
-       <!--  Note: ARIA roles cause XHTML validation errors because the XHTML DTD does not yet support ARIA. Use ARIA anyway -->
-
-       <div id="navigation-contentwrapper">
-       <div id="navigation-bar">
-               <!--  this should be a button on its own  -->
-                       <?php if ($this->current_sub_level_page): ?>
-                       <div id="topnavlistcontainer" role="menu" aria-live="assertive" class="topnavlistcontainer" >
-                       <a class="navigation-bar-button" id="topnavlist-link" href="javascript:void(0);" tabindex="1"><?php echo _AT('navigation'); ?></a>
-                               <ul id="topnavlist"  class="fl-list-menu">
-                                       <?php $accesscounter = 0; //initialize ?>
-                                       <?php foreach ($this->top_level_pages as $page): ?>
-                                               <?php ++$accesscounter; $accesscounter = ($accesscounter == 10 ? 0 : $accesscounter); ?>
-                                               <?php $accesskey_text = ($accesscounter < 10 ? 'accesskey="'.$accesscounter.'"' : ''); ?>
-                                               <?php $accesskey_title = ($accesscounter < 10 ? ' Alt+'.$accesscounter : ''); ?>
-                                               <?php if ($page['url'] == $this->current_top_level_page): ?>
-                                                       <li role="menuitem"><a  href="<?php echo $page['url']; ?>" <?php echo $accesskey_text; ?> title="<?php echo $page['title'];?>"><?php echo $page['title']; ?></a>  </li>
-                                               <?php else: ?>
-                                                       <li role="menuitem"><a  href="<?php echo $page['url']; ?>" <?php echo $accesskey_text; ?> title="<?php echo $page['title']; ?>"><?php echo $page['title']; ?></a></li>
-                                               <?php endif; ?>
-                               
-                                               <?php $accesscounter = ($accesscounter == 0 ? 11 : $accesscounter); ?>
-                                       
-                                       <?php endforeach; ?>
-                                       <?php if(!$this->just_social): ?>
-                                       <li role="menuitem"><a href="<?php echo $this->base_path; ?>search.php"><?php echo _AT('search'); ?></a> </li>
-                                       <?php endif; ?> 
-                               </ul>
-                       </div>
-                       <?php endif; ?>
-               </div>
-
-
 
        <ul class="fl-tabs" id="home-guide">
        <!--  CHECK TO SEE IF USER IS A STUDENT -->
@@ -405,6 +368,13 @@ setTimeout(function() { window.scrollTo(0, 1) }, 100);
        </div><!--  END navigation-contentwrapper -->
        <!-- ENSURE "content_link" DOESN'T APPEAR IF NOT LOGGED IN -->
        
+       </div> <!--  END HEADER -->
+
+
+       <div id="contentwrapper">
+
+
+
        
        <?php if(isset($_SESSION['course_id']) && $_SESSION['course_id'] > 0): ?> 
                <div id="content-link-container" role="navigation" aria-live="assertive" class="flc-screenNavigator-navbar ">
@@ -439,7 +409,32 @@ setTimeout(function() { window.scrollTo(0, 1) }, 100);
                </div> <!-- end sequence-links -->
                <?php endif; ?>
 
+       <div id="navigation-column">
+               <!--  requires ARIA roles review -->
+               <!--  this should be a button on its own  -->
+                       <?php if ($this->current_sub_level_page): ?>
+                               <ul id="topnavlist-tablet"  class="fl-list-menu">
+                                       <?php $accesscounter = 0; //initialize ?>
+                                       <?php foreach ($this->top_level_pages as $page): ?>
+                                               <?php ++$accesscounter; $accesscounter = ($accesscounter == 10 ? 0 : $accesscounter); ?>
+                                               <?php $accesskey_text = ($accesscounter < 10 ? 'accesskey="'.$accesscounter.'"' : ''); ?>
+                                               <?php $accesskey_title = ($accesscounter < 10 ? ' Alt+'.$accesscounter : ''); ?>
+                                               <?php if ($page['url'] == $this->current_top_level_page): ?>
+                                                       <!-- note bug http://issues.fluidproject.org/browse/FLUID-4313 makes class "flc-screenNavigator-backButton fl-link-hilight" not work -->
+                                                       <li role="menuitem"><a  href="<?php echo $page['url']; ?>" <?php echo $accesskey_text; ?> class="flc-screenNavigator-backButton fl-link-hilight" title="<?php echo $page['title'];?>"><?php echo $page['title']; ?></a>  </li>
+                                               <?php else: ?>
+                                                       <li role="menuitem"><a  href="<?php echo $page['url']; ?>" <?php echo $accesskey_text; ?> title="<?php echo $page['title']; ?>"><?php echo $page['title']; ?></a></li>
+                                               <?php endif; ?>
+                               
+                                               <?php $accesscounter = ($accesscounter == 0 ? 11 : $accesscounter); ?>
+                                       
+                                       <?php endforeach; ?>
+                                        
+                               </ul>
+                       <?php endif; ?>
+               
 
+       </div>
        <div id="contentcolumn">        
                
 
@@ -474,4 +469,5 @@ setTimeout(function() { window.scrollTo(0, 1) }, 100);
                                        </ul>
                                </div> <!--  end subnavlistcontainer -->
                <?php endif; ?>
+               
 <?php endif; ?><!--  end header template for ipad/tablets -->