4122: moved js functionality for side menus into ATutorCourse.js. Altered html to...

diff --git a/docs/themes/blumin/include/box.tmpl.php b/docs/themes/blumin/include/box.tmpl.php
index cc24276..9b7e518 100644 (file)
--- a/docs/themes/blumin/include/box.tmpl.php
+++ b/docs/themes/blumin/include/box.tmpl.php
@@ -6,21 +6,7 @@ $compact_title = str_replace(' ', '', $this->title);
 ?>
 
 <br />
-<script language="javascript" type="text/javascript">
-       printSubmenuHeader("<?php echo $this->title; ?>");
-</script>
-
+<h4 class="box"><span><?php echo $this->title ?></span><input class="fl-force-right" src="" alt="" title="" type="image" /></h4>
 <div class="box" id="menu_<?php echo $compact_title ?>">
        <?php echo $this->dropdown_contents; ?>
 </div>
-
-<script language="javascript" type="text/javascript">
-if (ATutor.getcookie("m_<?php echo $this->title; ?>") == "0")
-{
-       jQuery("#menu_<?php echo $compact_title; ?>").hide();
-}
-else
-{
-       jQuery("#menu_<?php echo $compact_title; ?>").show();
-}
-</script>
\ No newline at end of file

diff --git a/docs/themes/blumin/include/header.tmpl.php b/docs/themes/blumin/include/header.tmpl.php
index ced877f..747335c 100644 (file)
--- a/docs/themes/blumin/include/header.tmpl.php
+++ b/docs/themes/blumin/include/header.tmpl.php
@@ -102,7 +102,7 @@ function showTocToggle(objId, show, hide, key, selected) {
                        '<span id="' + objId + 'hidelink" style="display:none;">' + hide + '</span>'    + '</a>');
                }
        }
-}
+};
 
 function toggleToc(objId) {
        var toc = document.getElementById(objId);
@@ -123,7 +123,7 @@ function toggleToc(objId) {
                showlink.style.display='';
        }
        ATutor.setcookie(objId, toc.style.display, 1);
-}
+};
 
 //toggle content folder in side menu "content navigation"
 function toggleFolder(cid)
@@ -140,52 +140,7 @@ function toggleFolder(cid)
        }
        
        jQuery("#folder"+cid).slideToggle();
-}
-
-// toggle elements in side menu
-function elementToggle(elem, title)
-{
-       element_collapse_icon = "<?php echo $_base_path; ?>images/mswitch_minus.gif";
-       element_expand_icon = "<?php echo $_base_path; ?>images/mswitch_plus.gif";
-       
-       if (jQuery(elem).attr("src") == element_collapse_icon) {
-               jQuery(elem).attr("src", element_expand_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('show'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('show'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, 0, 1);
-       }
-       else {
-               jQuery(elem).attr("src", element_collapse_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('collapse'); ?>");
-               jQuery(elem).attr("alt", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, null, 1);;
-       }
-       
-       jQuery(elem).parent().next().slideToggle();
-}
-
-function printSubmenuHeader(title)
-{
-       if (ATutor.getcookie("m_"+title) == "0")
-       {
-               image = "<?php echo $_base_path?>images/mswitch_plus.gif";
-               alt_text = "<?php echo _AT('show'); ?>" + title;
-       }
-       else
-       {
-               image = "<?php echo $_base_path?>images/mswitch_minus.gif";
-               alt_text = "<?php echo _AT('hide'); ?>" + title;
-       }
-       
-       document.writeln('<h4 class="box">'+
-       '       <input src="'+image+'"' + 
-       '              onclick="elementToggle(this, \''+title+'\'); return false;"' +
-       '              alt="'+ alt_text + '" ' +
-       '              title="'+ alt_text + '"' +
-       '              style="float:right" type="image" />'+ title +
-       '</h4>');
-}
+};
 //-->
 </script>
 <!-- section title -->

diff --git a/docs/themes/default/include/box.tmpl.php b/docs/themes/default/include/box.tmpl.php
index 45bfac7..b413391 100644 (file)
--- a/docs/themes/default/include/box.tmpl.php
+++ b/docs/themes/default/include/box.tmpl.php
@@ -4,22 +4,10 @@ global $_base_path;
 
 $compact_title = str_replace(' ', '', $this->title);
 ?>
-
 <br />
-<script language="javascript" type="text/javascript">
-       printSubmenuHeader("<?php echo $this->title; ?>");
-</script>
+<br />
+<h4 class="box fl-clear"><span><?php echo $this->title ?></span><input class="fl-force-right" src="" alt="" title="" type="image" /></h4>
 <div class="box" id="menu_<?php echo $compact_title ?>">
        <?php echo $this->dropdown_contents; ?>
 </div>
 
-<script language="javascript" type="text/javascript">
-if (ATutor.getcookie("m_<?php echo $this->title; ?>") == "0")
-{
-       jQuery("#menu_<?php echo $compact_title; ?>").hide();
-}
-else
-{
-       jQuery("#menu_<?php echo $compact_title; ?>").show();
-}
-</script>
\ No newline at end of file

diff --git a/docs/themes/default/include/header.tmpl.php b/docs/themes/default/include/header.tmpl.php
index 37355bd..75b3cb0 100644 (file)
--- a/docs/themes/default/include/header.tmpl.php
+++ b/docs/themes/default/include/header.tmpl.php
@@ -85,7 +85,10 @@ global $system_courses, $_custom_css, $db;
 </head>
 <body onload="<?php echo $this->onload; ?>">
 <script language="javascript" type="text/javascript">
-//<!--
+/**
+ * This function adds the show/hide functionality to the entire side menu via a show/hide button
+ * Only necessary in the content area of the site.
+ */
 function showTocToggle(objId, show, hide, key, selected) {
        if(document.getElementById) {
                if (key) {
@@ -106,6 +109,9 @@ function showTocToggle(objId, show, hide, key, selected) {
        }
 }
 
+/**
+ * This function actually performs the toggle functionality for the side menu
+ */
 function toggleToc(objId) {
        var toc = document.getElementById(objId);
        if (toc == null) {
@@ -128,7 +134,7 @@ function toggleToc(objId) {
        ATutor.setcookie(objId, hidelink.style.display, 1);
 }
 
-// toggle content folder in side menu "content navigation"
+// toggle open/close content folder in side menu "content navigation"
 function toggleFolder(cid)
 {
        if (jQuery("#tree_icon"+cid).attr("src") == tree_collapse_icon) {
@@ -147,51 +153,6 @@ function toggleFolder(cid)
        jQuery("#folder"+cid).slideToggle();
 }
 
-// toggle elements in side menu
-function elementToggle(elem, title)
-{
-       element_collapse_icon = "<?php echo $this->base_path; ?>images/mswitch_minus.gif";
-       element_expand_icon = "<?php echo $this->base_path; ?>images/mswitch_plus.gif";
-       
-       if (jQuery(elem).attr("src") == element_collapse_icon) {
-               jQuery(elem).attr("src", element_expand_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('show'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('show'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, 0, 1);
-       }
-       else {
-               jQuery(elem).attr("src", element_collapse_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('collapse'); ?>");
-               jQuery(elem).attr("alt", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, null, 1);;
-       }
-       
-       jQuery(elem).parent().next().slideToggle();
-}
-
-function printSubmenuHeader(title)
-{
-       if (ATutor.getcookie("m_"+title) == "0")
-       {
-               image = "<?php echo $this->base_path?>images/mswitch_plus.gif";
-               alt_text = "<?php echo _AT('show'); ?> " + title;
-       }
-       else
-       {
-               image = "<?php echo $this->base_path?>images/mswitch_minus.gif";
-               alt_text = "<?php echo _AT('hide'); ?> " + title;
-       }
-       
-       document.writeln('<h4 class="box">'+
-       '       <input src="'+image+'"' + 
-       '              onclick="elementToggle(this, \''+title+'\'); return false;"' +
-       '              alt="'+ alt_text + '" ' +
-       '              title="'+ alt_text + '"' +
-       '              style="float:right" type="image" /> '+ title +
-       '</h4>');
-}
-//-->
 </script>
 <div class="page_wrapper">
 <div id="header">

diff --git a/docs/themes/default_classic/include/header.tmpl.php b/docs/themes/default_classic/include/header.tmpl.php
index dac393c..8855c49 100644 (file)
--- a/docs/themes/default_classic/include/header.tmpl.php
+++ b/docs/themes/default_classic/include/header.tmpl.php
@@ -95,51 +95,6 @@ function toggleFolder(cid)
        jQuery("#folder"+cid).slideToggle();
 }
 
-// toggle elements in side menu
-function elementToggle(elem, title)
-{
-       element_collapse_icon = "<?php echo $_base_path; ?>images/mswitch_minus.gif";
-       element_expand_icon = "<?php echo $_base_path; ?>images/mswitch_plus.gif";
-       
-       if (jQuery(elem).attr("src") == element_collapse_icon) {
-               jQuery(elem).attr("src", element_expand_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('show'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('show'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, 0, 1);
-       }
-       else {
-               jQuery(elem).attr("src", element_collapse_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('collapse'); ?>");
-               jQuery(elem).attr("alt", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, null, 1);;
-       }
-       
-       jQuery(elem).parent().next().slideToggle();
-}
-
-function printSubmenuHeader(title)
-{
-       if (ATutor.getcookie("m_"+title) == "0")
-       {
-               image = "<?php echo $_base_path?>images/mswitch_plus.gif";
-               alt_text = "<?php echo _AT('show'); ?>" + title;
-       }
-       else
-       {
-               image = "<?php echo $_base_path?>images/mswitch_minus.gif";
-               alt_text = "<?php echo _AT('hide'); ?>" + title;
-       }
-       
-       document.writeln('<h4 class="box">'+
-       '       <input src="'+image+'"' + 
-       '              onclick="elementToggle(this, \''+title+'\'); return false;"' +
-       '              alt="'+ alt_text + '" ' +
-       '              title="'+ alt_text + '"' +
-       '              style="float:right" type="image" />'+ title +
-       '</h4>');
-}
-//-->
 </script>
 
 <div id="member-links" style="float: right;">

diff --git a/docs/themes/default_classic/styles.css b/docs/themes/default_classic/styles.css
index c7517ff..72d9cbc 100644 (file)
--- a/docs/themes/default_classic/styles.css
+++ b/docs/themes/default_classic/styles.css
@@ -977,16 +977,19 @@ fieldset {
 /* side-menu */
 h4.box {
        margin-top: 10px;
-       font-family: Helevetica, Arial, sans-serif;
     background: #788CB3;
     border: 1px solid #788CB3;
-    color: white;
     padding: 0em 1em 0em 1em;
     display: inline;
-       font-weight:normal;
        margin-left: 0px;
        margin-top: 1000px;
-       white-space:nowrap;
+}
+
+h4.box span {
+    font-family: Helevetica, Arial, sans-serif;
+    font-weight: normal;
+    color: white;
+    white-space: nowrap;
 }
 
 div.box {

diff --git a/docs/themes/fluid/include/header.tmpl.php b/docs/themes/fluid/include/header.tmpl.php
index 8b425b5..6897a88 100644 (file)
--- a/docs/themes/fluid/include/header.tmpl.php
+++ b/docs/themes/fluid/include/header.tmpl.php
@@ -168,51 +168,6 @@ function toggleFolder(cid)
        jQuery("#folder"+cid).slideToggle();
 }
 
-// toggle elements in side menu
-function elementToggle(elem, title)
-{
-       element_collapse_icon = "<?php echo $_base_path; ?>images/mswitch_minus.gif";
-       element_expand_icon = "<?php echo $_base_path; ?>images/mswitch_plus.gif";
-       
-       if (jQuery(elem).attr("src") == element_collapse_icon) {
-               jQuery(elem).attr("src", element_expand_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('show'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('show'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, 0, 1);
-       }
-       else {
-               jQuery(elem).attr("src", element_collapse_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('collapse'); ?>");
-               jQuery(elem).attr("alt", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, null, 1);;
-       }
-       
-       jQuery(elem).parent().next().slideToggle();
-}
-
-function printSubmenuHeader(title)
-{
-       if (getcookie("m_"+title) == "0")
-       {
-               image = "<?php echo $_base_path?>images/mswitch_plus.gif";
-               alt_text = "<?php echo _AT('show'); ?>" + title;
-       }
-       else
-       {
-               image = "<?php echo $_base_path?>images/mswitch_minus.gif";
-               alt_text = "<?php echo _AT('hide'); ?>" + title;
-       }
-       
-       document.writeln('<h4 class="box">'+
-       '       <input src="'+image+'"' + 
-       '              onclick="elementToggle(this, \''+title+'\'); return false;"' +
-       '              alt="'+ alt_text + '" ' +
-       '              title="'+ alt_text + '"' +
-       '              style="float:right" type="image" />'+ title +
-       '</h4>');
-}
-//-->
 </script>
 
 <div id="top-links"> <!-- top help/search/login links -->

diff --git a/docs/themes/fluid/styles.css b/docs/themes/fluid/styles.css
index a0cbc41..cbc40f5 100644 (file)
--- a/docs/themes/fluid/styles.css
+++ b/docs/themes/fluid/styles.css
@@ -925,15 +925,24 @@ div.tabs a:hover, div.tabs a:active {
 h4.box {
        font-size:0.85em;
        padding: 2px;
+    border-radius:.5em;
+    -moz-border-radius: .5em .5em 0em 0em;
+    padding:.2em;
+    border:1px solid #ccc;
+
 }
 
 div.box {
        color: black;
-
        font-size:0.85em;
        font-weight: normal;
        padding:5px;
-       margin-bottom:5px;
+       margin-bottom:5px;  
+    border-radius:.5em;
+    -moz-border-radius: .0em .0em .5em .5em;
+    border-left:1px solid #ccc;
+    border-right:1px solid #ccc;
+    border-bottom:1px solid #ccc;
 }
 
 h5.box { 

diff --git a/docs/themes/greenmin/include/box.tmpl.php b/docs/themes/greenmin/include/box.tmpl.php
index c96f56b..498dd4f 100644 (file)
--- a/docs/themes/greenmin/include/box.tmpl.php
+++ b/docs/themes/greenmin/include/box.tmpl.php
@@ -6,21 +6,7 @@ $compact_title = str_replace(' ', '', $this->title);
 ?>
 
 <br />
-<script language="javascript" type="text/javascript">
-       printSubmenuHeader("<?php echo $this->title; ?>");
-</script>
-
+<h4 class="box"><span><?php echo $this->title ?></span><input class="fl-force-right" src="" alt="" title="" type="image" /></h4>
 <div class="box" id="menu_<?php echo $compact_title ?>">
        <?php echo $this->dropdown_contents; ?>
-</div>
-
-<script language="javascript" type="text/javascript">
-if (getcookie("m_<?php echo $this->title; ?>") == "0")
-{
-       jQuery("#menu_<?php echo $compact_title; ?>").hide();
-}
-else
-{
-       jQuery("#menu_<?php echo $compact_title; ?>").show();
-}
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file

diff --git a/docs/themes/greenmin/include/header.tmpl.php b/docs/themes/greenmin/include/header.tmpl.php
index 734af60..62f791a 100644 (file)
--- a/docs/themes/greenmin/include/header.tmpl.php
+++ b/docs/themes/greenmin/include/header.tmpl.php
@@ -143,51 +143,6 @@ function toggleFolder(cid)
        jQuery("#folder"+cid).slideToggle();
 }
 
-// toggle elements in side menu
-function elementToggle(elem, title)
-{
-       element_collapse_icon = "<?php echo $_base_path; ?>images/mswitch_minus.gif";
-       element_expand_icon = "<?php echo $_base_path; ?>images/mswitch_plus.gif";
-       
-       if (jQuery(elem).attr("src") == element_collapse_icon) {
-               jQuery(elem).attr("src", element_expand_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('show'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('show'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, 0, 1);
-       }
-       else {
-               jQuery(elem).attr("src", element_collapse_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('collapse'); ?>");
-               jQuery(elem).attr("alt", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, null, 1);;
-       }
-       
-       jQuery(elem).parent().next().slideToggle();
-}
-
-function printSubmenuHeader(title)
-{
-       if (getcookie("m_"+title) == "0")
-       {
-               image = "<?php echo $_base_path?>images/mswitch_plus.gif";
-               alt_text = "<?php echo _AT('show'); ?>" + title;
-       }
-       else
-       {
-               image = "<?php echo $_base_path?>images/mswitch_minus.gif";
-               alt_text = "<?php echo _AT('hide'); ?>" + title;
-       }
-       
-       document.writeln('<h4 class="box">'+
-       '       <input src="'+image+'"' + 
-       '              onclick="elementToggle(this, \''+title+'\'); return false;"' +
-       '              alt="'+ alt_text + '" ' +
-       '              title="'+ alt_text + '"' +
-       '              style="float:right" type="image" />'+ title +
-       '</h4>');
-}
-//-->
 </script>
 <!-- section title -->
 <div><a href="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES); ?>#content" accesskey="c"><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>               <a href="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES); ?>#menu"  accesskey="m"><img src="<?php echo $this->base_path; ?>images/clr.gif" height="1" width="1" border="0" alt="<?php echo _AT('goto_menu'); ?> ALT+m" /></a><h1 id="section-title"><?php echo $this->section_title; ?><?php if (($this->course_id > 0) && ($_SESSION['enroll'] == AT_ENROLL_NO)) : ?>

diff --git a/docs/themes/greenmin/styles.css b/docs/themes/greenmin/styles.css
index e12a099..180e32d 100644 (file)
--- a/docs/themes/greenmin/styles.css
+++ b/docs/themes/greenmin/styles.css
@@ -963,7 +963,6 @@ div.tabs a:hover, div.tabs a.active {
 
 
 h4.box {
-       font-size: x-small;
        background-color: #DEECE2;
        color: black;
        border: 1px solid #57945A;

diff --git a/docs/themes/mobile/include/header.tmpl.php b/docs/themes/mobile/include/header.tmpl.php
index 4721a58..14b71a4 100644 (file)
--- a/docs/themes/mobile/include/header.tmpl.php
+++ b/docs/themes/mobile/include/header.tmpl.php
@@ -156,51 +156,6 @@ function toggleFolder(cid)
        jQuery("#folder"+cid).slideToggle();
 }
 
-// toggle elements in side menu
-function elementToggle(elem, title)
-{
-       element_collapse_icon = "<?php echo $_base_path; ?>images/mswitch_minus.gif";
-       element_expand_icon = "<?php echo $_base_path; ?>images/mswitch_plus.gif";
-       
-       if (jQuery(elem).attr("src") == element_collapse_icon) {
-               jQuery(elem).attr("src", element_expand_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('show'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('show'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, 0, 1);
-       }
-       else {
-               jQuery(elem).attr("src", element_collapse_icon);
-               jQuery(elem).attr("alt", "<?php echo _AT('collapse'); ?>");
-               jQuery(elem).attr("alt", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               jQuery(elem).attr("title", "<?php echo _AT('hide'). ' '; ?>"+ title);
-               ATutor.setcookie("m_"+title, null, 1);;
-       }
-       
-       jQuery(elem).parent().next().slideToggle();
-}
-
-function printSubmenuHeader(title)
-{
-       if (getcookie("m_"+title) == "0")
-       {
-               image = "<?php echo $_base_path?>images/mswitch_plus.gif";
-               alt_text = "<?php echo _AT('show'); ?> " + title;
-       }
-       else
-       {
-               image = "<?php echo $_base_path?>images/mswitch_minus.gif";
-               alt_text = "<?php echo _AT('hide'); ?> " + title;
-       }
-       
-       document.writeln('<h4 class="box">'+
-       '       <input src="'+image+'"' + 
-       '              onclick="elementToggle(this, \''+title+'\'); return false;"' +
-       '              alt="'+ alt_text + '" ' +
-       '              title="'+ alt_text + '"' +
-       '              style="float:right" type="image" /> '+ title +
-       '</h4>');
-}
-//-->
 </script>
 <div class="page_wrapper">
 <div id="header">