Changeset 345

Timestamp:

03/13/10 11:14:02 (23 months ago)

Author:

aarkerio

Message:

Update Shares

Location:

trunk

Files:

• controllers/shares_controller.php (modified) (2 diffs)
• views/shares/admin_listing.ctp (modified) (5 diffs)

trunk/controllers/shares_controller.php

@@ -33 +33 @@
   endif;
       
-  $fields     = array('id', 'title', 'description', 'created', 'lenght', 'user_id', 'filename');
-  $order      = 'id DESC';
-  $limit      = 12;
+  $params = array(
+                  'conditions' => $conditions,
+                  'fields'     => array('id', 'title', 'description', 'created', 'lenght', 'user_id', 'filename'),
+                  'order'      => 'id DESC',
+                  'limit'      => 12
+                  );
       
   $this->set('data', $this->Share->find('all', $params)); 
  }
  
- public function show($user_id, $id)
+/**
+ * @param mixed Null or string $username
+ * @param mixed Null or integer $entry_id
+ * @access public
+ * @return void
+ */
+ public function show($user_id, $share_id)
  {   
    $this->layout    = $this->Edublog->layout($user_id);
    $this->set('blog', $this->Edublog->blog($user_id));
    $this->pageTitle = 'Share';
-   $params = array('conditions' => array('Share.id'=>$id, 'Share.status'=>1),
+   $params = array('conditions' => array('Share.id'=>$share_id, 'Share.status'=>1),
                    'fields'     => array('id', 'title', 'description', 'created', 'filename', 'length', 'size', 'duration'));
-   $this->set('data', $this->Share->find('all',$params));
+   $this->set('data', $this->Share->find('first',$params));
   }
   
 /**
- *
- *
+ * @param mixed Null or string $username
+ * @param mixed Null or integer $entry_id
+ * @access public
+ * @return void
  */
- public function all($username=null, $entry_id=null) 
+ public function all($username=Null, $entry_id=Null) 
  {
    $this->pageTitle = $username . '\'s Share';
@@ -81 +92 @@
   }
   
-  /****==== ADMIN METHODS ====**/
-  public function admin_listing()
-  {     
-    $this->layout = 'admin';     
-    $this->pageTitle = $this->Auth->user('username') . '\'s Shares';
-    
-    $params = array('conditions'   => array('Share.user_id'=>$this->Auth->user('id')),
-                    'fields'       => array('id', 'file', 'created', 'public', 'description'),
-                    'order'        => 'Share.id DESC',
-                    'limit'        => 20);
-        
-   $this->set('data', $this->Share->find('all', $params)); 
+ /****==== ADMIN METHODS ====**/
+ public function admin_listing()
+ {     
+  $this->layout = 'admin'; 
+  $this->pageTitle = $this->Auth->user('username') . '\'s Shares';
+  $this->paginate['limit']   = 20;
+  $this->paginate['fields'] = array('Share.id', 'Share.file', 'Share.description', 'Share.public', 'Share.created');
+  $this->paginate['conditions'] = array('Share.user_id'=>$this->Auth->user('id'));
+  $this->paginate['order']      = 'Share.id DESC';
+  $data = $this->paginate('Share');
+  $this->set(compact('data'));
   }
     

trunk/views/shares/admin_listing.ctp

@@ -1 +1 @@
 <?php 
 echo $html->div('title_section',  $session->read('Auth.User.username').' shared files');
-echo $html->link($html->image('admin/new.gif', array('alt'=>'Add new share', 'title'=>'Add new share')), '#', array("onclick"=>"hU()"), false, false); 
+echo $html->link($html->image('admin/new.gif', array('alt'=>'Add new share', 'title'=>'Add new share')), '#', array("onclick"=>"hU()"), False, False); 
 $session->flash(); 
 ?>
-
 <div id="addshare" style="display:none">
 <?php echo $form->create('Share', array("enctype"=>"multipart/form-data") ); ?>
@@ -21 +20 @@
 
 <?php
-//die(print_r($data));
-
-$th = array ('Download', 'File', 'Size Kb', 'Description', 'Public', 'Delete');
+ $th = array ('Download', 'File', 'Size Kb', 'Description', 'Uploaded', 'Public', 'Delete');
 echo $html->tableHeaders($th);
 foreach ($data as $val):
-       $st = ($val['Share']['public'] == 1) ? 'Public': 'No public';
-       $size = filesize('../webroot/files/userfiles/'.$val['Share']['file']);
-       $sizemb = round(($size/1024),2);
-       $tr = array (
+    $st = ($val['Share']['public'] == 1) ? 'Public': 'No public';
+    $size = filesize('../webroot/files/userfiles/'.$val['Share']['file']);
+    $sizemb = round(($size/1024),2);
+    $tr = array (
                $html->link(
                            $html->image('static/button_download.gif', array('alt'=>"Download file", 'alt'=>"Download file")),
@@ -36 +33 @@
                            False, 
                            False),
-        $val['Share']['file'],
-            $sizemb,
-        $val['Share']['description'],
-        $html->link($st, '/admin/shares/change/'.$val['Share']['id'].'/'.$val['Share']['public']),
-        $gags->confirmDel($val['Share']['id'], 'shares')
-        );
+    $val['Share']['file'],
+        $sizemb,
+    $val['Share']['description'],
+    '<span style="font-size:7pt;">'.$val['Share']['created'].'</span>',
+    $html->link($st, '/admin/shares/change/'.$val['Share']['id'].'/'.$val['Share']['public']),
+    $gags->confirmDel($val['Share']['id'], 'shares')
+    );
        
     echo $html->tableCells($tr, array('class'=>"altRow", "onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='altRow'"), 
@@ -48 +46 @@
 ?>
 </table>
-
+<?php
+echo  $html->div(null,null, array('style'=>'font-size:9pt;width:400px;margin:15px auto;'));
+    echo $html->div(null,$paginator->prev('« '.__('Previous', true),null,null,array('class'=>'disabled')),
+                                         array('style'=>'width:100px;float:left'));
+    echo $html->div(null,$paginator->next(__('Next', true).' »', null, null, array('class' => 'disabled')),
+                                         array('style'=>'width:100px;float:right'));
+    echo $html->div(null,$paginator->counter(), array('style'=>'width:200px;float:center'));
+echo '</div>';
+?>
 <script type="text/javascript"> 
 <!-- 
@@ -64 +70 @@
 -->
 </script>
-
-