Changeset 733 for trunk/app

Timestamp:

08/21/08 20:27:42 (3 months ago)

Author:

aarkerio

Message:

Little bugs fixed

Location:

trunk/app

Files:

• controllers/reports_controller.php (modified) (1 diff)
• controllers/shares_controller.php (modified) (1 diff)
• locale/spa/LC_MESSAGES/default.po (modified) (2 diffs)
• models/participation.php (modified) (1 diff)
• views/shares/download.ctp (modified) (1 diff)
• views/vclassrooms/admin_record.ctp (modified) (10 diffs)

trunk/app/controllers/reports_controller.php

@@ -129 +129 @@
  }
 
+ public function admin_download($report_id)
+ {             
+  $this->layout    = 'ajax';
+  $conditions      = array('Report.id'=>$report_id);
+  $filename        =  $this->Report->field('filename', $conditions);
+        
+  $this->set('filename', 'files/studentsfiles/'.trim($filename));
+ }
+
  public function admin_show($participation_id) 
  {

trunk/app/controllers/shares_controller.php

@@ -22 +22 @@
  public function download($secret)
  {             
-        $this->pageTitle = 'Share';
+        $this->pageTitle = __('Share file', true);
         $this->layout    = 'ajax';
         $conditions      = array("Share.secret"=>$secret, "Share.public"=>1);

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

@@ -5 +5 @@
 msgstr "Si"
 
+msgid  "Reports"
+msgstr "Reportes"
+
 msgid  "No reports found"
 msgstr "No hay reportes"
@@ -116 +119 @@
 msgstr "Ver detalles"
 
+msgid  "View file"
+msgstr "Ver archivos"
+
+msgid  "Compose message"
+msgstr "Escribir mensaje"
+
 msgid  "About me"
 msgstr "Sobre mi"
+
+msgid  "Participation"
+msgstr "Participación"
+
+msgid  "Report"
+msgstr "Reporte"
 
 msgid  "You already have answered this Webquest"

trunk/app/models/participation.php

@@ -11 +11 @@
     
   public $belongsTo  = array(
-                             "User" => array(
-                                            "className"    => "User",
-                                            "foreignKey"   => "user_id"
+                             'User' => array(
+                                            'className'    => 'User',
+                                            'foreignKey'   => 'user_id'
                                             )
              );
     
-     public $validate = array(
-           'points' => VALID_NOT_EMPTY,
-       'user_id' => VALID_NOT_EMPTY,
-           'forum_id' => VALID_NOT_EMPTY,
-           'vlcassroom_id' => VALID_NOT_EMPTY
-    ); 
-/*
-public $validate = array(
-        'login' => array('alphanumeric' => array(
-                                                 'rule' => 'alphaNumeric',
-                                             'required' => true,
-                                                         'message' => 'Alphabets and numbers only'
-                                   ),
-                                'between' => array(
-                                           'rule' => array('between', 5, 15),
-                                                                               'message' => 'Between 5 to 15 characters'
-                                           )
-                                ),
-                       'password' => array(
-                                   'rule' => array('minLength', '8'),
-                                                               'message' => 'Mimimum 8 characters long'
-                                   ),
-                       'email' => 'email',
-                       'born' => array(
-                               'rule' => 'date',
-                               'message' => 'Enter a valid date',
-                                                           'allowEmpty' => true
-                               )
-                       ); */
+ public $validate = array(
+  'title' => array(
+                    'rule'       => array('minLength', 4),
+                    'message'    => 'Title must be at least four characters long',
+            'allowEmpty' => false,
+                    'required'   => true 
+            ),
+      
+  'participation' => array(
+                    'rule'       => array('minLength', 8),
+                    'message'    => 'Text must be at least 8 characters long',
+            'allowEmpty' => false,
+                    'required'   => true 
+            )
+   );
 }
 ?>

trunk/app/views/shares/download.ctp

@@ -16 +16 @@
     exit;
   }
-
 ?>

trunk/app/views/vclassrooms/admin_record.ctp

@@ -9 +9 @@
  echo $html->div('title_section', $data['User']['name']);
  echo $html->div(null, $html->link($data['User']['email'], $data['User']['email']));
- // send message and send record to student   
+ // send message || send record to student   
  echo $html->para(null, 
                  $ajax->link($html->image('admin/compose_on.gif', array('alt'=>'Compose', 'title'=>'Compose Message')) ,
@@ -27 +27 @@
  echo $ajax->div('compose').$ajax->divEnd('compose'); 
 
- $points = (int) 0; // total points
+ $points = (int) 0; // total points used in the end of script
 
  // Tests
@@ -41 +41 @@
         e($html->div(null, $t['TestsVclassroom']['title'], array('style'=>'width:350px;float:right;')));
       else:
-        e($html->div(null, $t['TestsVclassroom']['points'] .' points',  array('id'=>$div_id, 'style'=>'width:180px;float:left;')));
+        e($html->div(null, $t['TestsVclassroom']['points'] .' '.__('points', true),  array('id'=>$div_id, 'style'=>'width:180px;float:left;')));
         e('<div style="width:450px;float:right;">');
-      echo $html->link($t['TestsVclassroom']['title'], '#', array('title'=>'View test', 'onclick'=>
+      echo $html->link($t['TestsVclassroom']['title'], '#'.$div_id, array('title'=>'View test', 'onclick'=>
         "window.open('/admin/tests/see/".$data['User']['id']."/".$t['TestsVclassroom']['test_id']."/".$data['Vclassroom']['id']."','mywin','left=20,top=10,width=700,height=700,scrollbars=1,toolbar=0,resizable=1')")) . '&nbsp;&nbsp;';
 /*
@@ -65 +65 @@
     endforeach;
  else:
-      echo $html->para(null, 'No tests found');
+      echo $html->para(null, __('No tests found', true));
  endif;
 
@@ -77 +77 @@
      $div_id   = 'w'.$w['Webquest']['id'];
      e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
-     e($html->div(null, $w['ResultWebquest']['points'] .' points',  array('id'=>$div_id, 'style'=>'width:150px;float:left;')));
+     e($html->div(null, $w['ResultWebquest']['points'] .' '.__('points', true),  array('id'=>$div_id, 'style'=>'width:150px;float:left;')));
      e('<div style="width:450px;float:right;">');
-     echo $html->link($w['Webquest']['title'], '#', array('title'=>'View reply', 'onclick'=>
+     echo $html->link($w['Webquest']['title'], '#'.$div_id, array('title'=>__('View reply', true), 'onclick'=>
         "window.open('/admin/webquests/see/".$data['User']['id']."/".$w['Webquest']['id']."','mywin','left=20,top=20,width=700,height=700,toolbar=0,resizable=1')")) . '&nbsp;&nbsp;';
 
-      echo $ajax->link($html->image('static/adownmod.png', array('alt'=>'Points down', 'title'=>'Points down')),
+      echo $ajax->link($html->image('static/adownmod.png', array('alt'=>__('Points down', true), 'title'=>__('Points down', true))),
                            '/admin/webquests/points/'.$w['Webquest']['id'].'/down',
                         array('update'  => $div_id,
@@ -88 +88 @@
                                   'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
                           'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false);
-      echo $ajax->link($html->image('static/aupmod.png', array('alt'=>'Points up', 'title'=>'Points up')),
+      echo $ajax->link($html->image('static/aupmod.png', array('alt'=>__('Points up', true), 'title'=>__('Points up', true))),
                            '/admin/webquests/points/'.$w['Webquest']['id'].'/up',
                         array('update'  => $div_id,
@@ -112 +112 @@
      e($html->div(null, $tr['ResultTreasure']['points'] .' points',  array('id'=>$div_id, 'style'=>'width:150px;float:left;')));
      e('<div style="width:450px;float:right;">');
-     echo $html->link($tr['Treasure']['title'], '#', array('title'=>__('View text', true), 'onclick'=>
+     echo $html->link($tr['Treasure']['title'], '#'.$div_id, array('title'=>__('View text', true), 'onclick'=>
         "window.open('/admin/treasures/see/".$data['User']['id']."/".$tr['Treasure']['id']."','mywin','left=20,top=20,width=700,height=700,toolbar=0,resizable=1')")) . '&nbsp;&nbsp;';
 
@@ -142 +142 @@
       $div_id = 're'.$re['Reply']['id'];
       e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
-      e($html->div(null, $re['Reply']['points'].' points',  array('id'=>$div_id, 'style'=>'width:150px;float:left;')));
+      e($html->div(null, $re['Reply']['points'].' '.__('points', true),  array('id'=>$div_id, 'style'=>'width:150px;float:left;')));
       e('<div style="width:450px;float:right;">');
-      echo $html->link(__('See participation', true), '#', array('title'=>__('See participation', true), 'onclick'=>
+      echo $html->link(__('See participation', true), '#'.$div_id, array('title'=>__('See participation', true), 'onclick'=>
         "window.open('/admin/topics/reply/".$re['Reply']['id']."','mywin','left=20,top=20,width=700,height=700,toolbar=0,resizable=1')")) . '&nbsp;&nbsp;';
 
@@ -180 +180 @@
    $ppoints += $p['Participation']['points'];
   
-   echo $html->div(null, $p['Participation']['points'].' points',  array('id'=>$div_id,'style'=>'width:150px;float:left;'));
+   echo $html->div(null, $p['Participation']['points'].' '.__('points', true), array('id'=>$div_id,'style'=>'width:150px;float:left;'));
 
    echo '<div style="width:450px;float:right;">';    
-   echo __('Participation', true).': '. $html->link($p['Participation']['title'], '#', array('title'=>'View reply', 'onclick'=>"window.open('/admin/participations/show/".$p['Participation']['id']."','mywin','left=20,top=20,width=700,height=700,toolbar=0,resizable=1')")).'  ';
+   echo __('Participation', true).': '. $html->link($p['Participation']['title'], '#', array('title'=>__('View text', true), 'onclick'=>"window.open('/admin/participations/show/".$p['Participation']['id']."','mywin','left=20,top=20,width=700,height=700,toolbar=0,resizable=1')")).'  ';
 
        echo $ajax->link($html->image('static/adownmod.png', array('alt'=>__('Points down', true), 'title'=>__('Points down', true))) ,
@@ -222 +222 @@
 
    echo '<div style="width:450px;float:right;">';    
-   echo __('Report', true).': '. $html->link($r['Report']['description'], '#', array('title'=>__('View reply', true), 'onclick'=>"window.open('/admin/participations/show/".$r['Report']['id']."','mywin','left=20,top=20,width=700,height=700,toolbar=0,resizable=1')")).'  ';
+   echo __('Report', true).': '. $html->link($r['Report']['description'], '#'.$div_id, array('title'=>__('View file', true), 'onclick'=>"window.open('/admin/reports/download/".$r['Report']['id']."','mywin','left=20,top=20,width=700,height=700,toolbar=0,resizable=1')")).'  ';
 
      echo $ajax->link($html->image('static/adownmod.png', array('alt'=>__('Points down', true), 'title'=>__('Points down', true))) ,