--- db/prgsrc/drupal/modules/chgk_db/templates/chgk_db_tour.tpl.php	2010/03/08 16:19:24	1.1
+++ db/prgsrc/drupal/modules/chgk_db/templates/chgk_db_tour.tpl.php	2010/03/20 17:23:42	1.2
@@ -1,5 +1,15 @@
+<?php if ($tour->hasEditor() &&
+          ($alone || $tour->getEditor() !=$tour->getParentEditor())
+        ) {?>
+<div class='editor'><?php print $tour->getEditorHtml();?></div>
+<?php }?>
+
 <?php
+  if ( $tour->hasInfo() && 
+          ($alone || $tour->getInfo() !=$tour->getParentInfo()) )  {?>
+    <div class='info'><?php print $tour->getInfo();?></div>
+  <?php } 
   foreach ($tour->questions as $question) {
-    print theme('chgk_db_question', $question);
+    print $question->getHtml();
   }