Changeset 352

Timestamp:

03/28/08 10:03:54 (10 months ago)

Author:

aarkerio

Message:

Improvs on Lessons and Images

Location:

trunk/app

Files:

• controllers/ecourses_controller.php (modified) (4 diffs)
• controllers/lessons_controller.php (modified) (5 diffs)
• controllers/shares_controller.php (modified) (1 diff)
• controllers/users_controller.php (modified) (1 diff)
• controllers/vclassrooms_controller.php (modified) (2 diffs)
• models/ecourse.php (modified) (1 diff)
• models/lesson.php (modified) (1 diff)
• views/ecourses/admin_listing.ctp (modified) (1 diff)
• views/ecourses/admin_vclassrooms.ctp (modified) (2 diffs)
• views/elements/admin_menu.ctp (modified) (1 diff)
• views/images/admin_listing.ctp (modified) (3 diffs)
• views/lessons/admin_add.ctp (modified) (1 diff)
• views/lessons/admin_edit.ctp (modified) (3 diffs)
• views/vclassrooms/admin_edit.ctp (modified) (2 diffs)
• views/vclassrooms/admin_listing.ctp (modified) (3 diffs)
• views/vclassrooms/admin_members.ctp (modified) (2 diffs)
• webroot/css/cpanel/cpanel.css (modified) (1 diff)
• webroot/img/admin/forums_icon.png (added)
• webroot/img/admin/historic.png (added)

trunk/app/controllers/ecourses_controller.php

@@ -3 +3 @@
 *   Karamelo E-Learning Platform
 *   Manuel Montoya 2002-2008 
-*   GPLv3 License manuel<at>mononeurona.org
+*   GPLv3 License manuel<arroba>mononeurona<punto>org
 *   Chipotle Software TM
 */ 
@@ -54 +54 @@
  }
 
- public function admin_vclassrooms($ecourse_id, $hidden = 0)
+ public function admin_vclassrooms($ecourse_id, $historic = null)
  {
         $this->layout = 'admin';
@@ -61 +61 @@
         
         $conditions   =  array("Ecourse.user_id"=>$this->Auth->user('id'), "Ecourse.id"=>$ecourse_id);
-        $fields       =  array('id', 'title', 'status');
+        
+    if ( $historic === 'historic' )
+        {
+          $this->Ecourse->filed(); //show filed classrooms
+
+          $this->set('historic', true);
+    }
+     
         $order        =  "Ecourse.id DESC";
+        
+        //die( debug($this->Ecourse->find($conditions)));
 
-        $this->set('data', $this->Ecourse->find($conditions, $fields));
+        $this->set('data', $this->Ecourse->find($conditions));
   }
   
@@ -85 +94 @@
   {   
     $this->layout    = 'admin'; 
-    
-    $this->set('subjects', Set::combine($this->Ecourse->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
+   
+    $this->set('subjects', Set::combine($this->Ecourse->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
     
     $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));

trunk/app/controllers/lessons_controller.php

@@ -3 +3 @@
 *  Karamelo E-Learning Platform
 *  Manuel Montoya 2002-2008 
-*  GPLv3 manuel<at>mononeurona<punto>org
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
  
@@ -95 +95 @@
     $this->layout    = 'admin';
     
+    $this->set('subjects', Set::combine($this->Lesson->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
+    
      if (!empty($this->data["Lesson"]))
      {
@@ -115 +117 @@
 {
      $this->layout    = 'admin';
+
+     $this->set('subjects', Set::combine($this->Lesson->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
      
      if ( empty( $this->data["Lesson"] ) )
@@ -146 +150 @@
  public function admin_delete($id)
  {
-      if ($this->Lesson->del($id))
+      if ($this->Lesson->del($id))
       {
           $this->msgFlash('Lesson deleted', '/admin/lessons/listing');
@@ -152 +156 @@
       else
       {
-           $this->flash('Error, call support', '/admin/lessons/listing');
+                  $this->flash('Error, call support', '/admin/lessons/listing');
       }
   }

trunk/app/controllers/shares_controller.php

@@ -13 +13 @@
    
  public $components = array('Edublog', 'Adds');
- 
+
+ public function beforeFilter()
+ {
+      $this->Auth->allow(array('download'));
+      parent::beforeFilter();
+ } 
  public function isAuthorized()
  {

trunk/app/controllers/users_controller.php

@@ -406 +406 @@
     {
         //die( var_dump($this->data['User']) );
-        if (strlen($this->data["User"]["pwd"]) > 5)   // only if pwd is big enough
+        if ( strlen($this->data["User"]["pwd"]) < 5)   // only if pwd is big enough
         {
-             $this->data["User"]["pwd"] = md5($this->data["User"]["pwd"]); // MD5 
-        } 
-        else 
-        {
-             unset($this->data["User"]["pwd"]);      
+                 unset($this->data["User"]["pwd"]);      
         }
         

trunk/app/controllers/vclassrooms_controller.php

@@ -77 +77 @@
  /***   == ADMIN METHODS === ***/   
 
- public function admin_listing()
+ public function admin_listing($historic = null)
  {
       $this->layout = 'admin';
-      $conditions = array("Vclassroom.user_id"=>$this->Auth->user('id'));
-      $fields     = array("Vclassroom.id", "Vclassroom.name", "Vclassroom.created", "Vclassroom.user_id", "Vclassroom.ecourse_id");
+      $conditions = array("Vclassroom.user_id"=>$this->Auth->user('id'), "Vclassroom.status"=>1);
+      $fields     = array('id', 'name', 'created', 'user_id', 'ecourse_id', 'status');
       $order      = "Vclassroom.id DESC";
       
+      if ($historic === 'historic')
+      {
+    $conditions['Vclassroom.status'] = 0;
+        $this->set('historic', true);
+      }
+
       $this->pageTitle = 'eClass';
       
@@ -195 +201 @@
   }
 }
-  /**
+
+ /**
   *  
   *  args id 
   *  
-  **/ 
+ **/ 
   public function admin_edit($id = null)
   {

trunk/app/models/ecourse.php

@@ -9 +9 @@
 class Ecourse extends AppModel {
   
-  public $name = 'Ecourse';
+  public $name = 'Ecourse'; 
   
   public $belongsTo = array('User', 'Subject', 'Lang');
   
-  public $hasMany   = array('Vclassroom');
+  public $hasMany   =  array('Vclassroom' =>
+                array( 
+                  'className'  =>  'Vclassroom',     
+                  'foreignKey' =>  'ecourse_id', 
+                  'conditions' =>  'status = 1'
+                                  )
+   );
   
+  public function filed() 
+  {
+      $this->unbindModel(array('hasMany'=>array('Vclassroom')));
+
+      $this->bindModel( array('hasMany' => array('Vclassroom' =>
+                                               array( 
+                                                 'className'  =>  'Vclassroom',     
+                                                 'foreignKey' =>  'ecourse_id', 
+                                                 'conditions' =>  'status = 0'
+                                                                 )
+                                   ))
+                      );
+       return true; 
+  }
+    
   public $validate = array(
         'title' => array(

trunk/app/models/lesson.php

@@ -11 +11 @@
     public $name        = 'Lesson';
     
-    public $belongsTo   = 'User';
+  public $belongsTo = array('User' =>
+                array('className'  => 'User',
+                  'conditions' => '',
+                  'order'      => '',
+                                 'foreignKey' => 'user_id'
+                  ),
+                           'Subject' =>
+                array('className'  => 'Subject',
+                  'conditions' => '',
+                  'order'      => null,
+                                 'foreignKey' => 'subject_id'
+                  )
+                );
     
     public $validate = array(

trunk/app/views/ecourses/admin_listing.ctp

@@ -7 +7 @@
 echo $html->addCrumb('Courses', '/admin/ecourses/listing'); 
 echo $html->getCrumbs(' / '); 
-?>
 
-<p>
-<?php
- echo  $html->link($html->image('actions/new.png', array("alt"=>"Add new course", "title"=>"Add new course")),  '/admin/ecourses/add', null, null, false);
-?>
-</p>
+echo $html->para(null, $html->link($html->image('actions/new.png', array("alt"=>"Add new course", "title"=>"Add new course")),  '/admin/ecourses/add', null, null, false));
 
-<?php
-//exit(print_r($data));
 foreach ($data as $val)
 {
- echo '<div style="padding:6px 3px 28px 4px;margin:10px 0 5px 0;border:1px dotted gray;">';
-      echo '<div class="butonright">' .$gags->sendEdit($val['Ecourse']['id'], 'ecourses') . '</div>';
-      echo $html->link($val['Ecourse']['title'], '/admin/ecourses/vclassrooms/'.$val['Ecourse']['id']);
-      echo '<p>' . $val['Ecourse']['description']  . '</p>';
-      echo '<div class="butonright">'. $gags->confirmDel($val['Ecourse']['id'], 'ecourses') .'</div>';
- echo '</div>';
+
+      $tmp  = $html->div('butonright', $gags->sendEdit($val['Ecourse']['id'], 'ecourses'));
+      $tmp .= $html->link($val['Ecourse']['title'], '/admin/ecourses/vclassrooms/'.$val['Ecourse']['id']);
+      $tmp .= $html->para(null, $val['Ecourse']['description']);
+      $tmp .= $html->div('butonright', $gags->confirmDel($val['Ecourse']['id'], 'ecourses'));
+      echo $html->div('grayblock', $tmp);
 }
 ?>

trunk/app/views/ecourses/admin_vclassrooms.ctp

@@ -6 +6 @@
 echo $html->getCrumbs(' / '); 
 
-echo $html->div('title_section', 'Virtual clasrooms  on ' . $data['Ecourse']['title'] . ' e-Course');
+$str =  'Virtual clasrooms  on ' . $data['Ecourse']['title'] . ' e-Course';
 
+if ( isset( $historic ) )
+{
+   $str .= ' (filed)';
+}
+
+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));
@@ -25 +31 @@
       $tmp .=  $html->div('butonright', $gags->confirmDel($val['id'], 'Vclassroom'));
 
-      echo $html->div('spaced', $tmp);
+      echo $html->div('grayblock', $tmp);
+}
+
+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);
 }
 ?>

trunk/app/views/elements/admin_menu.ctp

@@ -7 +7 @@
                                                                ),
          $html->link('eCourses', '/admin/ecourses/listing') => array(
-                                                                 $html->link('Add eCourses', '/admin/ecourses/add')
+                                                                 $html->link('Add eCourses', '/admin/ecourses/add'),
+                                                                         $html->link('Classrooms', '/admin/vclassrooms/listing')
                                                              ),
              $html->link('Webquests', '/admin/webquests/listing'),

trunk/app/views/images/admin_listing.ctp

@@ -6 +6 @@
    echo $html->addCrumb('Images', '#'); 
    echo $html->getCrumbs(' / ');
-   echo '<div class="title_section">Images</div>';
+   echo $html->div('title_section', 'Images');
    $return = null;
  } 
@@ -29 +29 @@
            echo $form->error('Image.file', 'Title is required.'); 
            echo '</fieldset>';
-           echo $form->end('Upload'); ?>
-
+           echo $form->end('Upload'); 
+      ?>
 </td>
 </tr>
@@ -62 +62 @@
  {
         echo  $form->create('Image', array('action'=>'admin_delete'));
-        echo  $form->hidden('Image.return', array('value' => '/admin/images/listing'));
+        echo $form->hidden('Image.return', array('value'=>'/admin/images/listing/'.$return)); 
         echo  $form->hidden('Image.id', array('value' => $val['Image']['id']));
         echo  $form->end('Delete');

trunk/app/views/lessons/admin_add.ctp

@@ -21 +21 @@
   <td colspan="2">
   <?php 
+      echo $form->label('Lesson.subject_id', 'Subject:');
+      echo $form->select('Lesson.subject_id', $subjects, null, null, false);
+
       echo $form->label('Lesson.body', 'Body:' );
-      echo $form->textarea('Lesson.body', array("cols"=>80, "rows"=>45));
+      echo $form->textarea('Lesson.body', array("cols"=>80, "rows"=>20));
       echo $fck->load('LessonBody', 'Karamelo');
       echo $form->error('Lesson.body', 'Body is required.'); 

trunk/app/views/lessons/admin_edit.ctp

@@ -2 +2 @@
    window.onload = timedMsg;
 </script>
-<?php $session->flash(); ?>
-<?php
-echo $javascript->link('myfunctions');
-echo $javascript->link('fckeditor/fckeditor'); 
-?>
+<?php 
+  $session->flash();
 
-<?php 
-   echo $html->formTag('/admin/lessons/edit','post');
-   echo $html->hidden('Lesson/id');
+  echo $javascript->link('myfunctions');
+  echo $javascript->link('fckeditor/fckeditor'); 
+ 
+   echo $form->create('Lesson');
+   echo $form->hidden('Lesson.id');
 ?>
 <fieldset>
@@ -16 +15 @@
 <table>
 <tr><td>
-  <?php 
-     echo $form->labelTag( 'Lesson/title', 'Title:' );
-     echo $html->input('Lesson/title', array("size" => 50, "maxlength" => 120, "class"=>"formas"));
-     echo $html->tagErrorMsg('Lesson/title', 'Title is required.'); 
-  ?>
+  <?php  echo $form->input('Lesson.title', array("size" => 50, "maxlength" => 120));  ?>
   </td>
   <td>
@@ -29 +24 @@
   <td colspan="2">
   <?php 
-      echo $form->labelTag( 'Lesson/body', 'Body:' );
-      echo $html->textarea('Lesson/body', array("class"=>"formas", "cols"=>80, "rows"=>45));
-      echo $fck->load('Lesson/body', 'Karamelo');
-      echo $html->tagErrorMsg('Lesson/body', 'Body is required.'); 
+      echo $form->label('Lesson.subject_id', 'Subject:');
+      echo $form->select('Lesson.subject_id', $subjects, null, null, false);
+
+      echo $form->label('Lesson.body', 'Body:' );
+      echo $form->textarea('Lesson.body', array("cols"=>80, "rows"=>20));
+      echo $fck->load('LessonBody', 'Karamelo');
   ?>
   </td></tr>
   <tr><td>
   <?php 
-     echo $form->labelTag( 'Lesson/status', 'Published:' );
-     echo $html->checkbox('Lesson/status'); 
+     echo $form->label( 'Lesson.status', 'Published:' );
+     echo $form->checkbox('Lesson.status', array("value"=>1)); 
   ?>
   </td><td>
   <?php 
-      echo $form->labelTag( 'Lesson/disc', 'Comments allowed to this Lesson:' );
-      echo $html->checkbox('Lesson/disc');
+      echo $form->label('Lesson.disc', 'Comments allowed to this Lesson:' );
+      echo $form->checkbox('Lesson.disc', array("value"=>1));
       
-      echo $form->labelTag( 'Lesson/end', 'End edition:' );
-      echo $html->checkbox('Lesson/end', null, array("value"=>1)); 
+      echo $form->label( 'Lesson.end', 'End edition:' );
+      echo $form->checkbox('Lesson.end', array("value"=>1)); 
   ?>
   </td></tr>
-  <tr><td colspan="2"> 
-  <?php echo $html->submit('Save'); ?>
+  <tr><td colspan="2"> </fieldset>
+  <?php echo $form->end('Save'); ?>
 </td></tr>
 </table>
-</fieldset>
-</form>
+

trunk/app/views/vclassrooms/admin_edit.ctp

@@ -6 +6 @@
  echo $html->getCrumbs(' / '); 
 
- echo $form->create('Vclassroom',array('action'=>'admin_edit', "onsubmit"=>"chkForm()"));
+ echo $form->create('Vclassroom', array('onsubmit'=>'chkForm()'));
  echo $form->hidden('Vclassroom.id');
 ?>
 
 <fieldset>
-  <legend>New Group</legend> 
-  <p>
-  <?php 
-     echo $form->input('Vclassroom.name', array("size" => 40, "maxlength" => 60)); 
-     echo $form->error('Vclassroom.name', 'A name is required.'); 
-  ?>
-  </p><br />
- 
-  
-  <?php 
-     echo $form->label('Vclassroom.status', 'Status:');
-     echo $form->checkbox('Vclassroom.status', array("value"=>1)); 
-?>
-  <br /></p>
-  
-   <?php 
-        $attr    = array("value"=>1, "onclick" => "showhide('invi_code')");
+  <legend>Edit Group</legend> 
+<?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)); 
+
+    $attr    = array("value"=>1, "onclick" => "showhide('invi_code')");
          
-        if ($this->data['Vclassroom']['access'] == 1)
-         {
+    if ($this->data['Vclassroom']['access'] == 1)
+    {
            $display = 'block';  
-            $attr['checked'] = 'checked';
-         }
-         else
-         {
-           $display = 'none';
-          
+               $attr['checked'] = 'checked';
+    }
+    else
+    {
+           $display = 'none';     
           
-         }
-    ?>
-  
+    }
 
-  <?php 
-     echo $form->label('Vclassroom.access', 'Members only by invitation:');
-     echo $form->checkbox('Vclassroom.access', $attr); 
+    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 $html->input('Vclassroom.secret', array("size" => 5, "maxlength" => 6)); 
+      echo $form->label('Vclassroom.secret', 'CODE:');
+      echo $form->input('Vclassroom.secret', array("size" => 5, "maxlength" => 6)); 
     ?>
-     <br /><br />
   </div>
   <div style="clear:both"></div>
@@ -67 +52 @@
  {
       var Div = document.getElementById(a);
-        
+      
        if (Div.style.display == "none")
        {

trunk/app/views/vclassrooms/admin_listing.ctp

@@ -1 @@
-
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
-
-<div class="title_section">Classrooms</div>
-
-<p><?php echo $html->link($html->image('actions/new.png', array("alt"=>"Add classroom", "title"=>"Add classroom")), '/admin/vclassrooms/add', null, false, false) ?></p>
+<?php 
+  echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
+  echo $html->getCrumbs(' / '); 
+  echo $html->div('title_section', 'Classrooms');
+  echo $html->link($html->image('actions/new.png', array("alt"=>"Add classroom", "title"=>"Add classroom")), '/admin/vclassrooms/add', null, null, false); 
+?>
 
 <table class="tbadmin">
@@ -11 +10 @@
 //die(print_r($data));
 
-$th = array ('Edit', 'Virtual classroom', 'View students', 'Delete');
+$th = array ('Edit', 'Virtual classroom', 'View students', 'Status', 'Delete');
 echo $html->tableHeaders($th);  
-foreach ($data as $key=>$val)
-    {            
+foreach ($data as $val)
+{       
+  $st = ( $val['Vclassroom']['status'] == 1 ) ? 'Active' : 'Filed';     
        $tr = array (
         $gags->sendEdit($val['Vclassroom']['id'], 'vclassrooms'),
         $val['Vclassroom']['name'],
         $html->link('View students','/admin/vclassrooms/start/'.$val['Vclassroom']['id']),
+        $html->link('File','/admin/vclassrooms/change/'.$val['Vclassroom']['id'].'/'.$val['Vclassroom']['status']),
         $gags->confirmDel($val['Vclassroom']['id'], 'vclassrooms')
         );
@@ -28 +29 @@
 ?>
 </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)); ?>

trunk/app/views/vclassrooms/admin_members.ctp

@@ -12 +12 @@
 $r="javascript:window.open('/admin/vclassrooms/treasure/".$data['Vclassroom']['id']."', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=400')"; 
 
+//popup window for forums
+$r="javascript:window.open('/admin/vclassrooms/forum/".$data['Vclassroom']['id']."', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=400')"; 
+
 echo $html->link(
          $html->image('static/icon_test.jpg', array("alt"=>"Add test", "title"=>"Add test", "style"=>"margin-right:12px")
@@ -24 +27 @@
         ), '#', array("onclick"=>$r), null, null, false);
 
+
+ echo $html->link(
+        $html->image('admin/forums_icon.png', array("alt"=>"Add forum", "title"=>"Add forum", "style"=>"margin-right:12px")
+        ), '#', array("onclick"=>$r), null, null, false);
+
 echo '</div>';
 
 
-echo '<div class="title_section">Students belonging to ' . $data['Vclassroom']['name'] . '</div>';
+echo $html->div('title_section', 'Students belonging to ' . $data['Vclassroom']['name']);
 ?>