Changeset 635

Timestamp:

07/09/08 19:24:21 (3 months ago)

Author:

aarkerio

Message:

Added image and comments fixed

Location:

trunk/app

Files:

• config/routes.php (modified) (1 diff)
• controllers/comments_controller.php (modified) (2 diffs)
• controllers/entries_controller.php (modified) (2 diffs)
• controllers/users_controller.php (modified) (2 diffs)
• locale/eng/LC_MESSAGES/default.po (modified) (1 diff)
• locale/spa/LC_MESSAGES/default.po (modified) (2 diffs)
• views/elements/vclassrooms.ctp (modified) (1 diff)
• views/entries/display.ctp (moved) (moved from trunk/app/views/users/blog.ctp) (1 diff)
• views/entries/view.ctp (moved) (moved from trunk/app/views/users/entry.ctp) (3 diffs)
• views/vclassrooms/participation.ctp (modified) (1 diff)

trunk/app/config/routes.php

@@ -9 +9 @@
  * ...and connect the rest of 'blog' controller's urls.
  */
-    Router::connect('/blog/*', array('controller' => 'users', 'action' => 'blog'));
+    Router::connect('/blog/*', array('controller' => 'entries', 'action' => 'display'));
 /**
  * Then we connect url '/test' to our test controller. This is helpfull in

trunk/app/controllers/comments_controller.php

@@ -32 +32 @@
     if ($username != null):
       $user_id    = $this->User->field('id', array("username"=>$username));
-    $conditions["user_id"] = $user_id;
+      $conditions["user_id"] = $user_id;
     endif;
       
@@ -51 +51 @@
     if (!empty($this->data["Comment"]) ):
          
-      $this->Sanitize = new Sanitize;
+      $this->Sanitize = new Sanitize; 
+      $this->Sanitize->clean($this->data["Comment"]); //Hopefully this is enough
+      $this->Comment->create();
        
-    $this->Sanitize->clean($this->data["Comment"]); //Hopefully this is enough
-       
-    $this->Comment->create();
-       
-    if ($this->Comment->save($this->data["Comment"])):
-      $this->msgFlash('Comment added', $this->data['Comment']['redirect_to'].'/#comments');
-    endif;
+      if ($this->Comment->save($this->data["Comment"])):
+           $this->msgFlash(__('Comment added', true), $this->data['Comment']['redirect_to'].'/#comments');
+      endif;
     endif;
   }

trunk/app/controllers/entries_controller.php

@@ -19 +19 @@
  public $components    = array('Edublog', 'Portal', 'Search');
 
+ public $paginate = array('limit' => 7, 'page' => 1, 'order' => array('Entry.id' => 'DESC'), 'fields'=> array('Entry.title', 'Entry.body', 'Entry.created', 'Entry.user_id', 'Entry.discution', 'Entry.subject_id', 'Entry.id', 'User.username', 'Subject.title', 'Subject.id')
+  );
+
  public function beforeFilter() 
  {
@@ -25 +28 @@
  } 
  
+ public function display($username = null) 
+ {
+   if ($username == null):
+           $this->redirect("/");
+           return false;
+   endif;
+     
+   $this->pageTitle = $username . '\'s Blog';
+        
+   $user_id  = $this->Entry->User->field('id', array('username'=>$username));
+        
+   $conditions = array('Entry.user_id'=>$user_id, 'Entry.status'=>1);
+     
+   $data = $this->paginate('Entry', $conditions);
+     
+   $this->set(compact('data'));
+     
+   $this->layout    = $this->Edublog->layout($user_id);
+     
+   $this->Edublog->blog($user_id);
+ }
+ 
+ public function view($username, $entry_id) 
+ {
+  if ($entry_id == null):
+           $this->redirect('/blog/'.$username);
+           return false;
+  endif;
+     
+  $this->pageTitle = $username . '\'s Blog';
+     
+  $user_id = $this->Entry->User->field('User.id', array("username"=>$username));
+     
+  if ($username == null || $user_id == null):
+           $this->redirect("/");
+           return false;
+  endif;
+     
+  $conditions = array('Entry.user_id'=>$user_id, 'Entry.status'=>1, 'Entry.id'=>$entry_id);
+     
+  $fields   = array("Entry.title", "Entry.body", "Entry.created", "Entry.user_id", "Entry.discution", "Entry.subject_id", "Entry.id", "User.username", "Subject.title", "Subject.id");
+          
+  $this->set('data', $this->Entry->find($conditions, $fields)); 
+     
+  $this->layout    = $this->Edublog->layout($user_id);
+     
+  $this->Edublog->blog($user_id); // blogger elements
+ }
+ 
+
  public function rss($username)
  {

trunk/app/controllers/users_controller.php

@@ -41 +41 @@
      if ($username == null):
            $this->redirect("/");
+           return false;
      endif;
      
@@ -56 +57 @@
      
      $limit      = 7;
-     
-     $this->set('data', $this->User->Entry->findAll($conditions, $fields, $order, $limit)); 
+
+     //$this->set('data', $this->News->findAll($conditions, $fields, $order, $limit));
+     $data = $this->paginate('Entry', array('Entry.status = 1'));
+     
+     $this->set(compact('data'));
+     
+     //$this->set('data', $this->User->Entry->findAll($conditions, $fields, $order, $limit)); 
      
      $this->layout    = $this->Edublog->layout($user_id);

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

@@ -19 +19 @@
 msgid  "where_pin"
 msgstr "Where is my PIN?"
+
+msgid  "participa"
+msgstr "It's advisable to have your participation recorded on your own computer. Before you write here, write and save your participation using a simple text editor like Wordpad or Gedit. After you have done this, copy it and paste it here. Your participation should be plain text, without any format, tables or images."

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

@@ -1 +1 @@
 msgid  "Group"
 msgstr "Grupo"
+
+msgid  "Groups"
+msgstr "Grupos"
 
 msgid  "Email"
@@ -368 +371 @@
 msgstr "Recordarme"
 
-msgid  "part_advice"
+msgid  "participa"
 msgstr "Es una buena costumbre mantener tu propio registro de participaciones, antes de ecribir aquí, escribe y guarda tu particación usando un editor  de texto sencillo como Wordpad o Gedit, luego copia y pegala aquí. La participación debe ser texto plano sin formato, sin tablas ni imágenes."

trunk/app/views/elements/vclassrooms.ctp

@@ -1 +1 @@
 <?php
-echo $html->div('temas','Groups');
+echo $html->div('temas', __('Groups', true));
 
-foreach ($blog['Vclassroom'] as $val) 
-{
-  echo $html->link($val['name'], '/vclassrooms/show/'.$val['user_id'].'/'. $val['id'], array("class"=>"petit")) . "<br />\n";
-}
+foreach ($blog['Vclassroom'] as $val):
+   echo $html->link($val['name'], '/vclassrooms/show/'.$val['user_id'].'/'. $val['id'], array("class"=>"petit")) . "<br />\n";
+endforeach;
 ?>
 

trunk/app/views/entries/display.ctp

@@ -13 +13 @@
   e($html->div('body_entry', $val['Entry']['body']));
     
-  $pl = 'Permalink: http://' . $_SERVER['SERVER_NAME'] . '/users/entry/'.$val["User"]["username"].'/'.$val['Entry']['id'];
+  $pl = 'http://' . $_SERVER['SERVER_NAME'] . '/entries/view/'.$val['User']['username'].'/'.$val['Entry']['id'];
     
-  e($html->div('plink',$html->link($pl, '/users/entry/'.$val["User"]["username"].'/'.$val['Entry']['id'])));
+  e($html->div('plink',$html->link('Permalink: '.$pl, $pl)));
     
   if ( $val['Entry']['discution'] == 1):  //is the comments in this entry actived and is an individual entry?
-    e($html->div('plink', $html->image('static/comentarios.gif', array('alt'=>__('Add comment', true))).'  '.$html->link(__('Add comment', true).'  ('.count($val['Comment']).')', '/users/entry/'.$val['User']['username'].'/'.$val['Entry']['id'])));
+    e($html->div('plink', $html->image('static/comentarios.gif', array('alt'=>__('Add comment', true))).'  '.$html->link(__('Add comment', true).'  ('.count($val['Comment']).')', $pl)));
   endif;
 endforeach;
+
+$paginator->options(array('url' => $val['User']['username']));
+
+$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->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/entries/view.ctp

@@ -10 +10 @@
  e($html->div('body_entry', $data['Entry']['body']));
     
- $pl = 'Permalink: http://' . $_SERVER['SERVER_NAME'] . '/users/entry/'.$blog['User']['username'].'/'.$entry_id;
+ $pl = 'http://' . $_SERVER['SERVER_NAME'] . '/entries/view/'.$blog['User']['username'].'/'.$entry_id;
  
- e($html->div('plink', $html->link($pl, '/users/entry/'.$blog['User']['username'].'/'.$entry_id)));
+ e($html->div('plink', $html->link('Permalink: '. $pl, $pl)));
         
- if ( $discution == 1 )  //is the comments in this entry actived by blogger?
- {
+ if ( $discution == 1 ):  //is the comments in this entry actived by blogger?
+ 
    if ( $session->check('Auth.User') ):  // if user logged, anchor to textarea
         echo  $html->div(null, $html->image('static/comment.gif', array('alt'=>'Comments')) . '  Comments:', array('id'=>'comments'));  
@@ -39 +39 @@
         
         echo $form->create('Comment', array('onsubmit'=>'return chkForm()', 'action'=>'add'));
-        echo $form->hidden('Comment.redirect_to', array('value'=>'/users/entry/'.$blog['User']['username'].'/'.$entry_id));
+        echo $form->hidden('Comment.redirect_to', array('value'=>'/entries/view/'.$blog['User']['username'].'/'.$entry_id));
         echo $form->hidden('Comment.entry_id', array('value'=>$entry_id));
         
@@ -55 +55 @@
             echo $form->error('Comment.comment', 'A comment is required.'); 
          
-            echo $form->end('Send'); 
+            echo $form->end(__('Send', true)); 
             echo '</fieldset>';        
     else:
-            echo $html->para(null, $html->link('You must be logged in to write a comment', '/users/login'));
+            echo $html->para(null, $html->link(__('You must be logged in to write a comment', true), '/users/login'));
     endif;
          
          echo "</div>";
-  }
+ endif;
 ?>
 <script type="text/javascript">

trunk/app/views/vclassrooms/participation.ctp

@@ -1 +1 @@
 <?php
-echo $html->div('hint', 'It\'s advisable to have your participation recorded on your own computer. Before you write here, write and save your participation using a simple text editor like Wordpad or Gedit. After you have done this, copy it and paste it here. Your participation should be plain text, without any format, tables or images.');
+echo $html->div('hint', __('participa', true));
  
 echo $form->create('Participation', array('action'=>'add', 'onsubmit'=>'return validateForm()'));