http://www.atutor.ca/atutor/mantis/view.php?id=4328

Also fix html validation error on "create question" page

diff --git a/docs/include/jscripts/transformable.js b/docs/include/jscripts/transformable.js
index 38bfcc3..e1a1596 100644 (file)
--- a/docs/include/jscripts/transformable.js
+++ b/docs/include/jscripts/transformable.js
@@ -172,7 +172,7 @@ trans.utility.selected;
   };\r
   \r
   // toggle elements in side menu\r
-  trans.utility.elementToggle = function (elem, title, base_path, show_text, hide_text)\r
+  trans.utility.elementToggle = function (elem, title, compact_title, base_path, show_text, hide_text)\r
   {\r
     element_collapse_icon = base_path+"images/mswitch_minus.gif";\r
     element_expand_icon = base_path+"images/mswitch_plus.gif";\r
@@ -181,21 +181,21 @@ trans.utility.selected;
       jQuery(elem).attr("src", element_expand_icon);\r
       jQuery(elem).attr("alt", show_text + " "+ title);\r
       jQuery(elem).attr("title", show_text + " "+ title);\r
-      trans.utility.setcookie("m_"+title, 0, 1);\r
+      trans.utility.setcookie("m_"+compact_title, 0, 1);\r
     }\r
     else {\r
       jQuery(elem).attr("src", element_collapse_icon);\r
       jQuery(elem).attr("alt", hide_text + " "+ title);\r
       jQuery(elem).attr("title", hide_text + " "+ title);\r
-      trans.utility.setcookie("m_"+title, 1, 1);;\r
+      trans.utility.setcookie("m_"+compact_title, 1, 1);;\r
     }\r
     \r
     jQuery(elem).parent().next().slideToggle();\r
   };\r
   \r
-  trans.utility.printSubmenuHeader = function (title, base_path, show_text, hide_text, default_value)\r
+  trans.utility.printSubmenuHeader = function (title, compact_title, base_path, show_text, hide_text, default_value)\r
   {\r
-       cookie_value = trans.utility.getcookie("m_"+title);\r
+       cookie_value = trans.utility.getcookie("m_"+compact_title);\r
        \r
        if (cookie_value == "0" || (cookie_value == "" && default_value == "hide"))\r
     {\r
@@ -210,7 +210,7 @@ trans.utility.selected;
     \r
     document.writeln('<h4 class="box">'+\r
     '  <input src="'+image+'"' + \r
-    '         onclick="trans.utility.elementToggle(this, \''+title+'\', \''+base_path+'\', \''+show_text+'\', \''+hide_text+'\'); return false;"' +\r
+    '         onclick="trans.utility.elementToggle(this, \''+title+'\', \''+compact_title+'\', \''+base_path+'\', \''+show_text+'\', \''+hide_text+'\'); return false;"' +\r
     '         alt="'+ alt_text + '" ' +\r
     '         title="'+ alt_text + '"' +\r
     '         style="float:right" type="image" /> '+ title +\r

diff --git a/docs/themes/default/include/box.tmpl.php b/docs/themes/default/include/box.tmpl.php
index 3a1b5f0..89bc0c4 100644 (file)
--- a/docs/themes/default/include/box.tmpl.php
+++ b/docs/themes/default/include/box.tmpl.php
@@ -2,12 +2,13 @@
 if (!defined('TR_INCLUDE_PATH')) { exit; } 
 global $_base_path;
 //debug($this->default_status);
-$compact_title = str_replace(' ', '', $this->title);
+$compact_title = str_replace(array(' ', '(', ')', ' '), array('','','',''), $this->title);
+if (!isset($this->default_status)) $this->default_status = "show";
 ?>
 
 <br />
 <script language="javascript" type="text/javascript">
-  trans.utility.printSubmenuHeader("<?php echo $this->title; ?>", "<?php echo $_base_path; ?>", "<?php echo _AT('show'); ?>", "<?php echo _AT('hide'); ?>", "<?php echo $this->default_status; ?>");
+  trans.utility.printSubmenuHeader("<?php echo $this->title; ?>", "<?php echo $compact_title; ?>", "<?php echo $_base_path; ?>", "<?php echo _AT('show'); ?>", "<?php echo _AT('hide'); ?>", "<?php echo $this->default_status; ?>");
 </script>
 
 <div class="box" id="menu_<?php echo $compact_title ?>">
@@ -15,7 +16,8 @@ $compact_title = str_replace(' ', '', $this->title);
 </div>
 
 <script language="javascript" type="text/javascript">
-cookie_value = trans.utility.getcookie("m_<?php echo $this->title; ?>");
+//<!--
+cookie_value = trans.utility.getcookie("m_<?php echo $compact_title; ?>");
 if (cookie_value == "0" || cookie_value == "" && "<?php echo $this->default_status; ?>" == "hide")
 {
        jQuery("#menu_<?php echo $compact_title; ?>").hide();
@@ -24,4 +26,5 @@ 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 a05e51a..c513b0f 100644 (file)
--- a/docs/themes/default/include/header.tmpl.php
+++ b/docs/themes/default/include/header.tmpl.php
@@ -82,7 +82,7 @@ $starttime = $mtime;
 <?php echo $this->rtl_css; ?>
        <script src="<?php echo $this->base_path; ?>include/jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
        <script src="<?php echo $this->base_path; ?>include/jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
-       <script src="<?php echo $this->base_path; ?>include/jscripts/flowplayer/flowplayer-3.1.2.min.js"></script>
+       <script src="<?php echo $this->base_path; ?>include/jscripts/flowplayer/flowplayer-3.1.2.min.js" type="text/javascript"></script>
        <script src="<?php echo $this->base_path; ?>include/jscripts/handleAjaxResponse.js" type="text/javascript"></script>
        <script src="<?php echo $this->base_path; ?>include/jscripts/transformable.js" type="text/javascript"></script>
 <?php echo $this->custom_css; ?>
@@ -196,38 +196,40 @@ foreach ($this->top_level_pages as $page) {
       <?php } ?>
     <?php } ?>
   <?php } ?>
-
   <?php if (isset($this->course_id) && $this->course_id > 0) {?>
     <!--  <div id="course-tools">-->
       <?php if ($this->isAuthor) { // only for authors ?>
       <li><a href="<?php echo $this->base_path; ?>home/course/course_property.php?_course_id=<?php echo $this->course_id; ?>">
         <img src="<?php echo $this->base_path. "themes/".$this->theme."/images/course_property.png"; ?>" title="<?php echo _AT('course_property'); ?>" alt="<?php echo _AT('course_property'); ?>" border="0"  class="shortcut_icon"/>
-      </a></li>
+        </a>
+      </li>
       <li><a href="<?php echo $this->base_path; ?>home/editor/arrange_content.php?_course_id=<?php echo $this->course_id; ?>">
         <img src="<?php echo $this->base_path. "themes/".$this->theme."/images/arrange_content.gif"; ?>" title="<?php echo _AT('arrange_content'); ?>" alt="<?php echo _AT('arrange_content'); ?>" border="0"  class="shortcut_icon"/>
-      </a> </li>
+        </a>
+      </li>
       <li><a href="<?php echo $this->base_path; ?>home/editor/import_export_content.php?_course_id=<?php echo $this->course_id; ?>">
         <img src="<?php echo $this->base_path. "themes/".$this->theme."/images/import_export.png"; ?>" title="<?php echo _AT('content_packaging'); ?>" alt="<?php echo _AT('content_packaging'); ?>" border="0"  class="shortcut_icon"/>
-      </a> </li>
+        </a>
+      </li>
       <li><a href="<?php echo $this->base_path; ?>home/course/del_course.php?_course_id=<?php echo $this->course_id; ?>">
         <img src="<?php echo $this->base_path. "themes/".$this->theme."/images/delete.gif"; ?>" title="<?php echo _AT('del_course'); ?>" alt="<?php echo _AT('del_course'); ?>" border="0"  class="shortcut_icon"/>
-      <li></a></li>
+        </a>
+      </li>
       <?php }?>
-      <a href="<?php echo $this->base_path; ?>home/index.php">
-      <li>  <img src="<?php echo $this->base_path. "themes/".$this->theme."/images/exit.png"; ?>" title="<?php echo _AT('exit_course'); ?>" alt="<?php echo _AT('exit_course'); ?>" border="0"  class="shortcut_icon"/>
-      </a></li>
-
+      <li><a href="<?php echo $this->base_path; ?>home/index.php">
+        <img src="<?php echo $this->base_path. "themes/".$this->theme."/images/exit.png"; ?>" title="<?php echo _AT('exit_course'); ?>" alt="<?php echo _AT('exit_course'); ?>" border="0"  class="shortcut_icon"/>
+        </a>
+      </li>
   </ul>
  </div>
     <?php }?>
 
-
-    <!-- guide -->
-    <?php if (isset($this->guide)) {?>
-      <div id="guide_box">
-      <a href="<?php echo $this->guide; ?>" onclick="trans.utility.poptastic('<?php echo $this->guide; ?>'); return false;" id="guide" target="_new"><em><?php echo $this->page_title; ?></em></a>&nbsp;
-    </div>
-    <?php }?>
+<!-- guide -->
+  <?php if (isset($this->guide)) {?>
+    <div id="guide_box">
+    <a href="<?php echo $this->guide; ?>" onclick="trans.utility.poptastic('<?php echo $this->guide; ?>'); return false;" id="guide" target="_new"><em><?php echo $this->page_title; ?></em></a>&nbsp;
+  </div>
+  <?php }?>
 <?php  
 //if ($this->course_id > 0) {
 ?>
@@ -339,7 +341,7 @@ foreach ($this->top_level_pages as $page) {
 ?>
 
            <div id="subnavbacktopage">   
-             <a href="<?php echo $this->back_to_page['url']; ?>" id="back-to"><?php echo '<img src="'.TR_BASE_HREF.'images/arrowicon.gif"  alt="'._AT('back_to').':'.$this->back_to_page['title'].'" title="'._AT('back_to').':'.$this->back_to_page['title'].'" style="vertical-align:center;">'?></a> 
+             <a href="<?php echo $this->back_to_page['url']; ?>" id="back-to"><?php echo '<img src="'.TR_BASE_HREF.'images/arrowicon.gif"  alt="'._AT('back_to').':'.$this->back_to_page['title'].'" title="'._AT('back_to').':'.$this->back_to_page['title'].'" style="vertical-align:center;" />'; ?></a> 
            </div>
          <?php endif; ?>
        <ul id="subnavlist">

diff --git a/docs/themes/default/tests/question_db_top.tmpl.php b/docs/themes/default/tests/question_db_top.tmpl.php
index 11138b5..de1be2c 100644 (file)
--- a/docs/themes/default/tests/question_db_top.tmpl.php
+++ b/docs/themes/default/tests/question_db_top.tmpl.php
@@ -11,8 +11,7 @@
 /************************************************************************/\r
 \r
 ?>\r
-<div class="input-form">\r
-       <fieldset class="group_form" style="width:43%;float:left;height:18em;min-width:15em;margin-left:2em;"><legend class="group_form"><?php echo _AT('create_new_question'); ?></legend>\r
+       <fieldset class="group_form" style="width:43%;float:left;height:18em;min-width:15em;margin-left:4em;"><legend class="group_form"><?php echo _AT('create_new_question'); ?></legend>\r
                <form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">\r
                        <input type="hidden" name="tid" value="<?php echo $this->tid; ?>" />\r
                        <input type="hidden" name="_course_id" value="<?php echo $this->course_id; ?>" />\r
@@ -21,20 +20,18 @@
                        <?php foreach ($this->questions as $type => $name): ?>\r
                                <option value="<?php echo $type; ?>"><?php echo $name; ?></option>\r
                        <?php endforeach; ?>\r
-                       </select>\r
+                       </select><br /><br />\r
                        <div class="row buttons">\r
                        <input type="submit" name="submit_create" value="<?php echo _AT('create'); ?>" />\r
                        </div>\r
                </form>\r
        </fieldset>\r
 \r
-       <fieldset class="group_form" style="width:43%;float:left;clear:right;height:18em;min-width:18em;"><legend class="group_form"><?php echo _AT('import_question'); ?></legend>\r
+       <fieldset class="group_form" style="width:38%;float:left;clear:right;height:18em;"><legend class="group_form"><?php echo _AT('import_question'); ?></legend>\r
                <form method="post" action="<?php echo 'tests/question_import.php?_course_id='.$this->course_id; ?>" enctype="multipart/form-data" >    <label for="to_file"><?php echo _AT('upload_question'); ?></label><br />\r
-                       <input type="file" name="file" id="to_file" />\r
+                       <input type="file" name="file" id="to_file" /><br /><br />\r
                        <div class="row buttons">\r
                        <input type="submit" name="submit_import" value="<?php echo _AT('import'); ?>" />\r
                        </div>\r
                </form>\r
        </fieldset>\r
-<br style="clear:both;">\r
-</div>\r