Skip to content

Commit

Permalink
Merge pull request #9 from radiocontrolled/0004874
Browse files Browse the repository at this point in the history 
Addresses http://atutor.ca/atutor/mantis/view.php?id=4874
  • Loading branch information
Greg Gay committed Oct 11, 2011
2 parents c3b4caa + fb328b7 commit 751d185
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 60 deletions.
12 changes: 5 additions & 7 deletions themes/mobile/include/footer.tmpl.php
View file
@@ -1,13 +1,11 @@
<?php if (!defined('AT_INCLUDE_PATH')) { exit; } ?>
<?php if ($this->mobile_device_type != IPAD_DEVICE): ?><!-- begin footer template for iphone, android, and blackberry -->


</div> <!-- end innner-contentwrapper -->
</div> <!-- end contentcolumn -->
</div> <!-- end contentwrapper -->
</div> <!-- end main -->
</div>
</div>
</div>
</div>
</div>
</div> <!-- end wrapper -->

<div id="footer" class="fl-navbar fl-table">
<div id="footer-links"> <!-- top help/search/login links -->
<ul class="footer-links-tabs fl-tabs flc-themer" role="menu">
Expand Down
56 changes: 14 additions & 42 deletions themes/mobile/include/header.tmpl.php
View file
Expand Up @@ -56,36 +56,28 @@
// 1. any click on the page closes the content menu but the link "content_link" itself
// 2. the click on link "content_link" opens the content menu


require ('TeraWurflRemoteClient.php');
$wurflObj = new TeraWurflRemoteClient('http://wurfl.thesedays.com/webservice.php');
$capabilities = array("product_info");
$data_format = TeraWurflRemoteClient::$FORMAT_JSON;
$wurflObj->getCapabilitiesFromAgent(null, $capabilities, $data_format);

// open/close content menu
//open/close content menu - tablet
$this->onload .= "
jQuery('#content_link').click(function(e) {
e.stopPropagation();
jQuery('#content').slideToggle(0);
jQuery('#content_link').toggleClass('content_link_tablet_highlight');
jQuery('#content_link').toggleClass('triangle-isosceles');
jQuery('#content_link').toggleClass('top');
jQuery('#content_link').toggleClass('right');
jQuery('#content_link').toggleClass('content_link_tablet_highlight').toggleClass('triangle-isosceles').toggleClass('top').toggleClass('right');
";
$this->onload .= "});
";

//open/close subnavlist in smartphones

//open/close subnavlist - smartphones
$this->onload .= "
jQuery('#subnavlist-link').click(function(e) {
e.stopPropagation();
jQuery('#subnavlist').slideToggle();
jQuery('#subnavlist-link').toggleClass('content-closed');
jQuery('#subnavlist-link').toggleClass('subnavcontain-active');
jQuery('#subnavlist-link').toggleClass('content-closed').toggleClass('subnavcontain-active');
jQuery('.subnavcontain').toggleClass('subnavcontain3');
";
$this->onload .= "});
Expand All @@ -94,39 +86,32 @@
$this->onload .= "
jQuery('#content_link_phone').click(function(e) {
e.stopPropagation();
jQuery('#content').slideToggle();
jQuery('#content_link_phone').toggleClass('topnavlist-link-highlight');
jQuery('#content_link_phone').toggleClass('content-closed');
jQuery('#content_link_phone').toggleClass('topnavlist-link-highlight').toggleClass('content-closed');
jQuery('.subnavcontain').toggleClass('subnavcontain3');
";
$this->onload .= "});
";

// open/close header navigational menu for smartphones
// open/close header navigational menu - smartphones
$this->onload .= "
jQuery(document).click(function () {
jQuery('#topnavlist').slideUp(600);});
jQuery('.topnavlist-link').click(function(e) {
e.stopPropagation();
jQuery('#topnavlist').slideToggle();
jQuery('#topnavlist-link').toggleClass('.topnavlist-link-highlight');
jQuery('#topnavlist-link').toggleClass('.topnavlist-link-highlight-background');
jQuery('#topnavlist-link').toggleClass('.topnavlist-link-highlight').toggleClass('.topnavlist-link-highlight-background');
});
";

// open/close header navigational menu for tablets

// open/close header navigational menu - tablets
$this->onload .= "
jQuery(document).click(function () {
jQuery('#navigation-column').slideUp(200);});
jQuery('.topnavlist-link').click(function(e) {
e.stopPropagation();
jQuery('#navigation-column').slideToggle(0);
jQuery('#topnavlist-link').toggleClass('topnavlist-link-highlight');
jQuery('#topnavlist-link').toggleClass('triangle-isosceles');
jQuery('#topnavlist-link').toggleClass('top');
jQuery('#topnavlist-link').toggleClass('topnavlist-link-highlight').toggleClass('triangle-isosceles').toggleClass('top');
});
";

Expand All @@ -135,14 +120,10 @@
jQuery('.more-button').toggle(function(e) {
jQuery('.subnavlist-more').show();
jQuery('#switch').attr('src','images/hidemenu.gif' );
jQuery('#switch').attr('title', 'less menu items');
jQuery('#switch').attr('alt', 'less menu items');
jQuery('#switch').attr('src','images/hidemenu.gif' ).attr('title', 'less menu items').attr('alt', 'less menu items');
},function(){
jQuery('.subnavlist-more').hide();
jQuery('#switch').attr('src', 'images/showmenu.gif' );
jQuery('#switch').attr('title', 'more menu items');
jQuery('#switch').attr('alt', 'more menu items');
jQuery('#switch').attr('src', 'images/showmenu.gif' ).attr('title', 'more menu items').attr('alt', 'more menu items');
});
";

Expand All @@ -152,8 +133,7 @@
jQuery('#results-hide-show-link').click(function(e) {
e.stopPropagation();
jQuery('#results-display').slideToggle();
jQuery(this).toggleClass('content-closed');
jQuery(this).preventDefault();
jQuery(this).toggleClass('content-closed').preventDefault();
";
$this->onload .= "});
";
Expand All @@ -168,14 +148,10 @@
$this->onload .= "});
";


// Hide the addressbar
$this->onload .= "
setTimeout(function() { window.scrollTo(0, 1) }, 100);
";



?>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
Expand Down Expand Up @@ -553,19 +529,15 @@
<?php endif; ?>

<?php if(isset($_SESSION['course_id']) && $_SESSION['course_id'] > 0): ?>
<div id="course-level-navigation">



<div id="course-level-navigation" role="navigation" aria-live="assertive">
<div id="content-link-container" role="navigation" aria-live="assertive" class="flc-screenNavigator-navbar ">
<a id="content_link" class="content_link_tablet content_link" href="javascript:void(0);"><?php echo "Content";//_AT("content_navigation"); ?></a>
</div>
</div><!-- course-level navigation -->
<div id="content">
<?php $contentManager->printMainMenu(); ?>
<script language="javascript" type="text/javascript"></script>
</div>

</div><!-- course-level navigation -->
</div> <!-- end sequence-links-course-navigation -->
<?php endif;?>

Expand Down
8 changes: 4 additions & 4 deletions themes/mobile/mobile.css
View file
Expand Up @@ -154,7 +154,7 @@ body,ul,li {
font-weight: bold;
}
.fl-theme-iphone .topnavlistcontainer .topnavlist-link-highlight{/*makes the navigation button link highlight*/
color: #354D68;
color: #bfd9fb;
text-decoration: none;
font-weight: bold;
background-color: white;
Expand Down Expand Up @@ -186,7 +186,7 @@ div#content-link-container.flc-screenNavigator-navbar {
text-decoration: none;

color: white;
font-style: bold;
font-weight: bold;
color: #005689;
}
.resume{
Expand Down Expand Up @@ -1372,7 +1372,7 @@ ul#home-links, ul#home-detail-links {
}
.current_list li{
list-style-type: none;
font-style: bold;
font-weight: bold;
padding-bottom: .5em;
padding-left: .5em;
margin:0;
Expand Down Expand Up @@ -1753,7 +1753,7 @@ div.home_box {
margin-left:1em;
}
.draggable_selected {
background-color: lightgrey;
background-color: #A8A8A8;
cursor: move;
}

Expand Down
7 changes: 0 additions & 7 deletions themes/mobile/tablet.css
View file
Expand Up @@ -223,13 +223,6 @@ h3.browse-courses{
h3 a {
font-size: 100%;
}
/************************************************************************************************/
/* Highlighting outside of the header and footer */
/************************************************************************************************/
/*link highlighting */
.fl-theme-iphone a:not(.fl-tabs){
color: #4c96f4;
}

/************************************************************************************************/
/* Preferences tabs */
Expand Down

0 comments on commit 751d185

Please sign in to comment.