Changeset 361 for trunk/app/views/questions

Timestamp:

04/02/08 13:19:24 (8 months ago)

Author:

aarkerio

Message:

Locale and test improvements

Location:

trunk/app/views/questions

Files:

• admin_answers.ctp (modified) (4 diffs)
• admin_edit.ctp (modified) (1 diff)

trunk/app/views/questions/admin_answers.ctp

@@ -1 +1 @@
 <?php
-// die(print_r($data));
-  if ( isset($javascript) ):
-      echo $html->charsetTag('UTF-8');
-      echo $javascript->link('prototype');
-      echo $javascript->link('scriptaculous.js?load=effects');
-  endif;
- 
-  echo $html->addCrumb('Control Tools', '/admin/entries/start');
-  echo $html->addCrumb('Tests', '/admin/tests/listing');
-  echo $html->getCrumbs(' / '); 
+ echo $html->addCrumb('Control Tools', '/admin/entries/start');
+ echo $html->addCrumb('Tests', '/admin/tests/listing');
+ echo $html->getCrumbs(' / '); 
+
+ echo $html->div('title_section', 'Answers to ' . $data['Question']['question']);
 ?>
-
-<div class="title_section">Answers to <?php echo $data['Question']['question']; ?></div>
 
 <div id="loading" style="display: none;">
@@ -25 +18 @@
 
 <?php 
-   echo $ajax->form(null,'post');
-   echo $html->hiddenTag('Answer/question_id', $data['Question']['id']);
+   echo $ajax->form();
+   echo $form->hidden('Answer.question_id', array('value'=>$data['Question']['id']));
  ?>
-<fieldset>
-<legend>New answer</legend>
-
-<div class="required">
-  <?php echo $form->labelTag('Answer/answer', 'Answer:' ); ?>
-  <?php echo $html->input('Answer/answer', array("size" => 55, "maxlength" => 120)); ?>
-  <?php echo $html->tagErrorMsg('Answer/answer', 'Answer is required.'); ?>
-</div>
-<div class="required">
-  <?php echo $form->labelTag('Answer/correct', 'Answer is correct:' ); ?>
-  <?php echo $html->checkbox('Answer/correct', null, array("value" => 1)); ?>
-</div>
-<div>
+<fieldset><legend>New answer</legend>
 <?php
-    echo $ajax->submit('Save', array("url" => "/admin/answers/add",
+ echo $html->div('required',$form->input('Answer.answer', array("size" => 55, "maxlength" => 120))); 
+ echo $html->div('required',$form->label('Answer.correct','Answer is correct:').$form->checkbox('Answer.correct', array("value" => 1))); 
+ echo $ajax->submit('Save', array("url" => "/admin/answers/add",
                                          "update"=>"questions",
                                          "loading" => "Element.hide('questions');Element.hide('addquestion');Element.show('loading')",
@@ -48 +31 @@
             )); 
  ?>
-</div>
 </fieldset>
-
 </div>
 
@@ -58 +39 @@
 {
   $st = ($val["correct"]==1) ? 'Yes' : 'No';      
-    echo '<div style="padding:5px;border:1px dotted gray;margin:4px;">';
-       echo '<div class="butonright">' . $html->link('Delete', '/admin/answers/delete/'.$val['id'].'/'.$val['question_id'])   . '</div>';
-       echo '<div class="butonright">' . $html->link('Edit',   '/admin/answers/edit/'  .$val['id']) . '</div>';
-       echo "Answer: "      . $val["answer"]       . "<br />";
-       echo "Correct: "     . $st                  . "<br />";
-    echo '</div>';
+  $tmp  = $html->div(null, $html->link('Delete', '/admin/answers/delete/'.$val['id'].'/'.$val['question_id']));
+  $tmp .= $html->div(null, $html->link('Edit',   '/admin/answers/edit/'  .$val['id']));
+  $tmp .= "Answer:  "     . $val["answer"]          . "<br />";
+  $tmp .= "Correct: "     . $html->link($st, '/admin/answers/changed/'.$val['id'].'/'.$val['question_id']) . "<br />";
+
+  echo $html->div('adminblock', $tmp);
 }
 ?>

trunk/app/views/questions/admin_edit.ctp

@@ -1 @@
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
-<?php echo $html->addCrumb('Test', '/admin/tests/listing'); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
-
 <?php 
-   echo $html->formTag('/admin/questions/edit','post', array("onsubmit"=>"return validateNew()")); 
-   echo $html->hidden('Question/test_id');
+   echo $html->addCrumb('Control Tools', '/admin/entries/start');
+   echo $html->addCrumb('Test', '/admin/tests/listing'); 
+   echo $html->getCrumbs(' / '); 
+ 
+   echo $form->create('Question', array("onsubmit"=>"return validateNew()")); 
+   echo $form->hidden('Question.id');
+   echo $form->hidden('Question.test_id', array('value'=>$this->data['Question']['test_id']));
 ?>
 <fieldset>
 <legend>Edit question</legend>
-<div class="required">
-  <?php 
-      echo $form->labelTag('Question/question', 'Question:' ); 
-      echo $html->input('Question/question', array("size" => 40, "maxlength" => 120)); 
-      echo $html->tagErrorMsg('Question/question', 'Question is required.'); 
-   ?>
-</div>
+<?php
+ echo $html->div('required',$form->input('Question.question', array("size" => 40, "maxlength" => 120))); 
+  
+ echo $html->div('required',$form->input('Question.hint', array("size" => 40, "maxlength" => 120))); 
+    
+ $tmp  = $form->label('Question.explanation', 'Explanation:'); 
+ $tmp .= $form->textarea('Question.explanation', array("cols" => 50, "rows" => 5)); 
 
-<div class="required">
-  <?php 
-     echo $form->labelTag('Question/hint', 'Hint:' );
-     echo $html->input('Question/hint', array("size" => 40, "maxlength" => 120)); 
-     echo $html->tagErrorMsg('Question/hint', 'Hint is required.'); 
-   ?>
-</div>
+ echo $html->div('required',$tmp);
+ 
+ $t  = $form->label('Question.worth', 'Worth:');
+ $t .= $form->select('Question.worth', array(1,2,3,4,5,6,7,8,9,10), null, null, false, false);
+ echo $html->div('required',$t);
+?>
+</fieldset>
+<?php echo $form->end('Save'); ?> 
 
-<div class="required">
-<?php 
-   echo $form->labelTag('Question/explanation', 'Explanation:' ); 
-   echo $html->textarea('Question/explanation', array("cols" => 50, "rows" => 5)); 
-   echo $html->tagErrorMsg('Question/explanation', 'Description is required.');
-?>
-</div>
-
-<div class="required">
-<?php 
-    echo $form->labelTag( 'Question/status', 'Published:' );
-    $options = array(1,2,3,4,5,6,7,8,9,10);
-    echo $html->selectTag('Question/value', $options, null, null, false, false);
-?>
-</div>
-
-<div>
-    <?php echo $html->submit('Save'); ?> </form>
-</div>
-</fieldset>