rearrange category picker

diff --git a/docs/tests/add_test_questions.php b/docs/tests/add_test_questions.php
index a1a93af..75ff109 100644 (file)
--- a/docs/tests/add_test_questions.php
+++ b/docs/tests/add_test_questions.php
@@ -31,10 +31,29 @@ $_pages['tests/add_test_questions.php']['title_var']    = 'add_questions';
 $_pages['tests/add_test_questions.php']['parent']   = 'tests/questions.php?tid='.$_GET['tid'].'&_course_id='.$_course_id;\r
 \r
 require_once(TR_INCLUDE_PATH.'header.inc.php');\r
+require_once(TR_INCLUDE_PATH.'../tests/classes/TestsUtility.class.php');\r
 ?>\r
 \r
 <?php $tid = intval($_GET['tid']); ?>\r
+<div class="input-form">\r
+       <fieldset class="group_form"><legend class="group_form"><?php echo _AT('category'); ?></legend>\r
+       <form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">\r
+               <input type="hidden" name="tid" value="<?php echo $tid; ?>" />\r
+               <input type="hidden" name="_course_id" value="<?php echo $_course_id; ?>" />\r
 \r
+                       <label for="cats"><?php echo _AT('category'); ?></label><br />\r
+                       <select name="category_id" id="cats">\r
+                               <option value="-1"><?php echo _AT('cats_all'); ?></option>\r
+                               <?php TestsUtility::printQuestionCatsInDropDown($_GET['category_id']); ?>\r
+                       </select>\r
+\r
+                       <input type="submit" name="filter" value="<?php echo _AT('filter'); ?>" />\r
+                       <input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>" />\r
+       </form>\r
+\r
+       </fieldset>\r
+\r
+</div>\r
 <?php require_once(TR_INCLUDE_PATH.'../tests/html/tests_questions.inc.php'); ?>\r
 \r
 <?php require_once(TR_INCLUDE_PATH.'footer.inc.php'); ?>
\ No newline at end of file

diff --git a/docs/tests/html/tests_questions.inc.php b/docs/tests/html/tests_questions.inc.php
index fef9fbf..3f2d275 100644 (file)
--- a/docs/tests/html/tests_questions.inc.php
+++ b/docs/tests/html/tests_questions.inc.php
@@ -24,7 +24,7 @@ if (!isset($_GET['category_id'])) {
 require_once(TR_INCLUDE_PATH.'classes/DAO/TestsQuestionsDAO.class.php');\r
 require_once(TR_INCLUDE_PATH.'classes/DAO/TestsQuestionsCategoriesDAO.class.php');\r
 require_once(TR_INCLUDE_PATH.'classes/Utility.class.php');\r
-require_once(TR_INCLUDE_PATH.'../tests/classes/TestsUtility.class.php');\r
+//require_once(TR_INCLUDE_PATH.'../tests/classes/TestsUtility.class.php');\r
 \r
 $testsQuestionsDAO = new TestsQuestionsDAO();\r
 $testsQuestionsCategoriesDAO = new TestsQuestionsCategoriesDAO();\r
@@ -50,27 +50,7 @@ else if (isset($category_row) && $category_row <> '') {
 \r
 $cols = 3;\r
 ?>\r
-<div class="input-form">\r
-       <fieldset class="group_form"><legend class="group_form"><?php echo _AT('category'); ?></legend>\r
-       <form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">\r
-               <input type="hidden" name="tid" value="<?php echo $tid; ?>" />\r
-               <input type="hidden" name="_course_id" value="<?php echo $_course_id; ?>" />\r
-               <div class="row">\r
-                       <label for="cats"><?php echo _AT('category'); ?></label><br />\r
-                       <select name="category_id" id="cats">\r
-                               <option value="-1"><?php echo _AT('cats_all'); ?></option>\r
-                               <?php TestsUtility::printQuestionCatsInDropDown($_GET['category_id']); ?>\r
-                       </select>\r
-               </div>\r
-               <div class="row buttons">\r
-                       <input type="submit" name="filter" value="<?php echo _AT('filter'); ?>" />\r
-                       <input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>" />\r
-               </div>\r
-       </form>\r
-\r
-       </fieldset>\r
 \r
-</div>\r
 <?php if ($tid): ?>\r
        <form method="post" action="tests/add_test_questions_confirm.php?_course_id=<?php echo $_course_id; ?>" name="form">\r
 <?php else: ?>\r