Changeset 652

Timestamp:

07/15/08 01:53:54 (3 months ago)

Author:

aarkerio

Message:

Messages

Location:

trunk/app

Files:

• controllers/components/portal.php (modified) (3 diffs)
• controllers/messages_controller.php (modified) (2 diffs)
• locale/spa/LC_MESSAGES/default.po (modified) (1 diff)
• models/message.php (modified) (1 diff)
• views/elements/newmessage.ctp (added)
• views/elements/studentclass.ctp (modified) (1 diff)
• views/layouts/portal.ctp (modified) (2 diffs)
• views/messages/admin_listing.ctp (modified) (1 diff)
• views/messages/message.ctp (modified) (2 diffs)
• webroot/img/static/mail.png (added)

trunk/app/controllers/components/portal.php

@@ -15 +15 @@
 App::import('Model', 'User');
 App::import('Model', 'Vclassroom'); 
+App::import('Model', 'Message');
 
 class PortalComponent extends Object {
@@ -32 +33 @@
      $Element['Poll']         = $this->poll();
      $Element['Vclassrooms']  = $this->vclassrooms();
-
+     $Element['Message']     = $this->chkMessage();
      $this->controller->set('Element', $Element);
 
@@ -47 +48 @@
    endif;
  }
-
+ 
+ private function chkMessage()                                                        
+ {                                                                                                                       
+    if ($this->controller->Auth->user()): 
+         $this->Message = new Message;
+         $conditions = array('Message.user_id'=>$this->controller->Auth->user('id'), 'Message.status'=>0);     
+         return $this->Message->field('Message.id', $conditions, 'Message.id DESC');  
+    else:    
+         return false; 
+    endif; 
+ }
+                 
  private function lastEntries() {
    

trunk/app/controllers/messages_controller.php

@@ -80 +80 @@
            $this->data['Message']['username'] = $this->Auth->user('username');
 
-           $user_id = $this->Message->User->field('User.id', array('User.username'=>trim($this->data['Message']['sendern'])));
-           
-           $this->data['Message']['user_id'] = $user_id;
- 
-           //die(debug($this->data['Message']));     
-
-           $this->Message->create();
-           
-           if ( $this->Message->save($this->data['Message']) ):
-                $this->__sendMail($user_id);
-            $this->msgFlash('Message sent', '/messages/listing');
+           if ( $this->Message->save($this->data) ):
+                $this->__sendMail($this->data['Message']['user_id']);
+            $this->msgFlash(__('Message sent', true), '/messages/listing');
            endif;
    endif;
@@ -338 +330 @@
   $this->paginate['limit']      = 20;
   
-  $data = $this->paginate('Entry', $conditions);
+  $data = $this->paginate('Message');
      
   $this->set(compact('data'));

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

@@ -4 +4 @@
 msgid  "View all Lessons"
 msgstr "Todas las lecciones"
+
+msgid  "Your current groups"
+msgstr "Tus grupos"
 
 msgid  "View all podcasts"

trunk/app/models/message.php

@@ -12 +12 @@
     public $belongsTo = 'User';
     
-    public $validate = array(
+    public $validate = array(
       'title' => VALID_NOT_EMPTY,
       'body' => VALID_NOT_EMPTY,
       'user_id' => VALID_NOT_EMPTY,
-      'sender_id' => VALID_NOT_EMPTY
+      'sender' => VALID_NOT_EMPTY
       );
 /*

trunk/app/views/elements/studentclass.ctp

@@ -2 +2 @@
 <form style="font-size:6pt;">
 <select style="font-size:6pt;" onchange="window.location=this.options[this.selectedIndex].value;">
-<option value="#">Your current groups</option>
+<option value="#"><?php __('Your current groups'); ?></option>
 <?php
 foreach ($Element['Vclassrooms'] as $v):

trunk/app/views/layouts/portal.ctp

@@ -33 +33 @@
            echo $html->link(__("cPanel", true), '/admin/entries/start') . ' | ';
    endif;
-
+   
    if (  $session->read('Auth.User.group_id') == 3 ): // the logged user is student
-     echo $html->link(__('My profile', true), '/users/edit'). ' | '.$html->link(
-                                                                        $html->image('static/mailgray.png', 
-                                                                                  array('alt'=>'Messages', 'title'=>'Messages')), 
-                                                                          '/messages/listing', null, null, false) . ' | ';
+     echo $html->link(__('My profile', true), '/users/edit'). ' | ';
 
    endif;
+
+   $img = ($Element['Message'] != false) ?  'static/mail.png' : 'static/mailgray.png';
+   
+   $url = ( $session->read('Auth.User.group_id') > 2 ) ?  '/messages/listing':  '/admin/messages/listing';
+
+   echo $html->link($html->image($img, array('alt'=>'Messages', 'title'=>'Messages')), $url, null, null, false) . ' | ';
 
  else:
@@ -58 +61 @@
 <div id="page">
     <div id="content">
-                       <?php echo $content_for_layout; ?>
+                     <?php echo $content_for_layout; ?>
     </div>
     <!-- end content -->

trunk/app/views/messages/admin_listing.ctp

@@ -63 +63 @@
 </td></tr>
 </table>
+<?php
+$t  = $html->div(null,$paginator->prev('« '.__('Previous', true),null,null,array('class'=>'disabled')),array('style'=>'width:100px;float:left'));
+$t .= $html->div(null,$paginator->next(__('Next', true).' »', null, null, array('class' => 'disabled')),array('style'=>'width:100px;float:right'));
+$t .= $html->div(null,$paginator->counter(), array('style'=>'width:200px;float:center'));
+ echo  $html->div(null,$t, array('style'=>'font-size:9pt;width:400px;margin:15px auto;'));
+?>
 <script language="Javascript" type="text/javascript">
     //

trunk/app/views/messages/message.ctp

@@ -14 +14 @@
 <?php 
   echo $ajax->form();
-  echo $form->hidden('Message.user_id', $blog["User"]["id"]);
+  echo $form->hidden('Message.user_id', array('value'=>$blog['User']['id']));
 ?>
 <fieldset>
@@ -22 +22 @@
         echo $form->error('Message.title', 'Title is required.'); 
         
-        echo $form->textarea('Message.body', array("cols"=>30, "rows"=>35));
+        echo $form->textarea('Message.body', array('cols'=>30, 'rows'=>35));
         echo $fck->load('MessageBody', 'Basic', 350, 150); 
         echo $form->error('Message.body', 'Body is required.'); 
-            echo $ajax->submit('Send', array("url" => "/messages/deliver/", 
+            echo $ajax->submit(__('Send', true), array("url" => "/messages/deliver/", 
                                          "update"=>"updater",
                                          "before" => "MyFCKObject.UpdateEditorFormValue();",