Changeset 728 for trunk/app/views

Timestamp:

08/19/08 19:50:28 (3 months ago)

Author:

aarkerio

Message:

Little changes

Location:

trunk/app/views

Files:

• treasures/admin_vclassrooms.ctp (modified) (2 diffs)
• vclassrooms/admin_members.ctp (modified) (2 diffs)
• vclassrooms/admin_record.ctp (modified) (2 diffs)
• vclassrooms/show.ctp (modified) (3 diffs)
• webquests/admin_vclassrooms.ctp (modified) (3 diffs)

trunk/app/views/treasures/admin_vclassrooms.ctp

@@ -1 +1 @@
 <?php
- echo $html->addCrumb('Control Panel', '/admin/entries/start');
- echo $html->addCrumb(__('Scavangers hunts', true), '/admin/treasures/listing');
- echo $html->getCrumbs(' / ');
- //die( debug( $data ) );
-
+echo $html->addCrumb('Control Panel', '/admin/entries/start');
+echo $html->addCrumb(__('Scavengers hunts', true), '/admin/treasures/listing');
+echo $html->getCrumbs(' / ');
+//die( debug( $data ) );
+ 
 $vclasses = array();   // contains vclassroom already linked to this treasure
 
@@ -21 +21 @@
     $tmp .= $form->end(__('Assign this Treasure', true));
    else:
-    $tmp = $html->para(null, $html->image('admin/unlink.gif').'This test is already assigned to  <b>'.$val['Vclassroom']['name'].'</b>');
+    $tmp = $html->para(null, $html->image('admin/unlink.gif').' '.__('This scavenger is already assigned to', true).'  <b>'.$val['Vclassroom']['name'].'</b>');
        
     foreach ( $treasures as $wq):

trunk/app/views/vclassrooms/admin_members.ctp

@@ -57 +57 @@
 
 if ( count($data['User']) < 1 ):
-    e($html->div('divblock', 'There are no students in this classrroom yet'));
+    e($html->div('divblock', __('There are no students in this classrroom yet', true)));
 endif;
 
@@ -64 +64 @@
 //die(print_r($data));
  
-$th = array ('Name', 'Username', 'Email', 'Send Message', 'Unlink', 'Record');
+$th = array (__('Name', true), 'Username', 'Email',__('Send message', true), __('Unlink', true), 'Record');
 
 echo $html->tableHeaders($th); 

trunk/app/views/vclassrooms/admin_record.ctp

@@ -1 +1 @@
 <?php
-//die(debug($data));
-
- echo $html->addCrumb('Control Panel', '/admin/entries/start');  
- echo $html->addCrumb(__('vGroups', true), '/admin/vclassrooms/listing'); 
+ //die(debug($data));
+
+ echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
+ echo $html->addCrumb(__('Groups', true), '/admin/vclassrooms/listing');
+ echo $html->addCrumb($data['Vclassroom']['name'], '/admin/vclassrooms/members/'.$data['Vclassroom']['id']);  
  echo $html->getCrumbs(' / ');
 
@@ -39 +40 @@
 
       if ($t['TestsVclassroom']['points'] === null):  // not answered yet
-        e($html->div(null, __('Not answered this test yet', true),  array('id'=>$div_id, 'style'=>'width:180px;float:left;font-size:8pt;')));
-        e($html->div(null, $t['TestsVclassroom']['title'], array('style'=>'width:380px;float:right;')));
+        e($html->div(null, __('Not answered this test yet', true), array('id'=>$div_id,'style'=>'width:220px;float:left;font-size:7pt;')));
+        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('<div style="width:450px;float:right;">');
+        e($html->div(null, $t['TestsVclassroom']['points'] .' points',  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'=>
         "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;';

trunk/app/views/vclassrooms/show.ctp

@@ -1 +1 @@
 <?php
 //exit(debug($data));
- echo $javascript->link('fckeditor/fckeditor'); 
+echo $javascript->link('fckeditor/fckeditor'); 
 
- echo  '<h1>' . $data['Vclassroom']['name'] . '</h1>';
+echo  '<h1>' . $data['Vclassroom']['name'] . '</h1>';
    
- if ( $belongs === true ):
-     echo  $html->para(null, __('Welcome', true) . '!<b> '. $session->read('Auth.User.username') .'</b>');
-     echo  $html->para(null, '<b>'.__('Created', true). '</b>:' . $data['Vclassroom']['created']);
-     echo  $html->para(null, '<b>'.__('Subject', true).'</b>: ' . $data['Ecourse']['title']);
-     echo  $html->para(null, '<b>'.__('Course description', true).'</b>'. $ajax->link($html->image('static/arrow_down.png',array('alt'=>__('Course description',true), 'title'=>__('Course description',true))),'/vclassrooms/description/'.$data['Vclassroom']['ecourse_id'], array('update' => 'qn','loading'=>"Element.show('loading3');",'complete'=>"Element.hide('loading3');Effect.Appear('qn')"), null,false));
+if ( $belongs === true ):
+  echo  $html->para(null, __('Welcome', true) . '!<b> '. $session->read('Auth.User.username') .'</b>');
+  echo  $html->para(null, '<b>'.__('Created', true). '</b>:' . $data['Vclassroom']['created']);
+  echo  $html->para(null, '<b>'.__('Subject', true).'</b>: ' . $data['Ecourse']['title']);
+  echo  $html->para(null, '<b>'.__('Course description', true).'</b>'. $ajax->link($html->image('static/arrow_down.png',array('alt'=>__('Course description',true), 'title'=>__('Course description',true))),'/vclassrooms/description/'.$data['Vclassroom']['ecourse_id'], array('update' => 'qn','loading'=>"Element.show('loading3');",'complete'=>"Element.hide('loading3');Effect.Appear('qn')"), null,false));
 
-   echo $html->div(null,$html->image('static/loading.gif',array('alt'=>'Loading...')),array('id'=>'loading3','style'=>'display: none'));
+  echo $html->div(null,$html->image('static/loading.gif',array('alt'=>'Loading...')),array('id'=>'loading3','style'=>'display: none'));
     
-   echo $ajax->div('qn', array("style"=>"padding:3px")).$ajax->divEnd('qn');
+  echo $ajax->div('qn', array("style"=>"padding:3px")).$ajax->divEnd('qn');
 
-     //  Forums
-     if ( isset($data['Forum']) && count($data['Forum']) > 0):
+  //  Forums
+  if ( isset($data['Forum']) && count($data['Forum']) > 0):
         echo $html->div('titentry', 'Forums');
 
@@ -22 +22 @@
              echo $html->para(null, $html->link($f['title'], '/forums/display/'.$f['id'].'/'.$data['Vclassroom']['id']));
         endforeach;
-    endif;
+  endif;
     
-    // Tests 
-    if ( isset($data['Test']) && count($data['Test']) > 0):
+  // Tests 
+  if ( isset($data['Test']) && count($data['Test']) > 0):
        echo $html->div('titentry', __('Quizz Tests', true));
 
@@ -31 +31 @@
                 echo $html->para(null, $html->link($t['title'], '/tests/view/'.$t['id'].'/'.$data['Vclassroom']['id']));
        endforeach;
-    endif;
+  endif;
 
     // Webquests

trunk/app/views/webquests/admin_vclassrooms.ctp

@@ -1 +1 @@
 <?php
- echo $html->addCrumb('Control Tools', '/admin/entries/start');
+ echo $html->addCrumb('Control Panel', '/admin/entries/start');
  echo $html->addCrumb('Webquests', '/admin/webquests/listing');
  echo $html->getCrumbs(' / ');
-//die( debug( $data ) );
 
 $vclasses = array();   // contains vclassroom already linked to this webquest
@@ -19 +18 @@
        $tmp .= $form->hidden('VclassroomsWebquest.webquest_id', array('value'=>$webquest_id));
        $tmp .= $form->hidden('VclassroomsWebquest.vclassroom_id', array('value'=>$val['Vclassroom']['id']));
-       $tmp .= $form->end('Assign this Webquest');
+       $tmp .= $form->end(__('Assign this Webquest', true));
   
    else:
 
-       $tmp = $html->para(null, $html->image('admin/unlink.gif').'This test is already assigned to  <b>'.$val['Vclassroom']['name'].'</b>');
+       $tmp = $html->para(null, $html->image('admin/unlink.gif').'This webquest is already assigned to  <b>'.$val['Vclassroom']['name'].'</b>');
        
        foreach ( $webquests as $wq):
@@ -35 +34 @@
        $tmp .= $form->hidden('VclassroomsWebquest.id', array('value'=>$id));
        $tmp .= $form->hidden('VclassroomsWebquest.webquest_id', array('value'=>$webquest_id)); //used for return here
-       $tmp .= $form->end('Unlink this test');
-   endif;
+       $tmp .= $form->end(__('Unlink this Webquest', true));
+   endif; 
 
    echo $html->div('grayblock', $tmp); // print