Changeset 617

Timestamp:

07/01/08 19:06:58 (3 months ago)

Author:

aarkerio

Message:

Little fixes

Location:

trunk/app

Files:

• config/core.php (modified) (1 diff)
• config/sql/postgresql/ecourses.sql (modified) (1 diff)
• controllers/ecourses_controller.php (modified) (5 diffs)
• controllers/vclassrooms_controller.php (modified) (3 diffs)
• locale/spa/LC_MESSAGES/default.po (modified) (1 diff)
• models/ecourse.php (modified) (1 diff)
• models/vclassroom.php (modified) (1 diff)
• views/ecourses/admin_add.ctp (modified) (2 diffs)
• views/ecourses/admin_edit.ctp (modified) (2 diffs)
• views/ecourses/admin_vclassrooms.ctp (modified) (2 diffs)
• views/layouts/rubyx.ctp (modified) (2 diffs)
• views/vclassrooms/admin_add.ctp (modified) (3 diffs)
• views/vclassrooms/admin_edit.ctp (modified) (3 diffs)
• views/vclassrooms/admin_listing.ctp (modified) (1 diff)
• views/vclassrooms/show.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', 0);
+    Configure::write('debug', 1);
 /**
  * Application wide charset encoding

trunk/app/config/sql/postgresql/ecourses.sql

@@ -8 +8 @@
   "created" timestamp(0) with time zone DEFAULT now() NOT NULL,
   "status" smallint DEFAULT 0 NOT NULL,
-  "lang_id" int NOT NULL REFERENCES langs(id)
+  "lang_id" int NOT NULL REFERENCES langs(id),
+  "code" varchar(13)
 );
 

trunk/app/controllers/ecourses_controller.php

@@ -23 +23 @@
  
  /****     ===== ADMIN SECTION ========== ****/
- public function admin_start()
-  {
-       $this->layout = 'admin';
-       
-       $conditions   =  array("user_id"=>$this->Auth->user('id'));
-       $fields       =  array('id', 'title', 'access',  'status');
-       $order        =  "Ecourse.title DESC";
-       
-       $this->set('data', $this->Ecourse->findAll($conditions, $fields, $order));
-  }
+
  public function admin_listing($page=1)
-  {
+ {
         $this->layout = 'admin';
         
@@ -53 +44 @@
         $conditions   =  array("Ecourse.user_id"=>$this->Auth->user('id'), "Ecourse.id"=>$ecourse_id);
         
-    if ( $historic === 'historic' )
-        {
+    if ( $historic === 'historic' ):
           $this->Ecourse->filed(); //show filed classrooms
           
           $this->set('historic', true);
-    }
+    endif;
         
         $order        =  "Ecourse.id DESC";
@@ -97 +87 @@
     $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));
     
-    if (!empty($this->data['Ecourse']))
-    {
+    if (!empty($this->data['Ecourse'])):
         $this->Sanitize = new Sanitize;
         
@@ -107 +96 @@
         $this->Ecourse->create();
         
-        if ($this->Ecourse->save($this->data['Ecourse']))
-        {
+        if ($this->Ecourse->save($this->data['Ecourse'])):
                 $this->msgFlash('Course saved', '/admin/ecourses/edit/'.$this->Ecourse->getLastInsertID());
-        }
-    }
+    endif;
+   endif;
   }
   
-  public function admin_edit($id = null)
+  public function admin_edit($ecourse_id = null)
   {
     $this->layout = 'admin';
@@ -122 +110 @@
     $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));
     
-    if ( empty($this->data['Ecourse']) )
-    {
+    if ( empty($this->data['Ecourse']) ):
         
-        $this->Ecourse->id = $id;
-        
-        $this->Subject     = new Subject;
-        
-        $this->data = $this->Ecourse->read();
-        
-    }
-    else
-    {
+       $this->data = $this->Ecourse->read(null, $ecourse_id);
+      
+    else:
+      
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->html($this->data["Ecourse"]['description']);
+        $this->Sanitize->html($this->data['Ecourse']['description']);
         
-        if ($this->Ecourse->save($this->data['Ecourse']))
-        {
-            $this->msgFlash('Course saved', '/admin/ecourses/edit/'.$this->data["Ecourse"]['id']);
-        }
-    }
+        if ($this->Ecourse->save($this->data['Ecourse'])):
+             $this->msgFlash('eCourse saved', '/admin/ecourses/edit/'.$this->data["Ecourse"]['id']);
+    endif;
+    endif;
  }
  

trunk/app/controllers/vclassrooms_controller.php

@@ -76 +76 @@
              $this->set('belongs', false);
    endif;
-    
+       
+   // temporal lines, move to model later
+   //$this->Vclassroom->Ecourse->unbindModel(array('hasMany'=>array('Vclassroom'), 'belongsTo'=>array('User')));
+   //$this->Vclassroom->Test->unbindModel(array('hasMany'=>array('Question'), 'belongsTo'=>array('User')));
+   $this->Vclassroom->bindModel(array('belongsTo'=>array('Ecourse'=>array('fields'=>'id, title'))));
    $conditions = array("Vclassroom.status"=>1, "Vclassroom.id"=>$vclassroom_id);
-      
-   // temporal lines, move to model later
-   $this->Vclassroom->Ecourse->unbindModel(array('hasMany'=>array('Vclassroom'), 'belongsTo'=>array('User')));
-   $this->Vclassroom->Test->unbindModel(array('hasMany'=>array('Question'), 'belongsTo'=>array('User')));
-
-   $this->set('data', $this->Vclassroom->find($conditions, null, null, 2));
+   $this->set('data', $this->Vclassroom->find($conditions));
  }
 
@@ -271 +270 @@
         
       if ($this->Vclassroom->save($this->data["Vclassroom"])):
-               $this->msgFlash('Group added', '/admin/ecourses/vclassrooms/'.$this->data["Vclassroom"]["ecourse_id"]);
+               $this->msgFlash('vClassroom added', '/admin/ecourses/vclassrooms/'.$this->data["Vclassroom"]["ecourse_id"]);
       endif;
    else:     
@@ -326 +325 @@
        
        if ($this->Vclassroom->save($this->data['Vclassroom'])):
-            $this->msgFlash('Your virtual classroom  has been updated.', '/admin/vclassrooms/edit/'.$this->data['Vclassroom']['id']);
+            $this->msgFlash('vClassroom updated.', '/admin/vclassrooms/edit/'.$this->data['Vclassroom']['id']);
        endif;
   endif;

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

@@ -5 +5 @@
 msgstr "Editar"
 
+msgid  "New eCourse"
+msgstr "Nuevo eCourse"
+
+msgid  "Edit eCourse"
+msgstr "Editar eCourse"
+
 msgid  "Save"
 msgstr "Guardar"

trunk/app/models/ecourse.php

@@ -50 +50 @@
             'message' => 'Mimimum 8 characters long'
         ),
-        'code' => array(
-            'rule' => array('minLength', 4),
-            'allowEmpty' => false,
-            'message' => 'Mimimum 4 characters long'
-        ),
         'lang_id' => array(
             'rule' => 'numeric',

trunk/app/models/vclassroom.php

@@ -11 +11 @@
   public $name      = 'Vclassroom';
     
-  public $belongsTo = 'Ecourse';
+  public $belongsTo = array('Ecourse' =>
+                       array('className'  => 'Ecourse',
+                                 'conditions' => '',
+                             'order'      => '',
+                             'foreignKey' => 'ecourse_id'
+                        )
+                );
 
   public $hasMany = array('Forum' =>

trunk/app/views/ecourses/admin_add.ctp

@@ -4 +4 @@
 ?>
 <fieldset>
-  <legend>New Course</legend>
+  <legend><?php __('New eCourse');?></legend>
   <table><tr><td>
 <?php
@@ -27 +27 @@
  ?>
 </td></tr>
-
 <tr><td>
-  <?php
-      echo $form->input('Ecourse.code', array("size" => 12, "maxlenght" => 12, 'title'=>' max. 12 characters. Example: ROM2121'));
-  ?>
+<?php
+ e($form->input('Ecourse.code', array("size" => 12, "maxlenght" => 12, 'title'=>' max. 12 characters. Example: ROM2121')));
+?>
 </td><td colspan="2">
   <?php
-     echo $form->label('Ecourse.status', 'Enabled:' );
-     echo $form->checkbox('Ecourse.status', array("value"=>1, 'title'=>'Enabled course')); 
+     echo $form->label('Ecourse.status', 'Enabled:');
+     echo $form->checkbox('Ecourse.status', array('value'=>1, 'title'=>'Enabled course')); 
   ?></fieldset>
 </td></tr>

trunk/app/views/ecourses/admin_edit.ctp

@@ -10 +10 @@
 ?>
 <fieldset>
-  <legend>Edit Course</legend>
+ <legend><?php __('Edit eCourse'); ?></legend>
 <table><tr><td>
 <?php 
@@ -29 +29 @@
   <?php
     echo $form->label('Ecourse.description', 'Description:');
-    echo $form->textarea('Ecourse.description', array("cols" => 40, "rows" =>4));
+    echo $form->textarea('Ecourse.description', array('cols'=>40, 'rows'=>4));
     echo $fck->load('EcourseDescription', 'Karamelo');
   ?>
  </td></tr>
- <tr><td>
-  <?php
-    echo $form->input('Ecourse.code', array("size" => 12, "maxlenght" => 12, 'title'=>'max. 12 characters, ie.ROM2121'));    
-  ?>
-  </td>
-  <td colspan="2">
-  <?php
+<tr><td>
+<?php
+  echo $form->input('Ecourse.code', array('size' => 12, 'maxlenght' => 12, 'title'=>'max. 12 characters, ie.ROM2121'));
+ ?>
+ </td>
+ <td colspan="2">
+ <?php
     echo $form->label('Ecourse.status', 'Enabled:' );
     echo $form->checkbox('Ecourse.status', array("value"=>1, 'title'=>'Enabled course')); 

trunk/app/views/ecourses/admin_vclassrooms.ctp

@@ -1 +1 @@
 <?php
-//exit(print_r($data));
+//die(debug($data));
 
-echo $html->addCrumb('Control Tools', '/admin/entries/start');
+echo $html->addCrumb('Control Panel', '/admin/entries/start');
 echo $html->addCrumb('Courses', '/admin/ecourses/listing'); 
 echo $html->getCrumbs(' / '); 
@@ -8 +8 @@
 $str =  'Classrooms  on ' . $data['Ecourse']['title'];
 
-if ( isset( $historic ) )
-{
+if ( isset( $historic ) ):
    $str .= ' (filed)';
-}
+endif;
 
 echo $html->div('title_section', $str);
 
- echo  $html->para(null, $html->link($html->image('static/vgroups.gif', array("alt"=>"Add new group", "title"=>"Add new group")),  '/admin/vclassrooms/add/'.$data['Ecourse']['id'], null, null, false));
 
-if ( count($data['Vclassroom']) < 1 )
-{
-  echo $html->div('notice', 'No classrooms yet');
-}
+if ( count($data['Vclassroom']) < 1 ):
+    e($html->div('notice', 'No classrooms yet'));
+    $img = 'admin/vgroups-gray.gif'; 
+else:
+    $img = 'static/vgroups.gif';   
+endif;
 
-foreach ($data['Vclassroom'] as $val)
-{
+echo  $html->para(null, $html->link($html->image($img, array("alt"=>"Add new group", "title"=>"Add new group")),  '/admin/vclassrooms/add/'.$data['Ecourse']['id'], null, null, false));
+
+
+foreach ($data['Vclassroom'] as $val):
  $s = ($val['status'] == 1) ? 'Enabled' : 'Filed';
 
       $tmp  =  $html->div('butonright', $gags->sendEdit($val['id'], 'Vclassroom'));
       $tmp .=  $html->link($val['name'], '/admin/vclassrooms/members/'.$val['id']);
+      $tmp .=  $html->div(null, 'Secret:'. $val['secret']);
       $tmp .=  $html->para(null, 'Status: '.$html->link($s,'/admin/vclassrooms/change/'.$val['id'].'/'.$val['status'].'/'.$val['ecourse_id']));
       $tmp .=  $html->div('butonright', $gags->confirmDel($val['id'], 'Vclassroom'));
 
       echo $html->div('grayblock', $tmp);
-}
+endforeach;
 
-if ( !isset( $historic ) )
-{
+if ( !isset( $historic ) ):
 echo $html->link(
                 $html->image('admin/historic.png', array('alt'=>'Filed classrooms', 'title'=>'Filed classrooms')), 
                 '/admin/ecourses/vclassrooms/'.$data['Ecourse']['id'].'/historic', null, null, false);
-}
+endif;
 ?>

trunk/app/views/layouts/rubyx.ctp

@@ -17 +17 @@
 <meta http-equiv="content-language" content="cs" /> 
 <meta name="robots" content="all,follow" /> 
-<meta name="author" content="All: ... [Nazev webu - www.url.cz]; e-mail: info@url.cz" /> 
+<meta name="author" content="Karamelo by Chipotle Software" /> 
 <meta name="copyright" content="Design/Code: Vit Dlouhy [Nuvio - www.nuvio.cz]; e-mail: vit.dlouhy@nuvio.cz" />
 <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php echo '/entries/rss/'.$blog['User']['username']; ?>" />
@@ -36 +36 @@
 <!-- Main --> 
 <div id="main" class="box"> 
-     
+ 
 <!-- Header --> 
 <div id="header">
 <!-- user_name_blog -->          
 <h1 id="logo">
- <?php echo $html->link($blog['User']['name_blog'], '/blog/'.$blog['User']['username'], array("title"=>$blog['User']['name_blog'])); ?>
+<?php 
+e($html->link($blog['User']['name_blog'], '/blog/'.$blog['User']['username'], array("title"=>$blog['User']['name_blog']))); ?>
 </h1> 
 
-<?php echo $html->div(null, $blog['User']['quote'], array('id'=>'quote')); ?> 
+<?php echo $html->div(null, ''.$blog['User']['quote'], array('id'=>'quote')); ?> 
      
 </div> <!-- /header --> 

trunk/app/views/vclassrooms/admin_add.ctp

@@ -4 +4 @@
  echo $javascript->link('fckeditor/fckeditor');
 
- echo $html->addCrumb('Control Tools', '/admin/entries/start');  
+ echo $html->addCrumb('Control Panel', '/admin/entries/start');  
  echo $html->addCrumb('vGroups', '/admin/ecourses/vclassrooms/'.$this->data['Ecourse']['id']); 
  echo $html->getCrumbs(' / '); 
@@ -14 +14 @@
   <legend>New Group for e-Course: <?php echo $this->data['Ecourse']['title']; ?></legend>  
   <?php  
-    echo $form->input('Vclassroom.name', array("size" => 40, "maxlength" => 60)); 
+    echo $form->input('Vclassroom.name', array('size' => 40, 'maxlength' => 60)); 
     
     echo $form->label('Vclassroom.status', 'Enabled:');  
-    echo $form->checkbox('Vclassroom.status', array("value"=>1));
+    echo $form->checkbox('Vclassroom.status', array('value'=>1));
  
 
-    echo $form->input('Vclassroom.secret', array("size" => 7, "maxlength" => 6));
+    echo $form->input('Vclassroom.secret', array('size' => 7, 'maxlength' => 6));
     echo $form->end('Save'); 
 ?>
@@ -54 +54 @@
    }
  
-   if (access.checked == true)
+  
+   if (secret.value.length < 5)
    {
-      if (secret.value.length < 5)
-      {
-        alert('You must type a secret code larger than 5 characters');
-        secret.focus();
-        return false;
-      }
+      alert('You must type a secret code larger than 5 characters');
+      secret.focus();
+      return false;
    }
+  
    return true;
  }

trunk/app/views/vclassrooms/admin_edit.ctp

@@ -2 +2 @@
  //exit(var_dump($this->data));
  echo $javascript->link('fckeditor/fckeditor');
- echo $html->addCrumb('Control Tools', '/admin/entries/start');  
- echo $html->addCrumb('Classrooms', '/admin/vclassrooms/listing'); 
+ echo $html->addCrumb('Control Panel', '/admin/entries/start');  
+ echo $html->addCrumb('vClassrooms', '/admin/vclassrooms/listing'); 
  echo $html->getCrumbs(' / '); 
 
@@ -14 +14 @@
 <?php
     echo $form->input('Vclassroom.name', array('size' => 40, 'maxlength' => 60)); 
-     
 
     echo $form->label('Vclassroom.status', 'Status:');
-    echo $form->checkbox('Vclassroom.status', array('value'=>1)); 
+    echo $form->checkbox('Vclassroom.status'); 
 
-    $attr    = array("value"=>1, "onclick" => "showhide('invi_code')");
-         
-    if ($this->data['Vclassroom']['access'] == 1)
-    {
-           $display = 'block';  
-               $attr['checked'] = 'checked';
-    }
-    else
-    {
-           $display = 'none';     
-          
-    }
-
-    echo $form->label('Vclassroom.access', 'Members only by invitation:');
-    echo $form->checkbox('Vclassroom.access', $attr); 
-  ?>
-  <br /><br />
-  
-  <div id="invi_code" style="display:<?php echo $display; ?>;">
-     <?php 
-      echo $form->label('Vclassroom.secret', 'CODE:');
-      echo $form->input('Vclassroom.secret', array("size" => 5, "maxlength" => 6)); 
-    ?>
-  </div>
-  <div style="clear:both"></div>
-  <br /></fieldset>
-  <?php echo $form->end('Save'); ?>
-
+     echo $form->input('Vclassroom.secret', array('size' => 6, 'maxlength' => 6))
+?>
+ <div style="clear:both"></div>
+ <?php echo $form->end('Save'); ?>
+</fieldset>
+</div>
 <script type="text/javascript">
 /* <![CDATA[ */
@@ -76 +53 @@
    }
  
-   if (access.checked == true)
+   if (secret.value.length < 5)
    {
-      if (secret.value.length < 5)
-      {
-        alert('You must type a secret code larger than 5 characters');
-        secret.focus();
-        return false;
-      }
+      alert('You must type a secret code larger than 5 characters');
+      secret.focus();
+      return false;
    }
+ 
    return true;
  }

trunk/app/views/vclassrooms/admin_listing.ctp

@@ -10 +10 @@
 <?php
 
-$th = array ('Edit', 'Virtual classroom', 'Status');
+$th = array ('Edit', 'Virtual classroom', 'Status', 'See');
 echo $html->tableHeaders($th);  
-foreach ($data as $val)
-{       
-  $st = ( $val['Vclassroom']['status'] == 1 ) ? 'Enabled' : 'Filed';     
-       $tr = array (
+foreach ($data as $val):
+       
+  $st = ( $val['Vclassroom']['status'] == 1 ) ? 'Enabled' : 'Filed';    
+  $tr = array (
         $gags->sendEdit($val['Vclassroom']['id'], 'vclassrooms'),
         $html->link($val['Vclassroom']['name'], '/admin/vclassrooms/members/'.$val['Vclassroom']['id']) . ' <span class="petit">'.$val['Ecourse']['title'].'</span>',
-        $html->link($st,'/admin/vclassrooms/change/'.$val['Vclassroom']['id'].'/'.$val['Vclassroom']['status'])
+        $st,
+        $html->link(__('See Group', true), '/vclassrooms/show/'.$val['Vclassroom']['user_id'].'/'.$val['Vclassroom']['id'])
         //$gags->confirmDel($val['Vclassroom']['id'], 'vclassrooms')
         );
        
     echo $html->tableCells($tr, array("class"=>"altRow", "onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='altRow'"), 
-                                array('class'=>'evenRow',"onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='evenRow'"));
+                    array('class'=>'evenRow',"onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='evenRow'"));
     
-    }
+endforeach;
 ?>
 </table>
-<?php echo $html->para(null, $html->link($html->image('admin/historic.png', array('alt'=>'See historic','title'=>'See classrooms historic')), '/admin/vclassrooms/listing/historic', null, null, false)); ?>
+<?php 
+echo $html->para(null,$html->link($html->image('admin/historic.png', array('alt'=>'See historic','title'=>'See classrooms historic')), '/admin/vclassrooms/listing/historic', null, null, false)); 
+?>

trunk/app/views/vclassrooms/show.ctp

@@ -1 +1 @@
 <?php
- //exit(debug($data));
+//exit(debug($data));
  echo $javascript->link('fckeditor/fckeditor'); 
 
  echo  '<h1>' . $data['Vclassroom']['name'] . '</h1>';
-  
+   
  if ( $belongs === true ):
      echo  $html->para(null, __('Welcome', true) . '!<b> '. $session->read('Auth.User.username') .'</b>');
@@ -16 +16 @@
 
      //  Forums
-     if ( count($data['Forum']) > 0):
+     if ( isset($data['Forum']) && count($data['Forum']) > 0):
         echo $html->div('titentry', 'Forums');
 
@@ -25 +25 @@
     
     // Tests 
-    if ( count($data['Test']) > 0):
+    if ( isset($data['Test']) && count($data['Test']) > 0):
        echo $html->div('titentry', __('Quizz Tests', true));
 
@@ -34 +34 @@
 
     // Webquests
-    if ( count($data['Webquest']) > 0):
+    if ( isset($data['Webquest']) && count($data['Webquest']) > 0):
        echo $html->div('titentry', 'Webquests');
 
@@ -42 +42 @@
     endif;
 
-    if ( count($data['Treasure']) > 0):
+    if ( isset($data['Treasure']) && count($data['Treasure']) > 0):
        echo $html->div('titentry', __('Treasure Hunts', true));
 
@@ -83 +83 @@
      echo $form->hidden('UsersVclassroom.vclassroom_id', array('value'=>$data['Vclassroom']['id']));
      echo $form->input('UsersVclassroom.code', array('size' => 6, 'maxlength'=>6, 'title'=>'Secret code', 'between'=>': '));
-     echo $ajax->submit(__('Join to this class', true).$session->read('Auth.User.username'), array("url" => "/vclassrooms/jointoclass/", 
+     echo $ajax->submit(__('Join to this class', true).' '.$session->read('Auth.User.username'), array("url" => "/vclassrooms/jointoclass/", 
                                          "update"=>"updater",
                                          "loading" => "Element.show('charging');Element.hide('updater')",