Changeset 758

Timestamp:

09/07/08 13:00:56 (2 months ago)

Author:

aarkerio

Message:

Update models

Location:

trunk/app

Files:

• controllers/messages_controller.php (modified) (1 diff)
• locale/spa/LC_MESSAGES/default.po (modified) (2 diffs)
• views/elements/admin_menu.ctp (modified) (1 diff)
• views/helpers/fpdf.php (modified) (2 diffs)
• views/messages/admin_listing.ctp (modified) (2 diffs)
• views/vclassrooms/admin_export.ctp (modified) (1 diff)

trunk/app/controllers/messages_controller.php

@@ -557 +557 @@
  *  
  */
- public function admin_delete($id=null)
- {
-   //die(debug($this->data['Message']));
-
-   foreach ($this->data['Message'] as $v):
+ public function admin_delete($message_id=null)
+ {
+   if ($this->data['Message']):
+      foreach ($this->data['Message'] as $v):
          if ( $v != 0 ):
                  $this->Message->del($v);
          endif;
-   endforeach;
-
+      endforeach;
+   else:
+      $this->Message->del($message_id);
+   endif;
    $this->msgFlash(__('Data removed', true),'/admin/messages/listing');
  }

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

@@ -11 +11 @@
 msgstr "Ya has encontrado este tesoro"
 
+msgid  "You must select at least one message"
+msgstr "Debes seleccionar al menos un mensaje"
+
 msgid  "Reports"
 msgstr "Reportes"
@@ -439 +442 @@
 msgid  "Data saved"
 msgstr "Datos guardados"
+
+msgid  "Data removed"
+msgstr "Datos eliminados"
 
 msgid  "Categories Forums"

trunk/app/views/elements/admin_menu.ctp

@@ -11 +11 @@
                                                           $html->link(__('Add eCourse', true), '/admin/ecourses/add'),
                                                                   $html->link(__('eClassrooms', true), '/admin/vclassrooms/listing'),
-                                                                  $html->link(__('Forums', true), '/admin/catforums/listing')
+                                                                  $html->link(__('Forums', true), '/admin/catforums/listing'),
+                                                                  $html->link(__('Messages', true), '/admin/messages/listing')
                                                              ),
              $html->link('Webquests', '/admin/webquests/listing'),

trunk/app/views/helpers/fpdf.php

@@ -20 +20 @@
   public function __construct($orientation='P',$unit='mm',$format='Letter') 
   { 
-    $this->pdf = new myFPDF($orientation, $unit, $format);
+    $this->pdf = new myFPDF(null, null, $format);
     $this->pdf->SetFont('Arial','B',10);
   }
@@ -27 +27 @@
   {
     $string  =  utf8_decode($data);  // UTF-8
-    $this->pdf->Cell(0,2,$string,0,1,'L');
+    // Cell(float w [, float h [, string txt [, mixed border [, int ln [, string align [, boolean fill [, mixed link]]]]]]])
+    $this->pdf->Cell(0,3,$string,0,1,'L');
     $this->pdf->Ln(2);
   }

trunk/app/views/messages/admin_listing.ctp

@@ -7 +7 @@
 
 if ( $session->read('Auth.User.group_id') == 1): // if user belongs to admin group
-   echo '<div style="position:absolute;right:300px;top:35px;">';
-   echo $html->link($html->image('admin/message_board.gif', array("alt"=>"General Message", "title"=>"General Message")), '/admin/messages/general', null, false, false);
+   echo '<div style="position:absolute;right:300px;top:75px;">';
+   echo $html->link($html->image('admin/message_board.gif', array('alt'=>'General Message', 'title'=>'General Message')), '/admin/messages/general', null, false, false);
    echo '</div>';
 endif;
@@ -84 +84 @@
         var j = 0;
         for (i = 0; i < document.privmsg_list.length; i++)
-        {
-            if (document.privmsg_list.elements[i].checked == true)
+    {
+        if (document.privmsg_list.elements[i].checked == true)
             {
                 j++;
             }
-        }
+    }
         //alert('Inside '+ j);
         
         if (j == 0 )
         {
-            alert('You must select at least one message');
+            alert('<?php __('You must select at least one message');?>');
             return false;
         }

trunk/app/views/vclassrooms/admin_export.ctp

@@ -45 +45 @@
   endif;
  endforeach;    
-
- echo $fpdf->fpdfOutput('class_report.pdf');    
+ 
+ $vname =  str_replace(' ','_', 'Karamelo_'.$group['Vclassroom']['name'].'_'.date('l jS \of F Y'));
+ echo $fpdf->fpdfOutput($vname.'.pdf');    
 ?>