Changeset 41

Timestamp:

07/16/07 22:42:26 (18 months ago)

Author:

aarkerio

Message:

Newsletters

Location:

trunk/app

Files:

• config/routes.php (modified) (1 diff)
• controllers/components/search.php (added)
• controllers/entries_controller.php (modified) (4 diffs)
• controllers/news_controller.php (modified) (1 diff)
• controllers/newsletters_controller.php (modified) (4 diffs)
• controllers/podcasts_controller.php (modified) (2 diffs)
• controllers/users_controller.php (modified) (5 diffs)
• views/elements/menu_b.thtml (modified) (1 diff)
• views/layouts/default.thtml (modified) (1 diff)
• views/newsletters/all.thtml (added)
• views/newsletters/subscribe.thtml (modified) (1 diff)
• views/users/bloggers.thtml (modified) (1 diff)

trunk/app/config/routes.php

@@ -14 +14 @@
  * developement.
  */
-    $Route->connect('/tests', array('controller' => 'tests', 'action' => 'index'));
+      $Route->connect('/blog/*/', array('controller'=>'Users', 'action'=>'blog'));
 ?>

trunk/app/controllers/entries_controller.php

@@ -39 +39 @@
    }
    
-   public function search()
-   {    
+   function search($keywords = '') 
+   {
         $this->layout = 'portal';
         
@@ -47 +47 @@
         $this->set('Element', $this->Portal->statics()); // Charge Portal components aka Sidebars
         
-         /* if (!empty($this->data["Entry"]) ) 
-        {   
-            $data = $this->Lucene->query($this->data['Entry']['terms']);
-            
-            $this->set('data', $data);
-        } */
-   }
+        $searchFields = array('Entry.title', 'Entry.body', 'News.body', 'Page.body');
+        
+        $this->set('data', $this->Search->query($this->Product, $keywords, $searchFields, ALL, ANYWHERE));
+    }
    
    /** ====  ADMIN SECTION ====*/
@@ -118 +115 @@
      $this->layout    = 'admin';
      
-     $this->set('categories', $this->Entry->Category->generateList());
+     $this->set('subjects', $this->Entry->Subject->generateList());
      
      if (empty($this->data))
@@ -129 +126 @@
          if ($this->Entry->save($this->data['Entry']))
          {
-             $this->flash('Your entry has been updated.', '/admin/entries/listing');
+             $this->msgFlash('The story has been updated.', '/admin/entries/listing');
          }
      }

trunk/app/controllers/news_controller.php

@@ -63 +63 @@
         $fields     = array("News.id", "News.title", "News.comments", "News.body", "News.created", "News.reference", "News.theme_id", "News.user_id", "Theme.img", "Theme.theme", "User.username");
         
-        $this->pageTitle = 'Hacktivismo';
+        $this->pageTitle = '::News';
         
         $this->set('data', $this->News->find($conditions, $fields, null, 1));

trunk/app/controllers/newsletters_controller.php

@@ -6 +6 @@
     *  Chipotle Software
   */ 
-
-loadModel('User');
-loadModel('Entry');
 
 class NewslettersController extends AppController
@@ -18 +15 @@
     public function subscribe()
     {
+         $this->layout = 'portal';
          $this->set('Element', $this->Portal->statics()); // Charge Portal components aka Sidebars
     }
@@ -61 +59 @@
         $this->layout = 'admin';
         
-        $conditions   = array("News.user_id" => $this->othAuth->user('id') );             // only the user's news
+        $conditions   = array("Newsletter.status" => 1);             // only the user's news
         $fields       = array("id", "title", "body", "created", "reference", "status", "subject_id", "user_id");
-        $order        = "News.id DESC";
+        $order        = "Newsletter.id DESC";
         $limit        = 12;
         
@@ -69 +67 @@
   }
   
-    public function  all($subject_id = null)
-    {
-     $conditions = array("News.status"=>1);
+  public function all($page=1)
+  {  
+     $this->layout = 'portal';
      
-     if ($subject_id != null)
-     {
-         $conditions["News.subject_id"] = $subject_id;
-     }
+     $conditions   = array("Newsletter.status"=>1);
+     $fields       = array("Newsletter.id", "Newsletter.title", "Newsletter.body", "Newsletter.created", "Newsletter.user_id");
+     $order        = "Newsletter.id DESC";
+     $limit        = 20;
      
-     $fields     = array("id", "title", "body", "created", "reference", "subject_id", "user_id");
-     $order      = "News.id DESC";
-     $limit      = 12;
-      
-         // move task from todo to done
-         $data = $this->Newsletter->findAll($conditions, $fields, $order, $limit, null, true);
-     //die(print_r($data));
-     $this->set('data', $data);
+     $this->set('data', $this->Newsletter->findAll($conditions, $fields, $order, $limit));
      
-     $this->set('subjects', $this->Portal->cms()); // Using Portal component
-     
-     $this->set('randomQuote', $this->Portal->quote()); // quote footer
+     $this->set('Element', $this->Portal->statics()); // Using Portal component
     }
     
-    public function  delete($id) {
-      
-       // deletes new from database
-       
+   public function admin_delete($id) 
+   {
       if ( $this->Newsletter->del($id) )
       {
-            $this->flash('Your new have been removed', '/news/listing');
+            $this->msgFlash('Your new have been removed', '/admin/newsletters/listing');
       }
       else
       {
-            $this->flash('Database error!', '/news/listing');
-      }
-    
+            $this->msgFlash('Database error!', '/admin/newsletters/listing');
+      }   
     }
 }

trunk/app/controllers/podcasts_controller.php

@@ -63 +63 @@
     }
   
-  public function all($username=null, $entry_id=null) {   
+  public function all($username=null, $entry_id=null) 
+  {     
+        $this->layout = 'portal';
+        
         $this->pageTitle = $username . '\'s Podcast';
         
@@ -88 +91 @@
         $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit, null, true)); 
         
-        $this->set('subjects', $this->Portal->cms()); // Using Portal component
-        
-        $this->set('randomQuote', $this->Portal->quote()); // quote footer
+        $this->set('Element', $this->Portal->statics()); // Using Portal component
     }
     

trunk/app/controllers/users_controller.php

@@ -15 +15 @@
 loadModel('Catfaq');
 loadModel('Cover');
-loadModel('Poll');
 loadModel('News');
 loadModel('Confirm');
@@ -23 +22 @@
     public $helpers          = array('Ajax', 'Form', 'User', 'Fck');
     
-    public $components       = array('Edublog', 'Portal', 'Email', 'Adds');
-    
-    public $displayField     = 'title';
+    public $components       = array('Security', 'Edublog', 'Portal', 'Email', 'Adds', 'Mypagination');
     
     public function index($id = null)
@@ -34 +31 @@
     }
     
-    public function blog($user_id, $entry_id = null)
-    {   
-        $this->pageTitle = 'Karamelo Blog';
+    public function blog($username = null, $page=1) 
+    {
+        $this->layout    = 'blog';
+        
+        $this->pageTitle = $username . '\'s Blog';
+        
+        $this->Entry     = new Entry;
+        
+        $user_id = $this->User->field("id", array("username"=>$username));
+        
+        //exit($user_id);
+        
+        if ($username == null || $user_id == null)
+        {
+           $this->redirect("/");
+        }
+        
+        $order    = "Entry.id DESC";
+        
+        $fields   = array("Entry.title", "Entry.body", "Entry.created", "Entry.user_id", "Entry.discution", "Entry.themeblog_id", "Entry.id", "User.username", "Themeblog.title", "Themeblog.id");
+        
+        //pagination
+        $total_rows = $this->Entry->findCount(array("Entry.user_id"=>$user_id, "Entry.status"=>1)); 
+        
+        $lmt        = 10; // limit news
+        
+        $targetpage = "/blog/".$username."/";
+        
+        $pagination = $this->Mypagination->init($total_rows, $page, $lmt, $targetpage); //Pagination
+        
+        $this->set('pagination', $pagination);
+        
+        $offset     = (($page * $lmt) - 10);
+        
+        $limit      = $lmt . " OFFSET " . $offset;
+        
+        $conditions = array("Entry.user_id"=>$user_id);
+        
+        $this->set('data', $this->Entry->findAll($conditions, $fields, $order, $limit)); 
         
         $this->layout    = $this->Edublog->layout($user_id);
         
         $this->set('blog', $this->Edublog->blog($user_id));
-        
-        $this->set('Entry_id', $entry_id);
-        
-        // blog entries
-        $this->Entry = new Entry;
-        
-        $conditions      = array("Entry.status"=>1, "Entry.user_id"=>$user_id);
-        
-        if ($entry_id != null)
-        {
-           $conditions["Entry.id"] = $entry_id;
-        }
-        
-        $fields     = array("id", "title", "body", "created", "disc", "category_id", "user_id");
-        $order      = "Entry.id DESC";
-        $limit      = 10;
-        
-        $this->set('data', $this->Entry->findAll($conditions, $fields, $order, $limit, null, 2)); 
     }
     
@@ -95 +110 @@
         {
              $this->data["User"]["passwd"] = md5($this->data["User"]["passwd"]); // MD5 
-        } else {
+        } 
+        else 
+        {
              unset($this->data["User"]["passwd"]);      
         }
-
+        
         if ($this->User->save($this->data['User']))
         {
-            $this->flash('User has been updated.','/entries/');
+            $this->msgFlash('User has been updated.','/admin/users/listing');
         }
     }
@@ -138 +155 @@
         
         $this->set('Element', $this->Portal->statics()); // Using Portal component
-    }
-    
-    public function general()
-    {
-        $this->layout    = 'portal';
-        
-        $this->pageTitle = 'Welcome :: Karamelo E-learning on Web 2.0';
-        
-        $this->set('Element', $this->Portal->statics()); // Using Portal component
-        
-        /**********  News  ****/
-        
-        $this->News = new News;  //Instantiate the model
-        
-        $conditions = array("News.status"=>1);
-        $fields     = array("News.id", "News.title", "News.body", "News.created", "News.reference", "News.subject_id", "News.user_id");
-        $order      = "News.id DESC";
-        $limit      = 1;
-        
-        $this->pageTitle = 'Karamelo E-learning on Web 2.0';
-        
-        $lastNew = $this->News->findAll($conditions, $fields, $order, $limit);
-        
-        $this->set('new', $lastNew);
-        
     }
     

trunk/app/views/elements/menu_b.thtml

@@ -1 +1 @@
 <div id="menu_div">
-   <a class="nav" href="/news/all/" title="News">News</a>
    <a class="nav" href="/users/bloggers/" title="eduBlogs">eduBlogs</a>
    <a class="nav" href="/podcasts/all/" title="Podcast">Podcast</a>
    <a class="nav" href="/users/directory/" title="Directory">Directory</a>
-   <a class="nav" href="/newsletters/subscribe/" title="Newsletter">Newsletter</a>
+   <a class="nav" href="/newsletters/subscribe/" title="Newsletter">Newsletters</a>
+   <a class="nav" href="/events/view/" title="Coming soon">Events Calendar</a>
 </div>

trunk/app/views/layouts/default.thtml

@@ -1 +1 @@
 <html>
 <head>
-<title>::MonoNeurona::</title>
+<title>::Karamelo e-Learning::</title>
 <style type="text/css">
 body {

trunk/app/views/newsletters/subscribe.thtml

@@ -1 @@
-<?php echo $html->formTag('/nlemails/add', 'post', array('onsubmit'=>'return false')); ?>
+<?php echo $html->formTag('/newsletters/add', 'post', array('onsubmit'=>'return false')); ?>
 
 <fieldset>
   <legend>Subscribe:</legend>
      
-     <?php echo $form->labelTag('Nlemails/email', 'Email:' );?><br />
-     <?php echo $html->input('Nlemails/email', array("size" => 25, "maxlength" => 50)); ?>
+     <?php echo $form->labelTag('Newsletter/email', 'Email:' );?><br />
+     <?php echo $html->input('Newsletter/email', array("size" => 25, "maxlength" => 50)); ?>
      <br /><br />
      <?php echo $html->submit('Send'); ?>
 </fieldset>
 </form>
+
+<br />
+
+<?php
+      echo $html->link('View pass newsletters', '/newsletters/all');
+?>

trunk/app/views/users/bloggers.thtml

@@ -6 +6 @@
 
 <?php
-foreach ($data as $key => $val) {
+foreach ($data as $key => $val) 
+{
     echo '<p><b>Docent</b>: '.$data[$key]['User']['name'].' <br />';
-    echo 'blog: <a href="/users/blog/'.$data[$key]['User']['id'].'/">'.$data[$key]['User']['name_blog'].'</a></p>';
+    echo 'blog: <a href="/blog/'.$data[$key]['User']['username'].'">'.$data[$key]['User']['name_blog'].'</a></p>';
 }
 ?>