Changeset 648

Timestamp:

07/11/08 19:02:40 (3 months ago)

Author:

aarkerio

Message:

Feeders

Location:

trunk/app

Files:

• config/sql/postgresql/podcasts.sql (modified) (1 diff)
• controllers/news_controller.php (modified) (1 diff)
• controllers/podcasts_controller.php (modified) (2 diffs)
• models/podcast.php (modified) (1 diff)
• views/layouts/rubyx.ctp (modified) (1 diff)
• views/news/rss/rss.ctp (modified) (2 diffs)
• views/podcasts/admin_add.ctp (modified) (2 diffs)
• views/podcasts/rss/rss.ctp (modified) (1 diff)

trunk/app/config/sql/postgresql/podcasts.sql

@@ -4 +4 @@
 "title" varchar(50) NOT NULL DEFAULT '', 
 "description" varchar(255) NOT NULL DEFAULT '', 
-"keywords" varchar(100) NOT NULL, 
+"keywords" varchar(100), 
 "created" timestamp(0) with time zone DEFAULT now() NOT NULL, 
 "length" varchar(10) NOT NULL DEFAULT 0,

trunk/app/controllers/news_controller.php

@@ -86 +86 @@
    $this->News->unbindModel(array('hasMany'=>array('Discussion')));
 
-   $news = $this->News->findAll($conditions, $fields, $order, $limit);
+   $newss = $this->News->findAll($conditions, $fields, $order, $limit);
    
-   $this->set(compact('channelData', 'news'));    
+   $this->set(compact('channelData', 'newss'));    
  }
   

trunk/app/controllers/podcasts_controller.php

@@ -62 +62 @@
  
  public function rss($username) 
- {   
-    $this->layout = "podfeeder";
-    
-    if ($username == null)
-    {
-        $this->redirect('/');
-    }
-    
-    $this->Podcast->User->unbindModel(array('hasMany'=>array('Entry', 'Lesson', 'Category', 'Vclassroom', 'Faq', 'Acquaintance')));
-    
-    $User = $this->Podcast->User->find(array('username'=>$username), array('id', 'username', 'email', 'name_blog', 'avatar'));
+ { 
+   $channelData = array('title'       => 'Karamelo eLearning Portal ',
+                'link'        => array('controller' => 'news', 'action' => 'display'),
+                'url'         => array('controller' => 'news', 'action' => 'display'),
+                'description' => 'Latest news on Karamelo',
+                'language'    => 'en-us'
+               );
+       
+   $this->Podcast->User->unbindAll();
+    
+   $User = $this->Podcast->User->find(array('username'=>$username), array('id', 'username', 'email', 'name_blog', 'avatar'));
     
     $conditions = array("status"=>1, "user_id"=>$User['User']['id']);
@@ -84 +84 @@
     $this->set('User', $User);
 
-    $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit));
+    $podcasts = $this->Podcast->findAll($conditions, $fields, $order, $limit);
+
+    $this->set(compact('channelData', 'podcasts'));
  }
    

trunk/app/models/podcast.php

@@ -20 +20 @@
 
    public $validate = array(
-      'login' => '/[a-z0-9\_\-]{3,}$/i',
-      'password' => VALID_NOT_EMPTY,
-      'username' => VALID_NOT_EMPTY,
-      'email' => VALID_EMAIL
+      'title'       => VALID_NOT_EMPTY,
+      'description' => VALID_NOT_EMPTY
    ); 
 /*

trunk/app/views/layouts/rubyx.ctp

@@ -86 +86 @@
 <?php
  e($html->link('Blog', '/entries/rss/'.$blog['User']['username'] . '.rss'). ' / '); 
- e($html->link('Podcast', '/podcasts/rss/'.$blog['User']['username'].'rss'));
+ e($html->link('Podcast', '/podcasts/rss/'.$blog['User']['username'].'.rss'));
 ?>
 </div> 

trunk/app/views/news/rss/rss.ctp

@@ -2 +2 @@
 function rss_transform($item)
 {
- die(debug());
+ 
  return array('title' => $item['News']['title'],
              'link' => array('controller'=>'news', 'action' => 'view', $item['News']['id']),
@@ -11 +11 @@
 }
 
-$this->set('items', $rss->items($news, 'rss_transform'));
+$this->set('items', $rss->items($newss, 'rss_transform'));
 ?>

trunk/app/views/podcasts/admin_add.ctp

@@ -1 +1 @@
 <?php 
-  echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
+  echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
   echo $html->addCrumb('Podcasts', '/admin/podcasts/listing');
   echo $html->getCrumbs(' / '); 
 
-  echo $html->div('title_section', 'Add new podcast');
+  echo $html->div('title_section', __('Add new podcast', true));
 
   echo $form->create('Podcast', array("enctype"=>"multipart/form-data") ); 
 ?>
 <fieldset>
-  <legend>New podcast</legend>  
- <?php 
-  echo $form->label('Podcast.file', 'MP3 File:');
+  <legend><?php __('New podcast'); ?></legend>  
+<?php 
+  echo $form->label('Podcast.file', __('MP3 File', true));
   echo $form->file('Podcast.file');
    
-  echo $form->label('Podcast.status', 'Published:');
+  echo $form->label('Podcast.status', __('Published', true));
   echo $form->checkbox('Podcast.status', array('value'=>1)); 
   
-  echo $form->label('Podcast.adult', 'Adult language:');
+  echo $form->label('Podcast.adult', __('Adult language', true));
   echo $form->checkbox('Podcast.adult', array('value'=>1)); 
   
-  echo $form->label('Podcast.karanet', 'Karanet:');
+  echo $form->label('Podcast.karanet', 'Karanet');
   echo $form->checkbox('Podcast.karanet', array('value'=>1));   
 
@@ -28 +28 @@
   echo $form->year('Podcast.created', 1920, 2017, date("Y"), null, false);
   
-  echo $form->label( 'Podcast.subject_id', 'Subject:' ) .'<br />';
+  echo $form->label( 'Podcast.subject_id', __('Subject', true)) .'<br />';
   echo $form->select('Podcast.subject_id', $subjects, null, null, null, false);
 
-  echo $form->input('Podcast.title', array("size" => 25, "maxlength" => 50)); 
+  echo $form->input('Podcast.title', array('size' => 25, 'maxlength' => 50, 'label'=>__('Title', true))); 
 
-  echo $form->label('Podcast.description', 'Description:');
-  echo $form->textarea('Podcast.description', array("rows"=>10, "cols"=>40)) . '</fieldset>';
+  echo $form->label('Podcast.description', __('Description', true));
+  echo $form->textarea('Podcast.description', array('rows'=>8, "cols"=>40));
 
-  echo $form->end('Upload'); 
+  echo $form->end(__('Upload', true)); 
 ?>
+</fieldset>

trunk/app/views/podcasts/rss/rss.ctp

@@ -2 +2 @@
 function rss_transform($item)
 {
- return array('title' => $item['Entry']['title'],
-             'link' => array('controller'=>'entries', 'action' => 'view', $item['User']['username'], $item['Entry']['id']),
-         'guid' => array('controller'=> 'entries','action' => 'view', $item['User']['username'], $item['Entry']['id']),
-           'description' => strip_tags($item['Entry']['body']),
-           'pubDate' => $item['Entry']['created']
+ return array(
+      'title' => $item['Podcast']['title'],
+      'link' => array('controller'=> 'files', 'action' => 'podcasts', $item['Podcast']['filename']),
+      'guid' => array('controller'=> 'files', 'action' => 'podcasts', $item['Podcast']['filename']),
+      'description' => strip_tags($item['Podcast']['description']),
+      'pubDate' => $item['Podcast']['created']
            );
 }
 
-$this->set('items', $rss->items($entries, 'rss_transform'));
+$this->set('items', $rss->items($podcasts, 'rss_transform'));
 ?>