Changeset 637

Timestamp:

07/10/08 17:53:04 (3 months ago)

Author:

aarkerio

Message:

Litle changes

Location:

trunk/app

Files:

• controllers/entries_controller.php (modified) (7 diffs)
• controllers/lessons_controller.php (modified) (2 diffs)
• controllers/users_controller.php (modified) (1 diff)
• locale/spa/LC_MESSAGES/default.po (modified) (2 diffs)
• views/entries/admin_listing.ctp (modified) (2 diffs)
• views/layouts/rubyx.ctp (modified) (1 diff)
• views/lessons/admin_listing.ctp (modified) (1 diff)
• views/lessons/display.ctp (modified) (2 diffs)

trunk/app/controllers/entries_controller.php

@@ -11 +11 @@
 
 uses('sanitize');
-uses('l10n');
+
 
 class EntriesController extends AppController {
@@ -126 +126 @@
     $this->Entry->create();
       
-        if ($this->Entry->save($this->data["Entry"])): 
+        if ($this->Entry->save($this->data)): 
            if ( $this->data["Entry"]["end"] == 1 ):     // edition ends
-                     $this->msgFlash('Story has been added', '/admin/entries/listing');
+                     $this->msgFlash(__('Entry saved', true), '/admin/entries/listing');
    
            else:           //edition continue
                      $id = $this->Entry->getLastInsertID();
-                     $this->msgFlash('Story has been added', '/admin/entries/edit/'.$id);
+                     $this->msgFlash(__('Entry saved', true), '/admin/entries/edit/'.$id);
            endif;
         endif;
@@ -149 +149 @@
     $this->layout = 'admin';      
 
-    $conditions = array("Entry.user_id"=>$this->Auth->user('id'));
-       
-    $fields     = null;
-
-    $order      = 'Entry.id DESC';
-       
-    $limit      = 20;
-       
-    $this->set('data', $this->Entry->findAll($conditions, $fields, $order, $limit));
+    $this->paginate['limit'] = 10;
+
+    $this->paginate['fields'] = array('Entry.title', 'Entry.body', 'Entry.created', 'Entry.status', 'Entry.user_id', 'Entry.discution', 'Entry.subject_id', 'Entry.id', 'User.username', 'Subject.title', 'Subject.id');
+ 
+    $this->paginate['conditions'] = array("Entry.user_id"=>$this->Auth->user('id'));    
+     
+    $data = $this->paginate('Entry');
+     
+    $this->set(compact('data'));
+  
  }
   
@@ -166 +167 @@
    $this->set('subjects',Set::combine($this->Entry->Subject->find('all',array('order'=>'title')),"{n}.Subject.id","{n}.Subject.title"));
      
-     if (empty($this->data['Entry']))
-     {
-         $this->data = $this->Entry->read(null, $id);
-     }
-     else
-     { 
+   if (empty($this->data['Entry'])):
+         $this->data = $this->Entry->read(null, $id);  
+   else:
          $this->Sanitize = new Sanitize;
       
@@ -182 +180 @@
                      $this->redirect('/admin/entries/listing');
              else:
-                     $this->msgFlash('Entry has been updated','/admin/entries/edit/'.$this->data['Entry']['id']);
+                     $this->msgFlash(__('Entry saved', true),'/admin/entries/edit/'.$this->data['Entry']['id']);
          endif;
      endif;
-     }
+     endif;
   }
  // change status enabled/disabled actived
@@ -195 +193 @@
      
     if ($this->Entry->save($this->data['Entry'])):
-    $this->msgFlash('Entry status changed', '/admin/entries/listing');
+    $this->msgFlash(__('Status modified', true), '/admin/entries/listing');
     endif;
  }
@@ -210 +208 @@
  {
    if ( $this->Entry->del($id)):
-             $this->msgFlash('The entry has been deleted.', '/admin/entries/listing');
+             $this->msgFlash(__('Data deleted',true), '/admin/entries/listing');
    endif;
   }

trunk/app/controllers/lessons_controller.php

@@ -17 +17 @@
  
  public $components    = array('Edublog');
+
+ public $paginate = array('limit' => 20, 'page' => 1);
  
  public function beforeFilter() 
@@ -45 +47 @@
  public function display($username) 
  { 
-        $user_id           = $this->Lesson->User->field('id', array('User.username'=>$username));
+   $user_id           = $this->Lesson->User->field('id', array('User.username'=>$username));
 
-        $this->pageTitle = $username .'\'s Lessons';
+   $this->pageTitle = $username .'\'s Lessons';
         
-        $conditions      = array("Lesson.status"=>1, "Lesson.user_id"=>$user_id);
+   $this->paginate['conditions']  = array('Lesson.status'=>1, 'Lesson.user_id'=>$user_id);
+   
+   $this->paginate['fields']      = array("id", "title", "created", "user_id");
+            
+   $this->paginate['order']       = array('Lesson.title' => 'DESC');
+
+   $data = $this->paginate('Lesson');
+     
+   $this->set(compact('data'));
+
+   $this->layout    = $this->Edublog->layout($user_id);
         
-        $fields          = array("id", "title", "created", "user_id");
-       
-        $order           = "Lesson.title";
-        
-        $this->set('data', $this->Lesson->findAll($conditions, $fields, $order)); 
-        
-        $this->layout    = $this->Edublog->layout($user_id);
-        
-        $this->Edublog->blog($user_id); // blogger elements
-    }
+   $this->Edublog->blog($user_id); // blogger elements
+ }
     
     /***   === ADMIN METHODS   ****/

trunk/app/controllers/users_controller.php

@@ -572 +572 @@
  public function admin_backup() 
  {
-       $this->layout  = 'admin';
-       
-       $conditions    = array("User.id"=>$this->Auth->user('id'));
-
-       $this->User->unbindModel(array('hasMany' => array('Confirm')));
-
-       $this->User->bindModel(
-            array('hasMany' => array(
-                 'Image' => array(
-                                 'className' => 'Image'
-                                              )
-                             )
-                 )
-                          );
-              
-       $this->set('data', $this->User->find($conditions));       
+     
+   $output_file = sprintf($DB_NAME."_%s.db", date("Ymd-hi"));
+   $DB_EXPORT_PATH ='';
+   system("pg_dump -u ".$DB_NAME." < ".AUTH_USER_FILE_PATH." > ".DB_EXPORT_PATH.$output_file);
+   $this->autoRender = false;
+   Configure::write('debug', 0);
+   header("Content-disposition: attachment; filename=".$output_file);
+   header("Content-type: application/octet-stream; name=".$output_file);
+   $result = file_get_contents(DB_EXPORT_PATH.$output_file);
+   print($result);
+   return true;
  }
 

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

@@ -17 +17 @@
 msgstr "Eliminar"
 
+msgid  "Date deleted"
+msgstr "Registro eliminado"
+
 msgid  "Layout"
 msgstr "Diseño"
@@ -106 +109 @@
 msgid  "Edit Entry"
 msgstr "Editar entrada"
+
+msgid  "Entry saved"
+msgstr "Entrada guardada"
 
 msgid  "Entry"

trunk/app/views/entries/admin_listing.ctp

@@ -1 @@
-<script type="text/javascript">
-   window.onload = timedMsg;
-</script>
 <?php 
 //die(debug($session->read('Auth.User.email')));
-
-$session->flash(); 
  
 echo $html->addCrumb('Control Panel', '/admin/entries/start');
@@ -34 +29 @@
 </table>
 
-<?php 
+<?php
+$paginator->options(array('url' => $val['User']['username']));
 
-//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/layouts/rubyx.ctp

@@ -55 +55 @@
   <?php 
     
-     echo ($this->action == 'blog' || $this->action == 'entry') ? '<li id="active">' : '<li>'; ?>  
+     echo ($this->action == 'display' || $this->action == 'entry') ? '<li id="active">' : '<li>'; ?>  
      <a href="/blog/<?php echo $blog['User']['username'] ?>">eduBlog<span class="tab-l"></span><span class="tab-r"></span></a></li> 
                      

trunk/app/views/lessons/admin_listing.ctp

@@ -29 +29 @@
 </table>
 
-<?php //echo $pagination; 
+<?php 
+$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/lessons/display.ctp

@@ -1 @@
-<h2>Lessons</h2>
 <?php
-//die(print_r($data));
+//die(debug($blog));
+echo $html->div('title_section', __('Lessons', true));
 
 if ( count($data) < 1 ):
@@ -10 +10 @@
   echo $html->para(null, $html->link($v['Lesson']['title'], '/lessons/view/'.$blog['User']['username'].'/'.$v['Lesson']['id'], array("class"=>"title")));
 endforeach;
+
+$paginator->options(array('url' => $blog['User']['username']));
+
+$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;'));
 ?>