Changeset 653

Timestamp:

07/15/08 14:38:50 (3 months ago)

Author:

aarkerio

Message:

Messages and news imprved

Location:

trunk/app

Files:

• config/sql/postgresql/news.sql (modified) (1 diff)
• controllers/discussions_controller.php (modified) (5 diffs)
• controllers/messages_controller.php (modified) (1 diff)
• controllers/news_controller.php (modified) (1 diff)
• locale/spa/LC_MESSAGES/default.po (modified) (1 diff)
• views/discussions/admin_listing.ctp (modified) (2 diffs)
• views/messages/message.ctp (modified) (2 diffs)
• views/messages/sent.ctp (modified) (1 diff)
• views/news/admin_listing.ctp (modified) (4 diffs)
• views/news/display.ctp (modified) (1 diff)

trunk/app/config/sql/postgresql/news.sql

@@ -5 +5 @@
   body text NOT NULL,
   created timestamp(0) with time zone DEFAULT now() NOT NULL,
-  reference varchar(350) NOT NULL,
+  reference varchar(350),
   theme_id int NOT NULL REFERENCES themes(id) ON DELETE CASCADE,
   status smallint NOT NULL,   -- 0 = draft, 1 = published

trunk/app/controllers/discussions_controller.php

@@ -14 +14 @@
 class DiscussionsController extends AppController
 {
- public $name          = 'Discussions';
-
  public $helpers       = array('Ajax', 'Gags');
 
@@ -46 +44 @@
      $this->data['Discussion']['comment'] = nl2br($this->data['Discussion']['comment']);
            
-     if ( $this->Auth->user() )
-     {
+     if ( $this->Auth->user() ):
           $this->data['Discussion']['user_id']  = $this->Auth->user('id');
           $this->data['Discussion']['username'] = $this->Auth->user('username');
-     }
-     else
-     {
+     else:
        /*if ($this->data['Discussion']['captcha'] != $this->Session->read('captcha') || strlen($this->data['Discussion']['captcha']) < 3)
        {
@@ -59 +54 @@
                 
          $this->data['Discussion']['user_id'] = 0;
-     }
+     endif;
          
      if ( $this->Discussion->save($this->data) ):  //save the comment
@@ -67 +62 @@
           $this->__sendMail($user_id, $this->data['Discussion']['new_id']);
                 
-          $this->redirect('/news/view/'.$this->data['Discussion']['new_id'].'#cnews');
+          $this->msgFlash(__('Message waiting for approval', true), '/news/view/'.$this->data['Discussion']['new_id'].'#cnews');
      endif;
    }
@@ -115 +110 @@
    $this->layout    = 'admin';
 
-   $this->pageTitle = 'Comments on News';
+   $this->pageTitle = __('Comments on News', true);
 
    $this->Discussion->bindModel(array('belongsTo'=> array('News' =>array('className'=> 'News', 'foreignKey'=> 'new_id' ))));   
+   
+   $this->paginate['fields'] = array('Discussion.id','News.id','News.title','Discussion.id','Discussion.comment', 'Discussion.created', 'Discussion.user_id', 'Discussion.status', 'User.username'); 
+   $this->paginate['conditions']   = null;
+   $this->paginate['order']        = "Discussion.id DESC";
+   $this->paginate['limit']        = 30;
+   $data = $this->paginate('Discussion');
 
-   $conditions  = null;
-   
-   $fields = array('Discussion.id','News.id','News.title','Discussion.id','Discussion.comment', 'Discussion.created', 'Discussion.user_id', 'Discussion.status', 'User.username');
-
-   $order  = "Discussion.id DESC";
-   
-   $limit  = 50;     
+   $this->set(compact('data'));
     
-   $this->set('data', $this->Discussion->findAll($conditions, $fields, $order, $limit));
  }
  

trunk/app/controllers/messages_controller.php

@@ -65 +65 @@
       $this->set('nick', $nick);
  }
- 
+/*
+ * deliver method, used to deliver message in /messages/message and /message/compose  views
+ *
+ */
  public function deliver()
- {
-    
+ {    
     if (!empty($this->data['Message'])):
       
-           $this->Sanitize = new Sanitize;
-           
-           $this->Sanitize->html($this->data['Message']['title']);
-           
-           $this->Sanitize->html($this->data['Message']['body']);
-           
-           $this->data['Message']['sender']   = $this->Auth->user('id'); 
-           $this->data['Message']['username'] = $this->Auth->user('username');
-
-           if ( $this->Message->save($this->data) ):
-                $this->__sendMail($this->data['Message']['user_id']);
+      $this->Sanitize = new Sanitize;
+           
+      $this->Sanitize->html($this->data['Message']['title']);
+           
+      $this->Sanitize->html($this->data['Message']['body']);
+           
+      $this->data['Message']['sender']   = $this->Auth->user('id'); 
+           
+      if ( !isset( $this->data['Message']['user_id'] ) ):
+        $this->data['Message']['user_id'] = $this->Message->User->field('User.id',array('User.username'=>trim($this->data['Message']['sender'])));
+      endif;
+
+      if ( $this->Message->save($this->data) ):
+            $this->__sendMail($this->data['Message']['user_id']);
+            if ( isset($this->data['Message']['ajax']) ):
+           $this->render('sent', 'ajax');    
+        else:
             $this->msgFlash(__('Message sent', true), '/messages/listing');
-           endif;
+            endif;
+      endif;
    endif;
  }

trunk/app/controllers/news_controller.php

@@ -119 +119 @@
         
       $this->layout = 'admin';
-        
-      $conditions   = array("News.user_id" => $this->Auth->user('id') );             // only the user's news
-      $fields       = array("id", "title", "body", "created", "reference", "status", "theme_id", "user_id");
-      $order        = "News.id DESC";
-      $limit      = 20;
-        
-      $this->set('data', $this->News->findAll($conditions, $fields, $order, $limit)); 
+      $this->News->unbindModel(array('hasMany'=>array('Discussion')));  
+      $this->paginate['conditions']   = null;
+      $this->paginate['fields']       = array('News.id', 'News.title', 'News.created', 'News.status',  'News.user_id', 'User.username');
+      $this->paginate['order']        = 'News.id DESC';
+      $this->paginate['limit']        = 20;
+      $data = $this->paginate('News');
+
+      $this->set(compact('data'));
   }
   

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

@@ -4 +4 @@
 msgid  "View all Lessons"
 msgstr "Todas las lecciones"
+
+msgid  "Message waiting for approval"
+msgstr "Mensaje en espera de aprobación"
 
 msgid  "Your current groups"

trunk/app/views/discussions/admin_listing.ctp

@@ -1 +1 @@
 <?php
 //die(debug($data));
-echo $html->addCrumb('Control Tools', '/admin/news/start'); 
-echo $html->addCrumb('Comments', '/admin/comments/listing'); 
+echo $html->addCrumb('Control Panel', '/admin/news/start'); 
+echo $html->addCrumb(__('News', true), '/admin/news/listing'); 
 echo $html->getCrumbs(' / '); 
  
-echo $html->div('title_section', 'Comments on News');
+echo $html->div('title_section', __('Comments on News', true));
 
 foreach ($data as $val):
@@ -16 +16 @@
    echo $html->div('grayblock', $tmp);
 endforeach;
+
+
+$t  = $html->div(null,$paginator->prev('« '. __('Previous', true).' ',null,null,array('class'=>'disabled')),array('style'=>'width:100px;float:left'));
+$t .= $html->div(null, $paginator->next(' '.__('Next', true).' »', null, null, array('class' => 'disabled')),array('style'=>'width:100px;float:right'));
+$t .= $html->div(null,$paginator->counter(), array('style'=>'width:200px;float:center'));
+echo  $html->div(null,$t, array('style'=>'font-size:9pt;width:400px;margin:15px auto;'));
 ?>

trunk/app/views/messages/message.ctp

@@ -15 +15 @@
   echo $ajax->form();
   echo $form->hidden('Message.user_id', array('value'=>$blog['User']['id']));
+  echo $form->hidden('Message.ajax', array('value'=>1));
 ?>
 <fieldset>
   <legend>Message to teacher from <?php echo $session->read('Auth.User.username'); ?>:</legend>
      <?php 
-        echo $form->input('Message.title', array("size" => 30, "maxlength" => 50)); 
+        echo $form->input('Message.title', array('size' => 30, 'maxlength' => 50, 'label'=>__('Title', true), 'between'=>': ')); 
         echo $form->error('Message.title', 'Title is required.'); 
         
@@ -31 +32 @@
                                          "complete" => "Element.hide('charging');Effect.Appear('updater')"
         )); 
-        ?>
+   ?>
 </fieldset>
 </form>

trunk/app/views/messages/sent.ctp

@@ -1 @@
-<p>Message sent</p>
+<?php
+e($html->para(null, __('Thx', true).'! '.__('Message sent', true)));
+?>

trunk/app/views/news/admin_listing.ctp

@@ -1 +1 @@
 <?php
+//die(debug($data));
   echo $html->div('title_section', __('News', true));
-  echo $html->link($html->image('actions/new.png', array("alt"=>"Add new", "title"=>"Add new")), '/admin/news/add', null, false, false);
+  echo $html->link($html->image('actions/new.png', array('alt'=>__('Add new', true), 'title'=>__('Add new', true))), '/admin/news/add', null, false, false);
+  echo '&nbsp;&nbsp;&nbsp;'; 
   echo $html->link($html->image('static/forum.gif', array("alt"=>"See comments", "title"=>"See comments")), '/admin/discussions/listing', null, false, false);
 ?>
@@ -7 +9 @@
 <?php
 
-$th = array ('Edit', 'Title', 'Status', 'Delete');
+$th = array(__('Edit', true), __('Title', true), __('Author', true), __('Status', true), __('Delete', true));
 echo $html->tableHeaders($th);  
 foreach ($data as $key=>$val):
@@ -14 +16 @@
         $gags->sendEdit($val['News']['id'], 'news'),
         $val['News']['title'],
+        $val['User']['username'],
         $html->link($st, '/admin/news/change/'.$val['News']['status'].'/'.$val['News']['id']),
         $gags->confirmDel($val['News']['id'], 'news')
@@ -26 +29 @@
 
 <?php 
-// echo $pagination; 
+$t  = $html->div(null,$paginator->prev('« '.__('Previous', true). ' ',null,null,array('class'=>'disabled')),array('style'=>'width:100px;float:left'));
+$t .= $html->div(null, $paginator->next(' '.__('Next', true). ' »', null, null, array('class' => 'disabled')),array('style'=>'width:100px;float:right'));
+$t .= $html->div(null,$paginator->counter(), array('style'=>'width:200px;float:center'));
+echo  $html->div(null,$t, array('style'=>'font-size:9pt;width:400px;margin:15px auto;'));
 ?>

trunk/app/views/news/display.ctp

@@ -52 +52 @@
 endforeach;
 
-$t  = $html->div(null,$paginator->prev('« Previous ',null,null,array('class'=>'disabled')),array('style'=>'width:100px;float:left'));
-$t .= $html->div(null, $paginator->next(' Next »', null, null, array('class' => 'disabled')),array('style'=>'width:100px;float:right'));
+$t  = $html->div(null,$paginator->prev('«'. __('Previous', true).' ',null,null,array('class'=>'disabled')),array('style'=>'width:100px;float:left'));
+$t .= $html->div(null, $paginator->next(' '.__('Next', true).' »', null, null, array('class' => 'disabled')),array('style'=>'width:100px;float:right'));
 $t .= $html->div(null,$paginator->counter(), array('style'=>'width:200px;float:center'));
 echo  $html->div(null,$t, array('style'=>'font-size:9pt;width:400px;margin:15px auto;'));