Changeset 773 for trunk/app/views

Timestamp:

09/22/08 23:22:18 (2 months ago)

Author:

aarkerio

Message:

Test Unit fixed

Location:

trunk/app/views

Files:

• messages/display.ctp (modified) (3 diffs)
• vclassrooms/chat.ctp (modified) (3 diffs)
• vclassrooms/show.ctp (modified) (1 diff)

trunk/app/views/messages/display.ctp

@@ -3 +3 @@
  echo $html->para(null, $html->link($html->image('admin/compose_on.gif', array('alt'=>'New message','title'=>'New message')), 
 '/messages/compose', null, false, false));
-?>
-<div id="charging" style="display:none;"><?php echo $html->image('static/loading.gif', array("alt"=>"Loading")); ?></div>
-<?php
+
+echo $html->div(null,$html->image('static/loading.gif',array('alt'=>'Loading')),array('id'=>'charging','style'=>'display:none;'));
 
 echo '<b>From</b>:'     . $data['User']['username']  . '<br />';
@@ -13 +12 @@
 echo '<input type="button" value="'.__('Reply', true).'" onclick="hU()" />';
 
-echo $ajax->div("delbutton", array("style"=>"text-align:right"));
-   echo $form->create('Message', array('onsubmit'=>'return confirm(\'Are you sure to delete?\')','action'=>'delete'));
+echo $ajax->div('delbutton', array('style'=>'text-align:right'));
+   echo $form->create('Message', array('onsubmit'=>'return confirm(\''.__('Are you sure to want to delete this?', true).'\')','action'=>'delete'));
    echo $form->hidden('Message.id', array('value'=>$data['Message']['id']));
    echo $form->end(__('Delete', true));
-echo $ajax->divEnd("delbutton");
+echo $ajax->divEnd('delbutton');
 ?>
 
@@ -31 +30 @@
 ?>
 <fieldset>
-<legend>Reply</legend>
+<legend><?php __('Reply'); ?></legend>
   <?php 
   echo $session->read('Auth.User.username') . "  writes: <br />";
  
-  echo $form->input('Message.title', array("size" => 35, "maxlength" => 50, "value"=> 'Re: ' . $data["Message"]["title"])) . "<br />";
+  echo $form->input('Message.title', array('size'=>35,'maxlength'=>50,'value'=> 'Re: ' . $data['Message']['title'])) . "<br />";
   echo $form->label('Message.body', 'Message:').'<br />';
-  echo $form->textarea('Message.body', array("cols"=>50, "rows"=>10, "value"=>"\n\n".'>> '.$data["User"]["username"] .' wrote: ' . $data["Message"]["body"]));
-  echo $ajax->submit(__('Reply', true), array("url" => "/messages/add", 
+  echo $form->textarea('Message.body', array('cols'=>50,'rows'=>10,'value'=>"\n\n".'>> '.$data['User']['username'] .' wrote: ' . $data["Message"]["body"]));
+  echo $ajax->submit(__('Reply', true), array('url' => '/messages/add', 
                                          "update"=>"formhidden",
                                           "before" => "MyFCKObject.UpdateEditorFormValue();",

trunk/app/views/vclassrooms/chat.ctp

@@ -30 +30 @@
 //<![CDATA[
 
-setTimeout("getChatText(<?php echo $data['Vclassroom']['id']; ?>);",2000);
+setTimeout("getChatText(<?php echo $data['Vclassroom']['id']; ?>);",3000);
 
 // Get student total points 
@@ -43 +43 @@
                              {method: 'get', parameters: params, onFailure: reportError});
 
+ setTimeout("getChatText("+vclassroom_id+")",4000);
+}
+
+function reportError(request)
+{
+  alert('Sorry. There was an error.');
 }
 
@@ -52 +58 @@
 }
 
-function ping() {
+function ping() 
+{
   // Send ping, to let the server know I'm still here
   var url = base_url + 'ping.php';

trunk/app/views/vclassrooms/show.ctp

@@ -19 +19 @@
    $t="javascript:window.open('/vclassrooms/chat/".$blog['User']['id']."/".$data['Vclassroom']['id']."', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=400')"; 
       echo $html->link(
-         $html->image('static/feature_chatroom.jpg', array('alt'=>'Chatroom','title'=>'Chatroom','style'=>'margin-right:12px')
+         $html->image('static/chat-icon.jpg', array('alt'=>'Chatroom','title'=>'Chatroom','style'=>'margin-right:12px')
      ), '#', array("onclick"=>$t), null, null, false);