Changeset 741 for trunk/app/views

Timestamp:

08/27/08 20:16:13 (3 months ago)

Author:

aarkerio

Message:

Little Bugs fixed

Location:

trunk/app/views

Files:

• reports/admin_points.ctp (added)
• vclassrooms/admin_record.ctp (modified) (3 diffs)
• webquests/admin_points.ctp (added)

trunk/app/views/vclassrooms/admin_record.ctp

@@ -1 +1 @@
 <?php
- //die(debug($data));
+ // die(debug($data));
  echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
  echo $html->addCrumb(__('Groups', true), '/admin/vclassrooms/listing');
@@ -79 +79 @@
      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'], '#'.$div_id, array('title'=>__('View reply', true), 'onclick'=>
+     echo $html->link($w['Webquest']['title'], '#'.$div_id, array('title'=>__('View text', 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', true), 'title'=>__('Points down', true))),
-                           '/admin/webquests/points/'.$w['Webquest']['id'].'/down',
-                        array('update'  => $div_id,
-                              'loading '=>"Element.show('loadingre');",
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false);
+                           '/admin/webquests/points/'.$w['ResultWebquest']['id'].'/down',
+                        array('update'  => $div_id,
+                              'loading' =>"Element.show('loadingweb');",
+                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
+                          'complete'=>"Element.hide('loadingweb');Effect.Appear(".$div_id.")"),null,false);
       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,
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                              'loading '=>"Element.show('loadingre')",
-                          'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false);
+                           '/admin/webquests/points/'.$w['ResultWebquest']['id'].'/up',
+                        array('update'  => $div_id,
+                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
+                              'loading' =>"Element.show('loadingweb')",
+                          'complete'=>"Element.hide('loadingweb');Effect.Appear(".$div_id.")"),null,false);
       e('</div>');  
-      e('</div>');
- 
-       endforeach;
+    e('</div>');
+ 
+    endforeach;
+ echo $ajax->div('loadingweb',array('style'=>'display:none')).$html->image('static/loading.gif',array('alt'=>'Loading')).$ajax->divEnd('loadingweb');
  else:
     echo  $html->para(null, __('No Webquests found', true));
@@ -118 +119 @@
                            '/admin/treasures/points/'.$tr['Treasure']['id'].'/down',
                         array('update'  => $div_id,
-                              'loading '=>"Element.show('loadingre');",
-                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                          'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false);
+                              'loading '=>"Element.show('loadtre');",
+                                  'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
+                          'complete'=>"Element.hide('loadtre');Effect.Appear(".$div_id.")"),null,false);
      echo $ajax->link($html->image('static/aupmod.png', array('alt'=>__('Points up', true), 'title'=>__('Points up', true))),
                            '/admin/treasures/points/'.$tr['Treasure']['id'].'/up',
                         array('update'  => $div_id,
                                   'after'   =>'tp('.$data['User']['id'].','.$data['Vclassroom']['id'].')',
-                              'loading '=>"Element.show('loadingre')",
-                          'complete'=>"Element.hide('loadingre');Effect.Appear(".$div_id.")"),null,false);
+                              'loading '=>"Element.show('loadtre')",
+                          'complete'=>"Element.hide('loadtre');Effect.Appear(".$div_id.")"),null,false);
       e('</div>');  
       e('</div>');
  
      endforeach;
+ echo $ajax->div('loadtre',array('style'=>'display:none')).$html->image('static/loading.gif',array('alt'=>'Loading')).$ajax->divEnd('loadtre');
  else:
      echo $html->para(null, __('No Scavenger hunts found', true));