Changeset 667

Timestamp:

07/22/08 18:11:54 (3 months ago)

Author:

aarkerio

Message:

Exmans and vclass

Location:

trunk/app

Files:

• controllers/answers_controller.php (modified) (1 diff)
• views/answers/admin_edit.ctp (modified) (1 diff)
• views/elements/login_hide.ctp (modified) (2 diffs)
• views/questions/admin_answers.ctp (modified) (2 diffs)

trunk/app/controllers/answers_controller.php

@@ -47 +47 @@
  public function admin_edit($answer_id = null)
  {  
-    if (empty($this->data["Answer"]))
-    {   
+   $this->layout = 'admin';
+
+   if (empty($this->data["Answer"])):
         $this->data = $this->Answer->read(null, $answer_id );
-    }
-    else
-    {
+   else:
+
        $this->Sanitize = new Sanitize;
         
-       $this->Sanitize->clean($this->data["Answer"]); 
+       $this->Sanitize->clean($this->data['Answer']); 
         
-       if ($this->Answer->save($this->data['Answer']))
-       {
-          $this->msgFlash('Answer updated.','/admin/questions/answers/'.$this->data["Answer"]["question_id"]);
-       }
-    }
+       if ($this->Answer->save($this->data)):
+          $this->msgFlash(__('Answer updated', true),'/admin/questions/answers/'.$this->data['Answer']['question_id']);
+       endif;
+ endif;  
  }  
 

trunk/app/views/answers/admin_edit.ctp

@@ -4 +4 @@
  echo $form->hidden('Answer.question_id', array('value'=>$this->data['Question']['id']));
 ?>
-<fieldset><legend>Edit answer</legend>
+<fieldset><legend><?php __('Edit answer'); ?></legend>
 <?php
- echo $html->div('required',$form->input('Answer.answer', array("size" => 50, "maxlength" => 120))); 
- echo $html->div('required',$form->label('Answer.correct','Answer is correct:').$form->checkbox('Answer.correct')); 
- echo $form->end('Save');
- echo '<fieldset>';
+ echo $html->div('required',$form->input('Answer.answer', array('size'=>50, 'maxlength'=>120, 'label'=>__('Answer', true)))); 
+ echo $html->div('required',$form->label('Answer.correct',__('Answer is correct', true)).$form->checkbox('Answer.correct')); 
+ echo $form->end(__('Save', true));
+ echo '</fieldset>';
 ?>
 

trunk/app/views/elements/login_hide.ctp

@@ -15 +15 @@
 echo  $html->div(null, __('Login', true), array('style'=>'width:250px;float:left;font:bold italic large Palatino'));
 echo  $html->div(null, '', array('style'=>'clear:both;'));
-echo  $form->create('User',array("action"=>"login","onsubmit"=>"return validateLogin()")); 
+echo  $form->create('User', array('action'=>'login')); 
 ?>
 <fieldset>
@@ -27 +27 @@
    echo $form->checkbox("User.cokie", array("value" => 1));
 
-   echo $form->end('Login');
+   echo $form->end(__('Login', true));
    echo '</fieldset>';
 

trunk/app/views/questions/admin_answers.ctp

@@ -27 +27 @@
                                          "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();"
             )); 
  ?>
@@ -50 +50 @@
 <script type="text/javascript"> 
 <!-- 
+function clear()
+{
+ var answer  = document.getElementById('AnswerAnswer');
+ var correct = document.getElementById('AnswerCorrect');
+ 
+ answer.value    = '';
+ correct.checked = false;
+ return true;
+}
 function hU() {