Changeset 731 for trunk

Timestamp:

08/21/08 16:28:02 (3 months ago)

Author:

aarkerio

Message:

Little bugs fixed

Location:

trunk/app

Files:

• config/core.php (modified) (1 diff)
• locale/spa/LC_MESSAGES/default.po (modified) (1 diff)
• models/vclassroom.php (modified) (2 diffs)
• views/vclassrooms/admin_record.ctp (modified) (6 diffs)

trunk/app/config/core.php

@@ -14 +14 @@
  * In development mode, you need to click the flash message to continue.
  */
-    Configure::write('debug', 1);
+      Configure::write('debug', 1);
 /**
  * Application wide charset encoding
  */
-    Configure::write('App.encoding', 'UTF-8');
+      Configure::write('App.encoding', 'UTF-8');
 /**
  * To configure CakePHP *not* to use mod_rewrite and to

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

@@ -4 +4 @@
 msgid  "Yes"
 msgstr "Si"
+
+msgid  "See participation"
+msgstr "Ver participación"
 
 msgid  "Points up"

trunk/app/models/vclassroom.php

@@ -6 +6 @@
 *  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
+
 class Vclassroom extends AppModel
 {
@@ -130 +131 @@
  public function studentRecord($user_id, $vclassroom_id)
  {
-  try {   
+  try 
+  {   
      $record                  = array();
    

trunk/app/views/vclassrooms/admin_record.ctp

@@ -147 +147 @@
       e($html->div(null, $re['Reply']['points'].' points',  array('id'=>$div_id, 'style'=>'width:150px;float:left;')));
       e('<div style="width:450px;float:right;">');
-      echo $html->link('See reply', '#', array('title'=>'View reply', 'onclick'=>
+      echo $html->link(__('See participation', true), '#', 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;';
 
-      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/replies/points/'.$re['Reply']['id'].'/down',
                         array('update'  => $div_id,
@@ -156 +156 @@
                                   '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/replies/points/'.$re['Reply']['id'].'/up',
                         array('update'  => $div_id,
@@ -175 +175 @@
  $ppoints = (int) 0;  // participation points 
  if ( count($data['participations']) > 0 ):
-   echo '<h1>Participations</h1>';
+   echo '<h1>'.__('Participations', true).'</h1>';
    foreach ($data['participations'] as $p):
    e('<div style="border:1px dotted gray;padding:4px;margin:2px;height:20px;">');
@@ -186 +186 @@
 
    echo '<div style="width:450px;float:right;">';    
-   echo 'Participation: '. $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 $ajax->link($html->image('static/adownmod.png', array('alt'=>'Points down', 'title'=>'Points down')) ,
+   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 $ajax->link($html->image('static/adownmod.png', array('alt'=>__('Points down', true), 'title'=>__('Points down', true))) ,
                            '/admin/participations/points/'.$p['Participation']['id'].'/down',
                         array('update'     => $div_id,
@@ -194 +194 @@
                                   'interactive'=>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
                           'complete'   =>"Element.hide('loadingpa');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/participations/points/'.$p['Participation']['id'].'/up',
                         array('update'     => $div_id,
@@ -204 +204 @@
     e('</div>');
     endforeach;
-      e('<div id="loadingpa" style="display:none">'); 
-                  echo $html->image('static/loading.gif', array('alt'=>'Loading'));
-      e('</div>');
+    e($html->div(null, $html->image('static/loading.gif', array('alt'=>'Loading'), array('id'=>'loadingpa', 'style'=>'display:none'))));
       
  else:
-    echo  $html->para(null, 'No participation found');
- endif;
-
- echo  $html->div(null, 'Treasure points: '      . $tpoints);
- echo  $html->div(null, 'Webquests points: '  . $wpoints);
- echo  $html->div(null, 'Participation points: ' . $ppoints, array('id'=>'parpoints'));
+    echo  $html->para(null, __('No participation found', true));
+ endif;
+
+ echo  $html->div(null, __('Scavengers hunts', true) .' ' .__('points', true) .': '. $tpoints);
+ echo  $html->div(null, 'Webquests ' .__('points', true) .': '. $wpoints);
+ echo  $html->div(null, __('Participations', true) .' '. __('points', true) .': '. $ppoints, array('id'=>'parpoints'));
  
  $points = ($tpoints + $wpoints + $rpoints + $ppoints);
  
- echo  $ajax->div('totalpoints') . '<b>Total points: ' . $points .'</b>'. $ajax->divEnd('totalpoints');
-
+ echo  $ajax->div('totalpoints') . '<b>'.__('Total points', true).': ' . $points .'</b>'. $ajax->divEnd('totalpoints');
 ?>
 </div>