Changeset 461

Timestamp:

05/08/08 11:43:23 (8 months ago)

Author:

aarkerio

Message:

Forums and topics improveds

Location:

trunk/app

Files:

• config/sql/postgresql/replies.sql (modified) (1 diff)
• config/sql/postgresql/visitors.sql (modified) (1 diff)
• controllers/forums_controller.php (modified) (5 diffs)
• controllers/replies_controller.php (modified) (2 diffs)
• controllers/topics_controller.php (modified) (3 diffs)
• models/topic.php (modified) (3 diffs)
• views/forums/admin_edit.ctp (modified) (1 diff)
• views/forums/display.ctp (modified) (1 diff)
• views/topics/add.ctp (modified) (1 diff)
• views/topics/display.ctp (modified) (5 diffs)
• views/topics/reply.ctp (modified) (1 diff)
• views/vclassrooms/show.ctp (modified) (1 diff)
• webroot/img/static/return.jpg (added)

trunk/app/config/sql/postgresql/replies.sql

@@ -3 +3 @@
  reply text NOT NULL,
  created timestamp(0) with time zone DEFAULT now() NOT NULL,
- topic_id integer NOT NULL REFERENCES topics(id) ON DELETE CASCADE,
- user_id integer NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+ topic_id int NOT NULL REFERENCES topics(id) ON DELETE CASCADE,
+ vclassroom_id int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE, -- just one facility to create student's reports
+ user_id int NOT NULL REFERENCES users(id) ON DELETE CASCADE,
  status int NOT NULL DEFAULT 1
 );

trunk/app/config/sql/postgresql/visitors.sql

@@ -2 +2 @@
   id serial PRIMARY KEY,
   user_id   int NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-  topic_id int NOT NULL REFERENCES topics(id) ON DELETE CASCADE,
-  UNIQUE (user_id, topic_id)  -- constraint
+  topic_id int NOT NULL REFERENCES topics(id) ON DELETE CASCADE
 ); 
-
-

trunk/app/controllers/forums_controller.php

@@ -8 +8 @@
 *  @package Karamelo
 */
-// file : app/controller/faqs_controller.php
+// file : app/controller/forums_controller.php
 
 uses('sanitize');
@@ -16 +16 @@
  public $helpers       = array('Javascript', 'Ajax', 'Time');
  
- public $components    = array('Edublog');
+ public $components    = array('Edublog', 'Email');
  
  public function beforeFilter() 
@@ -36 +36 @@
  }
  
- 
  public function index($user_id) 
  {      
@@ -137 +136 @@
    $this->layout = 'admin';
    
-   $vclassrooms = $this->Forum->getVclassrooms($this->Auth->user('id'));
-   
-   $this->set('vclassrooms', $vclassrooms);
+   $this->set('vclassrooms', $this->Forum->getVclassrooms($this->Auth->user('id')));
 
    if ( !empty( $this->data['Forum'] ) )
@@ -164 +161 @@
  public function admin_edit($id = null)
  {
-   $vclassrooms = $this->Forum->getVclassrooms($this->Auth->user('id'));
-   
-   $this->set('vclassrooms', $vclassrooms);
+ 
+  $this->set('vclassrooms', $this->Forum->getVclassrooms($this->Auth->user('id')));
 
   if (empty($this->data['Forum']))

trunk/app/controllers/replies_controller.php

@@ -13 +13 @@
  
  public $components    = array('Edublog');
+
+ public function beforeFilter() 
+ {
+    $this->Auth->allow(array('add', 'reply'));
+    parent::beforeFilter();
+ }
  
  public function isAuthorized()
@@ -26 +32 @@
  }
  
- public function display($user_id, $forum_id, $topic_id)
- {  
-     $this->pageTitle = 'Discussion';
-     
-     $this->layout    = $this->Edublog->layout($user_id);
-     
-     $this->Edublog->blog($user_id);
-     
-     $conditions = array('Reply.status'=>1, 'Reply.id'=>$topic_id);
-     $fields     = null;
-     $order      = 'Reply.created DESC';
-     
-     $this->set('data', $this->Reply->find($conditions, $fields, $order));
- }
- 
- public function add($username=null, $forum_id = null) 
+ public function add() 
  {
    if (!empty($this->data['Reply']))

trunk/app/controllers/topics_controller.php

@@ -14 +14 @@
  public $components    = array('Edublog');
  
-public function beforeFilter() 
+ public function beforeFilter() 
  {
     $this->Auth->allow(array('display', 'add', 'reply'));
@@ -47 +47 @@
    $this->Topic->Forum->unbindModel(array('hasMany'=>array('Topic')));
    $data =  $this->Topic->find($conditions, $fields, $order, 2);
+   //die(debug($data));
    $this->set('data',$data);
 
-   if ( $this->Auth->user('id') )
+   if ( !$this->Session->check('topic'.$topic_id)  ) // add 1 to visit
    { 
-        $this->Topic->addVisitor($data['Visitor'],  $this->Auth->user('id'), $data['Topic']['id']);
+        $this->Topic->addVisitor($topic_id, $this->Auth->user('id'));
+        $this->Session->write('topic'.$topic_id,  $topic_id); //set session, only one visit per session
    }
  }
   
- public function add($username=null, $forum_id = null) 
+ public function add($vclassroom_id = null, $forum_id = null) 
  {
+   $this->layout='ajax';
+
    if (!empty($this->data['Topic']))
    { 
@@ -74 +78 @@
    else 
    {
-      $user_id = $this->Topic->User->field('id', array('User.username'=>$username));
-      
-      $this->layout    = $this->Edublog->layout($user_id);
-      
-      $this->Edublog->blog($user_id);
-      
       $this->set('forum_id', $forum_id);
-    }
-    
+      $this->set('vclassroom_id', $vclassroom_id);
+   } 
  }
  
- public function reply($user_id, $forum_id, $topic_id) 
+ public function reply($vclassroom_id, $forum_id, $topic_id, $blogger_id) 
  {
        // adds new reply to topic
        
-       $this->layout    = $this->Edublog->layout($user_id);
+       $this->layout    = 'ajax';
        
-       $this->Edublog->blog($user_id);
-       
-       $this->set('forum_id', $forum_id);
-       $this->set('topic_id', $topic_id);
+       $this->set('forum_id',      $forum_id);
+       $this->set('topic_id',      $topic_id);
+       $this->set('blogger_id',    $blogger_id);
+       $this->set('vclassroom_id', $vclassroom_id);
  }
  

trunk/app/models/topic.php

@@ -2 +2 @@
 /**
 *  Karamelo eLearning Platform
-*  Chipotle Software 2002-2008 
+*  Chipotle Software 2002-2008
+*  @author: Manuel Montoya 
 *  GPLv3 manuel<arroba>mononeurona<punto>org
 **/ 
+// file: app/models/topic.php
 
 class Topic extends AppModel
@@ -46 +48 @@
         ); */
 
-  public function addVisitor($users = array(), $user_id, $topic_id)  
-  { // this is just to set a flag to indicate user is visiting topic for first time
-    
-    $ids = array();
-    //die(var_dump( $users  ));
-    foreach ($users as $v)
-    { 
-       array_push($ids, $v['id']);
-    }
-    
-    if ( in_array($user_id, $ids) )
-    {
-      return false;
-    }
-    else
-    {
-        $this->data['Visitor']['topic_id'] = $topic_id; 
-        $this->data['Visitor']['user_id']  = $user_id;
-        $this->Visitor->create();
-
-        if ( $this->Visitor->save( $this->data['Visitor'] ) )
-        {
-          return true;
-        }
-        else
-        {
-          die('Error on addVisitor function');
-        }
-    }
-    return true;
-  }
-
-  public $validate = array(
+ public $validate = array(
       'subject' => VALID_NOT_EMPTY,
       'message' => VALID_NOT_EMPTY,
@@ -84 +54 @@
       'forum_id' => VALID_NOT_EMPTY
       );
+
+  public function addVisitor($topic_id, $user_id)  
+  { 
+    $this->data['Visitor']['topic_id'] = $topic_id; 
+    $this->data['Visitor']['user_id']  = $user_id;
+
+    $this->Visitor->create();
+
+    if ( $this->Visitor->save( $this->data['Visitor'] ) ):
+          return true;
+    else:
+          die('Error on addVisitor function');
+    endif;
+
+    return true;
+  }
 }
 ?>

trunk/app/views/forums/admin_edit.ctp

@@ -12 +12 @@
 ?>
 <br />
+<?php
+  echo $form->label('Forum.vclassroom_id', 'Class:');
+  echo $form->select('Forum.vclassroom_id', $vclassrooms, null, null, false);
+?>
 <br />
 <?php 

trunk/app/views/forums/display.ctp

@@ -7 +7 @@
                );
 
-    echo  $html->div('titentry', $data["Forum"]["title"]);
-    echo  $html->para(null, $data["Forum"]["description"]);
+ echo  $html->div('titentry', $data["Forum"]["title"]);
+ echo  $html->para(null, $data["Forum"]["description"]);
 
-    echo $html->div(null, 
-                    $html->link($html->image('static/new_post.gif', array("alt"=>"Add new topic", "title"=>"Add new topic")), 
-                      '/topics/add/'.$blog["User"]["username"].'/'.$data["Forum"]["id"], 
-                      null, null, false)
-              );
+  $tmp = $ajax->link($html->image("static/new_post.gif", array("alt"=>"New Topic", "title"=>"New Topic")), '/topics/add/'.$data['Vclassroom']['id'].'/'.$data['Forum']['id'],
+                                array("update" => "qn",
+                              "loading"=>"Element.show('loading3');",
+                          "complete"=>"Element.hide('loading3');Effect.Appear('qn')"),
+                               null,
+                               false
+                               );
+   
+ $tmp .= '<div id="loading3" style="display: none;">'.$html->image("static/loading.gif", array("alt"=>"Loading")).'</div>';
+                
+ $tmp .= $ajax->div('qn', array("style"=>"padding:3px")) . $ajax->divEnd('qn');
+                  
+ echo $html->div(null, $tmp);
   
     //Topics
     echo '<table style="border-collapse:collapse;width:100%">';
-     if ( count($data["Topic"]) == 0)
-     {
+     if ( count($data["Topic"]) == 0):
                  echo '<tr><td colspan="6"><br /><h4>There is not topic on this forum yet</h4></td></tr>';
-     }
-     else
-     {
-                $th = array('Read', 'Topics', 'Replies', 'Author', 'Views', 'Last Post');
-                echo $html->tableHeaders($th);
-      }
+     else:
+                $th = array('Read', 'Topics', 'Replies', 'Author', 'Views', 'Last Post'); echo $html->tableHeaders($th);
+     endif;
       //die(print_r($data["Topic"]));
             

trunk/app/views/topics/add.ctp

@@ -1 @@
-<?php echo $javascript->link('myfunctions'); ?>
-<div>
-<?php 
-   echo $html->addCrumb('Phorums', '/forums/view/'.$blog["User"]["id"]); 
-   echo $html->getCrumbs(' / '); 
-?>
-</div>
-<div class="title_section">New Topic</div>
-
-<div class="spaced">
-
 <?php 
     echo $form->create('Topic');
     echo $form->hidden('Topic.forum_id', array('value'=>$forum_id));
- ?>
+    echo $form->hidden('Topic.vclassroom_id', array('value'=>$vclassroom_id));
+?>
 
 <fieldset>
   <legend>New Topic</legend>
   <?php 
-     echo $form->input('Topic.subject', array("size" => 40, "maxlength" => 60)); 
+     echo $form->input('Topic.subject', array("size" => 30, "maxlength" => 60, 'between'=>': <br />')); 
      echo $form->error('Topic.subject', 'A subject is required.'); 
   ?>
   <p>
     <?php 
-    echo $form->label('Topic.message', 'Message:' ) . '<br />';
-    echo $form->textarea('Topic.message', array("rows" => 10, "cols" => 50));
-    echo $form->error('Topic.message', 'A phorum message is required.'); 
+    echo $form->label('Topic.message', 'Topic :') . '<br />';
+    echo $form->textarea('Topic.message', array("rows" => 7, "cols" => 30));
   ?>
   </p>
   <br />  
-  <p><br /></fieldset>
-  <?php echo $form->end('Save'); ?></p>
-</div>
+  <br />
+  <?php echo $form->end('Save'); ?>
+</fieldset>

trunk/app/views/topics/display.ctp

@@ -1 +1 @@
 <?php
 //die(debug($data));
+echo '<h1>'. $data['Forum']['title'] .'</h1>';
 
-echo '<div>';
+echo $html->para(null, $data['User']['username'] . ' suggest topic: <b>'.$data['Topic']['subject'] .'</b>  at <span class="dates">'.$data['Topic']['created'].'</span>');
+
+echo $html->para(null, $html->link(
+$html->image('static/return.jpg', array('alt'=>'Return to '. $data['Forum']['title'], 'title'=>'Return to '. $data['Forum']['title']))
+, '/forums/display/'.$data['Topic']['forum_id'], null, null, false));
+
+echo $html->div('titentry', 'Discussion on '.$data['Topic']['subject']);
 
 if ( isset( $cU ) ):
-
-echo $html->link(  // add topic
+/*
+ $tmp = $html->link(  // add topic
                  $html->image(
                               'static/new_topic.gif', array("alt"=>"New topic", "title"=>"New topic")
@@ -14 +21 @@
                  ) .'  &nbsp;&nbsp;&nbsp;';
 
-echo $html->link(  // add reply
-                 $html->image(
-                              'static/reply.gif', array("alt"=>"Reply", "title"=>"Reply")), 
-                              '/topics/reply/'.$blog["User"]["id"].'/'.$data['Forum']['id'] .'/'.$data['Topic']['id'], 
-                              false, false, null); 
+**/
+ $tmp = $ajax->link($html->image("static/reply.gif", array("alt"=>"New reply", "title"=>"Reply")), 
+      '/topics/reply/'.$data['Topic']['vclassroom_id'].'/'.$data['Forum']['id'] .'/'.$data['Topic']['id'].'/'.$data['Topic']['user_id'],
+                                array("update" => "qn",
+                              "loading"=>"Element.show('loading3');",
+                          "complete"=>"Element.hide('loading3');Effect.Appear('qn')"),
+                               null,
+                               false
+                               );
+   
+ $tmp .= '<div id="loading3" style="display: none;">'.$html->image("static/loading.gif", array("alt"=>"Loading")).'</div>';
+                
+ $tmp .= $ajax->div('qn', array("style"=>"padding:3px")) . $ajax->divEnd('qn');
+                  
+ echo $html->div(null, $tmp);
+
 endif;
 
-echo '</div>';
-
-echo '<h1>'. $data['Forum']['title'] .'</h1>';
-echo '<p>'. $data['User']['username'] . ' suggest topic: <b>'.$data['Topic']['subject'] .'</b>  <span class="dates">'.$data['Topic']['created'].'</span></p>';
 
 echo '<div style="padding:2px;margin:10px 5px 10px 5px">';
@@ -38 +52 @@
  {
     $i = $int++;
-    $tmp   = '<b>'.  $i . '.-</b> '; 
+        $tmp   = '<b>'.  $i . '.-</b> '; 
     $tmp  .= $html->link($val['User']['username'], '/users/about/'.  $val['User']['username']);
     $tmp  .= $html->link($html->image('avatars/'.$val['User']['avatar'], array('alt'=>$val['User']['username'])), 
                          '/users/about/'.  $val['User']['username'], null, null, false) .'<br />';
     $tmp  .= $html->image('static/time.png') .'  '. $time->timeAgoInWords($val['created']).'<br /><br />' . $val['reply'];
+
     echo $html->div('reply', $tmp);
     
@@ -49 +64 @@
 
 if ( isset( $cU ) ):
-
+  /*
 echo $html->link(  // add topic
                  $html->image(
@@ -57 +72 @@
                   false, false, null
                  ) . '      &nbsp;&nbsp;&nbsp;&nbsp;';
-
-echo $html->link(  // add reply
-                 $html->image(
-                              'static/reply.gif', array("alt"=>"Reply", "title"=>"Reply")), 
-                              '/topics/reply/'.$blog["User"]["id"].'/'.$data['Forum']['id'] .'/'.$data['Topic']['id'], 
-                              false, false, null); 
+  */
 endif;
-
 ?>

trunk/app/views/topics/reply.ctp

@@ -1 @@
-<?php echo $javascript->link('fckeditor/fckeditor'); ?>
-<div class="title_section">Reply</div>
-
-<div class="spaced">
-
 <?php 
  if ( isset ($cU['User']) ):
    echo $form->create('Reply', array('action'=>'add'));
-   echo $form->hidden('Reply.redirect_to', array('value'=>'/topics/display/'.$blog['User']['id'].'/'.$forum_id.'/'.$topic_id));
+   echo $form->hidden('Reply.redirect_to', array('value'=>'/topics/display/'.$blogger_id.'/'.$forum_id.'/'.$topic_id));
    echo $form->hidden('Reply.topic_id', array('value'=>$topic_id));
+   echo $form->hidden('Reply.vclassroom_id', array('value'=>$vclassroom_id));
 ?>
 <fieldset>
-  <legend>New reply</legend>
+  <legend><?php __('New reply'); ?></legend>
   <?php 
     echo $form->label('Reply.reply', 'Message:' ) . '<br />';
     echo $form->textarea('Reply.reply', array("rows" => 10, "cols" => 50));
     echo $fck->load('ReplyReply', 'Basic', 500, 300); 
-    echo $form->error('Reply.reply', 'A message is required.'); 
-  ?>
-    </fieldset>
-  <?php 
-  echo $form->end('Send'); 
+    echo $form->end('Send');
+    echo '</fieldset>'; 
+endif;
+?>
 
-else:
-        echo $html->para(null, $html->link('You must be logged in to write a reply', '/users/login'));
-endif;
-  ?>
-</div>

trunk/app/views/vclassrooms/show.ctp

@@ -36 +36 @@
        foreach($data['Forum'] as $f)
        {
-         echo $html->para(null, $html->link($f['title'], '/vclassrooms/forums/'.$f['id']));
+         echo $html->para(null, $html->link($f['title'], '/forums/display/'.$f['id']));
        }
      }