Changeset 666 for trunk/app/views/questions

Timestamp:

07/22/08 17:08:42 (4 months ago)

Author:

aarkerio

Message:

Exmans and vclass

Location:

trunk/app/views/questions

Files:

• admin_answers.ctp (modified) (3 diffs)
• admin_edit.ctp (modified) (1 diff)
• questions.ctp (modified) (2 diffs)

trunk/app/views/questions/admin_answers.ctp

@@ -1 +1 @@
 <?php
 //die(debug($data));
- echo $html->addCrumb('Control Tools', '/admin/entries/start');
- echo $html->addCrumb('Tests', '/admin/tests/listing');
+ echo $html->addCrumb('Control Panel', '/admin/entries/start');
+ echo $html->addCrumb(__('Tests', true), '/admin/tests/listing');
  echo $html->addCrumb($data['Test']['title'], '/admin/tests/questions/'.$data['Test']['id']);
  echo $html->getCrumbs(' / '); 
 
- echo $html->div('title_section', 'Answers to ' . $data['Question']['question']);
+ echo $html->para(null, __('Answers to', true) .': <b>'. $data['Question']['question'].'</b>');
+
+ echo $html->div(null, $html->image('static/loading.gif', array('alt'=>'Loading')), array('id'=>'loading','style'=>'display: none;'));
+
+ echo $html->para(null, $html->link($html->image('actions/new.png',array('alt'=>__('Add new', true),'title'=>__('Add new', true))), '#', array("onclick"=>"hU()"), false, false)); 
+
 ?>
-
-<div id="loading" style="display: none;"> <?php echo $html->image("static/loading.gif", array("alt"=>"Loading")); ?></div>
-
-<?php echo $html->para(null, $html->link($html->image('actions/new.png', array("alt"=>"Add new answer", "title"=>"Add new answer")), '#', array("onclick"=>"hU()"), false, false)); ?>
-
 
 <div id="addquestion" style="display:none">
@@ -20 +20 @@
    echo $form->hidden('Answer.question_id', array('value'=>$data['Question']['id']));
  ?>
-<fieldset><legend>New answer</legend>
+<fieldset><legend><?php __('New answer'); ?></legend>
 <?php
- 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",
+ echo $html->div('required',$form->input('Answer.answer', array('size'=>55, 'maxlength'=>120, 'label'=>__('Answer',true)))); 
+ echo $html->div('required',$form->label('Answer.correct', __('Answer is correct', true)).$form->checkbox('Answer.correct', array('value' => 1))); 
+ echo $ajax->submit(__('Save', true), array("url" => "/admin/answers/add",
                                          "update"=>"questions",
                                          "loading" => "Element.hide('questions');Element.hide('addquestion');Element.show('loading')",
@@ -35 +35 @@
 <div id="questions">
 <?php
-foreach ($data['Answer'] as $val) 
-{
-  $st = ($val['correct']==1) ? 'Yes' : 'No';      
-  $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/change/'.$val['id'].'/'.$val['correct'] .'/'.$val['question_id']) . "<br />";
+foreach ($data['Answer'] as $val):
+
+  $st = ($val['correct']==1) ? __('Yes', true) : 'No';      
+  $tmp  = __('Answer', true) .': ' . $val['answer']   . '<br />';
+  $tmp .= __('Correct', true).': ' . $html->link($st, '/admin/answers/change/'.$val['id'].'/'.$val['correct'] .'/'.$val['question_id']) . "<br /><br />";
+  $tmp .= $html->div(null, $html->link(__('Delete', true), '/admin/answers/delete/'.$val['id'].'/'.$val['question_id']));
+  $tmp .= $html->div(null, $html->link(__('Edit', true),   '/admin/answers/edit/'  .$val['id']));
 
   echo $html->div('adminblock', $tmp);
-}
+endforeach;
 ?>
 </div>

trunk/app/views/questions/admin_edit.ctp

@@ -1 +1 @@
 <?php 
-   echo $html->addCrumb('Control Tools', '/admin/entries/start');
-   echo $html->addCrumb('Test', '/admin/tests/listing'); 
+   echo $html->addCrumb('Control Panel', '/admin/entries/start');
+   echo $html->addCrumb(__('Tests', true), '/admin/tests/listing'); 
    echo $html->getCrumbs(' / '); 
  
-   echo $form->create('Question', array("onsubmit"=>"return validateNew()")); 
+   echo $form->create('Question', array("onsubmit"=>"return chkForm()")); 
    echo $form->hidden('Question.id');
    echo $form->hidden('Question.test_id', array('value'=>$this->data['Question']['test_id']));
 ?>
 <fieldset>
-<legend>Edit question</legend>
+<legend><?php __('Edit question'); ?></legend>
 <?php
- echo $html->div('required',$form->input('Question.question', array("size" => 40, "maxlength" => 120))); 
+ echo $html->div('required',$form->input('Question.question', array('size'=>40, 'maxlength'=> 120, 'label'=>__('Question', true)))); 
   
- echo $html->div('required',$form->input('Question.hint', array("size" => 40, "maxlength" => 120))); 
+ echo $html->div('required',$form->input('Question.hint', array('size' => 40, 'maxlength'=> 120, 'label'=>__('Hint', true)))); 
     
- $tmp  = $form->label('Question.explanation', 'Explanation:'); 
+ $tmp  = $form->label('Question.explanation', __('Explanation', true)); 
  $tmp .= $form->textarea('Question.explanation', array("cols" => 50, "rows" => 5)); 
 
  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);
+ $t  = $form->label('Question.worth', __('Points', true));
+ $t .= $form->select('Question.worth', array(1=>1,2=>2,3=>3,4=>4,5=>5,6=>6,7=>7,8=>8,9=>9,10=>10), null, null, false, false);
  echo $html->div('required',$t);
+
+ echo $form->end(__('Save', true));
 ?>
 </fieldset>
-<?php echo $form->end('Save'); ?> 
 
+

trunk/app/views/questions/questions.ctp

@@ -9 +9 @@
     $answers = count($val['Answer']);
     $i++;
-    echo '<div style="padding:5px;border:1px dotted gray;margin:3px auto;width:70%"><b>' . $i . '.-</b> ';
+    echo '<div style="padding:5px;border:1px dotted gray;margin:3px auto;width:80%"><b>' . $i . '.-</b> ';
     echo $html->div('butonright', $gags->sendEdit($val['Question']['id'],   'Question'));
     echo $html->div('butonright', 
@@ -15 +15 @@
             $form->hidden('Question.id', array('value'=>$val['Question']['id'])).
                     $form->hidden('Question.test_id', array('value'=>$val['Question']['test_id'])).
-                    $form->end('Delete')); 
+                    $form->end(__('Delete', true)));
 
-       echo "<b>Question</b>: "    . $val['Question']['question']       . "<br />";
-       echo "<b>Hint</b>: "        . $val['Question']['hint']           . "<br />";
-       echo "<b>Explanation</b>: " . $val['Question']['explanation']    . "<br />";
-       echo "<b>Worth</b>: "       . $val['Question']['worth']          . "<br /><br />";
-       echo $html->link('View answers ('.$answers.')', '/admin/questions/answers/'.$val['Question']['id']);
+    echo '<b>'. __('Question', true)    .':</b> '. $val['Question']['question']       . '<br /><br />';
+    echo '<b>'. __('Hint', true)        .':</b> '. $val['Question']['hint']           . '<br /><br />';
+    echo '<b>'. __('Explanation', true) .':</b> '. $val['Question']['explanation']    . '<br /><br />';
+    echo '<b>'. __('Points', true)      .':</b> '. $val['Question']['worth']          . '<br /><br />';
+    echo $html->link(__('View answers', true) . ' ('.$answers.')', '/admin/questions/answers/'.$val['Question']['id']);
+
     echo '</div>';
 endforeach;