Changeset 666

Timestamp:

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

Author:

aarkerio

Message:

Exmans and vclass

Location:

trunk/app

Files:

• controllers/answers_controller.php (modified) (1 diff)
• controllers/questions_controller.php (modified) (4 diffs)
• controllers/tests_controller.php (modified) (3 diffs)
• locale/spa/LC_MESSAGES/default.po (modified) (2 diffs)
• views/answers/questions.ctp (modified) (1 diff)
• views/questions/admin_answers.ctp (modified) (3 diffs)
• views/questions/admin_edit.ctp (modified) (1 diff)
• views/questions/questions.ctp (modified) (2 diffs)
• views/tests/admin_add.ctp (modified) (2 diffs)
• views/tests/admin_edit.ctp (modified) (2 diffs)
• views/tests/admin_listing.ctp (modified) (3 diffs)
• views/tests/admin_questions.ctp (modified) (4 diffs)

trunk/app/controllers/answers_controller.php

@@ -25 +25 @@
  public function admin_add() 
  {
-   if (!empty($this->data["Answer"]))
-   {  
-    //die(print_r($this->data));
+   if (!empty($this->data["Answer"])):  
         
-   $this->Sanitize = new Sanitize;
+     $this->Sanitize = new Sanitize;
         
-   $this->Sanitize->clean($this->data["Answer"]);
+     $this->Sanitize->clean($this->data["Answer"]);
         
-   $this->data["Answer"]['user_id'] = $this->Auth->user('id');
-
-   $this->Answer->create();
+     $this->data["Answer"]['user_id'] = $this->Auth->user('id');
         
-   if ( $this->Answer->save($this->data['Answer']) ) 
-   {
-     $conditions = array("Answer.question_id" => $this->data['Answer']['question_id']);
-     $fields     = array("Answer.id", "Answer.answer", "Answer.correct", "Answer.question_id");
-     $order      = "Answer.id";
-                    
-     $this->set('data', $this->Answer->findAll($conditions, $fields, $order));
-                    
-     $this->render('questions', 'ajax');
-   }
-   else
-   {
+     if ( $this->Answer->save($this->data) ):
+         $conditions = array("Answer.question_id" => $this->data['Answer']['question_id']);
+         $fields     = array("Answer.id", "Answer.answer", "Answer.correct", "Answer.question_id");
+         $order      = "Answer.id";           
+         $this->set('data', $this->Answer->findAll($conditions, $fields, $order));
+         $this->render('questions', 'ajax');
+   else:
      echo "Ajax error, check with the company's computer guy...";
-   }
-  }
+   endif;
+  endif;
  }
 

trunk/app/controllers/questions_controller.php

@@ -5 +5 @@
 *  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
-//File: /app/controllers/quotes_controller.php
+//File: /app/controllers/questions_controller.php
 
 uses('Sanitize');
@@ -29 +29 @@
         
     $this->data["Question"]['user_id'] = $this->Auth->user('id');
-
-    $this->Question->create();
         
-    if ( $this->Question->save( $this->data['Question'] ) ):
+    if ( $this->Question->save( $this->data ) ):
       $conditions = array('Question.test_id' => $this->data['Question']['test_id']);
       $fields     = array('Question.id','Question.question','Question.hint','Question.worth','Question.explanation','Question.test_id');
@@ -50 +48 @@
  {
     $this->layout = 'admin';
-    // adds new vote to database
-    if ( !empty($this->data["Question"]) )
-    {         
-        $this->Sanitize = new Sanitize;
+   
+    if ( !empty($this->data["Question"]) ):         
+         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->clean($this->data["Question"]);
+         $this->Sanitize->clean($this->data["Question"]);
                 
-         if ( $this->Question->save( $this->data['Question'] ) ) 
-         {
-              $this->msgFlash('Question saved', '/admin/tests/questions/'.$this->data['Question']['test_id']);
-         }
-         else
-         {
-                echo "Ajax error, check with the company's computer guy...";
-         }
-     }
-     else
-     {  
+     if ( $this->Question->save( $this->data ) ): 
+             $this->msgFlash(__('Question saved', true), '/admin/tests/questions/'.$this->data['Question']['test_id']);
+     else:
+             echo "Ajax error, check with the company's computer guy...";
+     endif;
+     else:  
         $this->data = $this->Question->read(null, $question_id);
-     }
+     endif;
   }
   
@@ -76 +68 @@
         $this->layout    = 'admin';
         
-        $this->pageTitle = 'Questions';
+        $this->pageTitle = __('Questions', true);
         
         $conditions = array("Question.user_id"=>$this->Auth->user('id'));

trunk/app/controllers/tests_controller.php

@@ -29 +29 @@
         $this->Auth->allow(array('view', 'display', 'result'));
    endif;
-   // L10n
-   $this->L10n = new L10n();
-   $this->L10n->get("en");
- 
-   Configure::write('Config.language', "en");
  }
 
  public function display($username, $user_id)
  {
-    $this->pageTitle = 'Exams';
+    $this->pageTitle = __('Tests', true);
           
     $this->layout    = $this->Edublog->layout($user_id);
@@ -53 +48 @@
     $user_id = $this->Test->field('Test.user_id', array("Test.id"=>$test_id));
     
-    $this->pageTitle = 'Exam';
+    $this->pageTitle = __('Test', true);
     
     $this->layout    = $this->Edublog->layout($user_id);
@@ -189 +184 @@
    $this->layout    = 'admin';
         
-   $this->pageTitle = 'Tests';
+   $this->pageTitle = __('Tests', true);
         
    $conditions = array('Test.user_id'=>$this->Auth->user('id'));

trunk/app/locale/spa/LC_MESSAGES/default.po

@@ -17 +17 @@
 msgstr "Todos los FAQs"
 
+msgid  "Hint"
+msgstr "Pista"
+
+msgid  "Explanation"
+msgstr "Explicación"
+
+msgid  "Question"
+msgstr "Pregunta"
+
+msgid  "Questions"
+msgstr "Preguntas"
+
+msgid  "This test had been assigned to class"
+msgstr "Este examen ha sido asignado a la clase"
+
+msgid  "Tests"
+msgstr "Exámenes"
+
+msgid  "Test"
+msgstr "Examen"
+
+msgid  "questions"
+msgstr "preguntas"
+
+msgid  "View answers"
+msgstr "Ver respuestas"
+
+msgid  "Add new question"
+msgstr "Agregar nueva pregunta"
+
+msgid  "Answer"
+msgstr "Respuesta"
+
+msgid  "New answer"
+msgstr "Nueva respuesta"
+
+msgid  "Correct"
+msgstr "Correcta"
+
+msgid  "Answer is correct"
+msgstr "Esta respuesta es correcta"
+
+msgid  "Answers to"
+msgstr "Respuestas para"
+
 msgid  "Next"
 msgstr "Siguiente"
@@ -163 +208 @@
 msgid  "Save"
 msgstr "Guardar"
+
+msgid  "Description"
+msgstr "Descripción"
+
+msgid  "Points"
+msgstr "Puntos"
+
+msgid  "New question"
+msgstr "Nueva pregunta"
+
+msgid  "Edit question"
+msgstr "Editar pregunta"
 
 msgid  "File"

trunk/app/views/answers/questions.ctp

@@ -2 +2 @@
 // die( debug( $data ));
 foreach ($data as $val):
-
-  $st   = ($val['Answer']['correct']==1) ? 'Yes' : 'No';      
-  $tmp  = $html->div(null, $html->link('Delete', '/admin/answers/delete/'.$val['Answer']['id'].'/'.$val['Answer']['question_id']));
-  $tmp .= $html->div(null, $html->link('Edit',   '/admin/answers/edit/'  .$val['Answer']['id']));
-  $tmp .= "Answer:  "     .    $val['Answer']['answer']       . "<br />";
+  $st   = ($val['Answer']['correct']==1) ? __('Yes', true) : 'No';
+  $tmp  = __('Answer', true) . ':  '  .    $val['Answer']['answer']       . "<br />";
   $url  = '/admin/answers/change/'.$val['Answer']['id'].'/'.$val['Answer']['correct'].'/'.$val['Answer']['question_id'];
-  $tmp .= "Correct: "     . $html->link($st, $url) . "<br />";
+  $tmp .= __('Correct', true). ': '. $html->link($st, $url) . '<br /><br />';
+  $tmp .= $html->div(null,$html->link(__('Delete', true),'/admin/answers/delete/'.$val['Answer']['id'].'/'.$val['Answer']['question_id']));
+  $tmp .= $html->div(null, $html->link(__('Edit', true),   '/admin/answers/edit/'.$val['Answer']['id']));
 
   echo $html->div('adminblock', $tmp);

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;

trunk/app/views/tests/admin_add.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 $form->create('Test', array('onsubmit'=>'return chkData()')); ?>
+<?php 
+ echo $html->addCrumb('Control Panel', '/admin/entries/start');  
+ echo $html->addCrumb(__('Tests', true), '/admin/tests/listing'); 
+ echo $html->getCrumbs(' / '); 
+ echo $form->create('Test', array('onsubmit'=>'return chkData()')); 
+?>
 <fieldset>
-<legend>New test</legend>
+<legend><?php __('New test');?></legend>
 <div class="required">
   <?php 
-     echo $form->input('Test.title', array("size" => 40, "maxlength" => 120)); 
+     echo $form->input('Test.title', array('size' => 40, 'maxlength' => 120, 'label'=>__('Title', true))); 
      echo $form->error('Test.title', 'Title is required.');
  ?>
 </div>
-
 <div class="required">
 <?php 
-   echo $form->label('Test.description', 'Description:' ); 
-   echo $form->textarea('Test.description', array("cols" => 50, "rows" => 5)); 
+   echo $form->label('Test.description', __('Description', true)); 
+   echo $form->textarea('Test.description', array('cols' => 50, 'rows' => 5)); 
    echo $form->error('Test.description', 'Description is required.');
 ?>
@@ -23 +23 @@
 <div class="required">
 <?php 
-      echo $form->label( 'Test.status', 'Published:' );
+      echo $form->label( 'Test.status', __('Published',true) );
       echo $form->checkbox('Test.status', null, array("value"=>1)); 
 ?>
 </div>
 
-<?php echo $form->end('Save'); ?>
+<?php echo $form->end(__('Save', true)); ?>
 </fieldset>

trunk/app/views/tests/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(__('Test', true), '/admin/tests/listing'); 
  echo $html->getCrumbs(' / '); 
  
@@ -10 +10 @@
 <legend>Edit test</legend>
 <?php 
- echo $html->div('required', $form->input('Test.title', array("size" => 40, "maxlength" => 120))); 
-   
- echo $html->div('required', $form->label('Test.description', 'Description:') . $form->textarea('Test.description', array("cols" => 50, "rows" => 15))); 
+ echo $html->div('required', $form->input('Test.title', array('size'=> 40,'maxlength' => 120, ''=>__('Title'. true))));   
+ echo $html->div('required', $form->label('Test.description', __('Description', true)) . $form->textarea('Test.description', array("cols" => 50, "rows" => 15))); 
    
  echo $html->div('required', $form->label('Test.status', 'Published:' ) . $form->checkbox('Test.status', array('value'=>1)));
  
- echo $form->end('Save'); 
+ echo $form->end(__('Save', true)); 
 ?> 
 </fieldset>

trunk/app/views/tests/admin_listing.ctp

@@ -2 +2 @@
 //die( debug( $data ));
 
-echo $html->div('title_section', 'Tests');
+echo $html->div('title_section', __('Tests', true));
 
 echo $html->para(null, 
@@ -11 +11 @@
 
 foreach ($data as $val):
-  $s  =  ($val['Test']['status'] == 1) ? 'Published': 'Draft';
+  $s  =  ($val['Test']['status'] == 1) ? __('Published', true) : __('Draft', true);
 
   echo '<div class="grayblock">';
     echo $html->div('butonright', $gags->sendEdit($val['Test']['id'], 'tests'));
     echo $html->div('div_title', $val['Test']['title']);
-    echo $html->para(null, '<b>Test description:</b> '.$val['Test']['description']);
+    echo $html->para(null, '<b>'.__('Description', true).':</b> '.$val['Test']['description']);
 
-    echo $html->link('Questions', '/admin/tests/questions/'.$val['Test']['id']);
-    echo $html->link($html->image('admin/questions_icon.gif', array('alt'=>'Questions', 'title'=>'Questions')), 
+    echo $html->link(__('Questions', true), '/admin/tests/questions/'.$val['Test']['id']);
+    echo $html->link($html->image('admin/questions_icon.gif', array('alt'=>__('Questions', true), 'title'=>__('Questions', true))), 
                           '/admin/tests/questions/'.$val['Test']['id'], null, null, false) . '<br />';
     if ( count($val['Vclassroom']) < 1 ):
@@ -42 +42 @@
 
            foreach($val['Vclassroom'] as $class):
-               echo $html->para(null, 'This test had been assigned to class: '. 
+               echo $html->para(null, __('This test had been assigned to class', true). ': '. 
                                 $html->link($class['name'], '/admin/vclassrooms/members/'.$class['id']) . '</b>');
            endforeach;

trunk/app/views/tests/admin_questions.ctp

@@ -1 +1 @@
 <?php 
-  echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
-  echo $html->addCrumb('Tests', '/admin/tests/listing'); 
-  echo $html->getCrumbs(' / '); 
+ echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
+ echo $html->addCrumb(__('Tests', true), '/admin/tests/listing'); 
+ echo $html->getCrumbs(' / '); 
 
-  echo $html->div('title_section', 'Tests');
-?>
-<div id="loading" style="display: none;">
-        <?php echo $html->image("static/loading.gif", array("alt"=>"Loading")); ?>
-</div>
-<?php
+ echo $html->div('title_section', __('Test', true));
+
+ echo $html->div(null,$html->image('static/loading.gif', array("alt"=>"Loading")), array('id'=>'loading', 'style'=>'display: none;'));
+
  echo $html->para(null, $html->link('Edit', '/admin/tests/edit/'.$data['Test']['id']).'&nbsp;&nbsp;'.$html->link('Assign to class', '/admin/tests/vclassrooms/'.$data['Test']['id']));
 
- echo '<b>Description:</b> '. $data['Test']['title'] . "  " . $data['Test']['description'];
- echo "  ". count($data["Question"]) . " questions";
+ echo '<b>'.__('Title',true).'</b> ' . $data['Test']['title'] . '<br />';
+ echo '<b>'.__('Description',true).'</b> ' . $data['Test']['description'];
 
- echo $html->para(null, $html->link($html->image('actions/new.png', array("alt"=>"Add new question", "title"=>"Add new question")), '#', array("onclick"=>"hU()"), false, false)); 
+ echo '  '. count($data["Question"]) .' '. __('questions', true);
+
+ echo $html->para(null, $html->link($html->image('actions/new.png', array('alt'=>__('Add new question', true),'title'=>__('Add new question', true))), '#', array("onclick"=>"hU()"), false, false)); 
 ?>
-
 <!-- Ajax form beggin -->
 <div id="addquestion" style="display:none">
@@ -25 +24 @@
 ?>
 <fieldset>
-<legend>New question</legend>
+<legend><?php __('New question'); ?></legend>
 <?php
- echo $html->div('required', $form->input('Question.question', array("size" => 60, "maxlength" => 120))); 
- echo $html->div('required', $form->input('Question.hint', array("size" => 40, "maxlength" => 120))); 
- echo $html->div('required', $form->label('Question.explanation', 'Explanation:') . $form->textarea('Question.explanation', array("cols" => 50, "rows" => 5))); 
+ echo $html->div('required', $form->input('Question.question', array('size' => 60, 'maxlength' => 120, 'label'=>__('Question',true)))); 
+ echo $html->div('required', $form->input('Question.hint', array('size'=> 40,'maxlength' => 120, 'label'=>__('Hint',true)))); 
+ echo $html->div('required', $form->label('Question.explanation', __('Explanation', true)) . $form->textarea('Question.explanation', array("cols" => 50, "rows" => 5))); 
 
- $tmp  = $form->label('Question.worth', 'Worth:');
- $tmp .=  $form->select('Question.worth',  array(1, 2, 3, 4, 5, 6,7, 8, 9, 10), null, null, false, false); 
+ $tmp  = $form->label('Question.worth', __('Points', true));
+ $tmp .=  $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', $tmp);
 
- echo $ajax->submit('Add', array("url" => "/admin/questions/add",
+ echo $ajax->submit(__('Save',true), array("url" => "/admin/questions/add",
                                          "update"=>"questions",
                                          "loading" => "Element.hide('questions');Element.hide('addquestion');Element.show('loading')",
-                                         "complete" => "Element.hide('loading');Effect.Appear('questions')"
+                                         "complete" => "Element.hide('loading');Effect.Appear('questions');clear();"
             )); 
  ?>
-</div>
 </fieldset>
 </form>
 </div>
 <!-- Ajax form ends -->
+
 <?php
 if ( count($data["Question"]) > 0):
-   echo $html->div('title_section', 'Questions');
+   echo $html->div('title_section',  __('Questions', true));
 endif;
 
@@ -59 +58 @@
     $answers = count($val['Answer']);
     $i++;
-    echo '<div style="padding:5px;border:1px dotted gray;margin:auto;width:60%"><b>' . $i . '.-</b> ';
+    echo '<div style="padding:5px;border:1px dotted gray;margin:5px auto;width:80%"><b>' . $i . '.-</b> ';
     echo $html->div('butonright', $gags->sendEdit($val['id'],   'Question'));
     echo $html->div('butonright', 
                     $form->create('Question', array('action'=>'delete', 'onsubmit'=>'return confirm("are you sure?")')).
-            $form->hidden('Question.id', array('value'=>$val['id'])).$form->hidden('Question.test_id', array('value'=>$val['test_id'])).$form->end('Delete'));
+            $form->hidden('Question.id', array('value'=>$val['id'])).$form->hidden('Question.test_id', array('value'=>$val['test_id'])).$form->end(__('Delete', true)));