Changeset 274

Timestamp:

02/22/08 22:39:23 (8 months ago)

Author:

aarkerio

Message:

Update karamelo to 1.2 cake version

Location:

trunk/app

Files:

• controllers/colleges_controller.php (modified) (1 diff)
• controllers/components/edublog.php (modified) (1 diff)
• controllers/components/portal.php (modified) (2 diffs)
• controllers/pollrows_controller.php (modified) (1 diff)
• controllers/users_controller.php (modified) (6 diffs)
• views/colleges/view.ctp (modified) (1 diff)
• views/elements/poll.ctp (modified) (3 diffs)
• views/layouts/portal.ctp (modified) (2 diffs)
• views/users/entry.ctp (modified) (5 diffs)

trunk/app/controllers/colleges_controller.php

@@ -40 +40 @@
         $this->set('data', $this->College->find($conditions, $fields));
         
-        //$this->set('Element', $this->Portal->statics()); // Charge Portal components aka Sidebars
+        $this->Portal->statics();   // Charge Portal components aka Sidebars
  }
       

trunk/app/controllers/components/edublog.php

@@ -8 +8 @@
  */
 
-loadModel('User');
+App::import('Model','User');
 
 class EdublogComponent extends Object

trunk/app/controllers/components/portal.php

@@ -1 +1 @@
 <?php 
 /**
- * Portal component By Manuel Montoya.
+ * Portal component By Manuel Montoya. Chipotle Software 2002-2008
  * comments, bug reports are welcome:     manuel _AT_ mononeurona _DOT_ org
  * @author aarkerio
- * @version 0.1
+ * @version 0.2
  * @license GPLv3
- */
-
-loadModel('Section');
-loadModel('Entry');
-loadModel('Quote');
-loadModel('News');
-loadModel('Page');
-loadModel('Poll');
-loadModel('Banner');
-loadModel('User');
-
+ **/
+App::import('Model', 'Section');
+App::import('Model', 'Entry');
+App::import('Model', 'Quote');
+App::import('Model', 'News');
+App::import('Model', 'Page');
+App::import('Model', 'Poll');
+App::import('Model', 'Banner');
+App::import('Model', 'User');
+ 
 class PortalComponent extends Object {
  
- public function startup(&$controller) {
+ public function startup(&$controller) 
+ {
         // This method takes a reference to the controller which is loading it.
         // Perform controller initialization here.
         $this->controller = $controller;
-        
-        $this->User = new User;
  }
  
@@ -35 +33 @@
      $Element["rankPages"] = $this->rankPages();
      $Element["Poll"]      = $this->poll();
-     return $Element;
+     $this->controller->set('Element', $Element);
+
+     return true;
  }
-
  
- private function sections() {
+ private function sections() 
+ {
    
    $conditions = null;

trunk/app/controllers/pollrows_controller.php

@@ -7 +7 @@
 
 class PollrowsController extends AppController
-{
-  public $name          = 'Pollrows';
-  
+{  
   public $helpers       = array('Ajax');
-  
+
+  public function beforeFiler()
+  {
+    $this->Auth->allow('vote');
+    parent::beforeFilter();
+  }  
   public function isAuthorized()
   {

trunk/app/controllers/users_controller.php

@@ -13 +13 @@
   public $helpers          = array('Ajax', 'Fck', 'Gags');
     
-  //public $components       = array('Security', 'Edublog', 'Portal', 'Email', 'Adds');
+  public $components       = array('Edublog', 'Portal', 'Email', 'Adds');
+  public function beforeFiler()
+  {
+    $this->Auth->allow( array('entry', 'about') );
+    parent::beforeFilter();
+  }  
 
   public function isAuthorized() 
@@ -175 +180 @@
         $this->set('cover', $this->Cover->findAll($conditions, $fields, $order, $limit));
         
-        $this->set('Element', $this->Portal->statics()); // Using Portal component
+        $this->Portal->statics(); // Using Portal component
     }
     
@@ -193 +198 @@
         $this->set('cover', $this->Cover->findAll($conditions, $fields, $order, $limit));
 
-        $this->set('Element', $this->Portal->statics()); // Using Portal component
-        
-        
+        $this->Portal->statics(); // Using Portal component
     }
 
@@ -273 +276 @@
         $this->pageTitle = 'Recover password :: Karamelo E-learning on Web 2.0';
         
-        $this->set('Element', $this->Portal->statics()); // Using Portal component
-        
+        $this->Portal->statics(); // Using Portal component 
+
         $this->layout    = 'portal';
  }
@@ -294 +297 @@
  public function login()
  {
-    $this->layout    = 'portal';
-       
-    $this->pageTitle = 'Login :: Karamelo E-learning';
-       
-    //$this->set('Element', $this->Portal->statics()); // Using Portal component
-    
     if ($this->Auth->user()) 
     {
@@ -319 +316 @@
 
             $this->redirect($this->Auth->redirect());
+    }
+    else
+    {
+          $this->Portal->statics(); // Using Portal component
+
+          $this->layout    = 'portal';
+       
+          $this->pageTitle = 'Login :: Karamelo E-learning';
     }
  }

trunk/app/views/colleges/view.ctp

@@ -5 +5 @@
 echo '<div style="padding:5px;">'. $data['College']['description'] .'</div>';
 
-echo '<p>'. $html->linkEmail('Contact us',  $data['College']['email'])          .'</p>';
+echo '<p>'. $html->link('Contact us',  'mailto:'.$data['College']['email'])          .'</p>';
 
 ?>

trunk/app/views/elements/poll.ctp

@@ -42 +42 @@
   else // the user has voted, just print the poll result
   {
-       echo $html->formTag('#','post', array("onsubmit"=>"return false;"));
+    echo $ajax->form();
     
     $array   = array();
@@ -48 +48 @@
     echo "<p><b>" . $Element["Poll"]['Poll']['question'] ."</b></p>";
     
-    echo $html->hiddenTag('Pollrow/poll_id', $Element["Poll"]['Poll']['id']);  // Poll_id
+    echo $form->hidden('Pollrow.poll_id', $Element["Poll"]['Poll']['id']);  // Poll_id
     
     foreach ($Element["Poll"]['Pollrow'] as $key=>$val)
@@ -56 +56 @@
     
     echo '<span style="font-size:7pt">';
-        echo $html->radio('Pollrow/id', $array, '<br />');  //print the answers
+        echo $form->radio('Pollrow.id', $array, array('separator'=>'<br />'));  //print the answers
     echo '<br />';
     

trunk/app/views/layouts/portal.ctp

@@ -42 +42 @@
  
  echo $html->link('Home', '/') . ' | ';
- echo $html->link('About College', '/colleges/about') . ' | ';
+ echo $html->link('About College', '/colleges/view') . ' | ';
  echo $html->link('Contact', '/messages/contact') . ' | ';
 ?>
@@ -70 +70 @@
    }
 
-// echo  $this->renderElement('lastentries', $Element["Lentry"]);
+   echo  $this->renderElement('lastentries', $Element["Lentry"]);
    echo  '<br />';   
-//echo  $this->renderElement('poll',       $Element["Poll"]); 
+   echo  $this->renderElement('poll',       $Element["Poll"]); 
         
-// echo $this->renderElement('subjects'); 
+   echo $this->renderElement('subjects'); 
 ?>
        <ul>   

trunk/app/views/users/entry.ctp

@@ -13 +13 @@
     $pl = 'Permalink: http://' . $_SERVER['SERVER_NAME'] . '/users/entry/'.$blog["User"]["username"].'/'.$entry_id;
     
-    echo '<p><a style="font-size:7pt" href="/users/entry/'.$blog["User"]["username"].'/'.$entry_id.'">'.$pl.'</a></p>';
+    echo $html->para(null, $html->link($pl, '/users/entry/'.$blog["User"]["username"].'/'.$entry_id));
     
     if ( $discution == 1 ) 
@@ -26 +26 @@
     if ( $discution == 1 )  //is the comments in this entry actived by blogger?
     {
-        if ( !$othAuth->sessionValid() )  // if user logged, anchor to textarea
+        if ( !isset( $cU['User'] ) )  // if user logged, anchor to textarea
         {
                  echo '<div id="comments">' . $html->image('static/comment.gif', array("alt"=>"Comments")) . ' Comments:</div>';
@@ -53 +53 @@
         
         
-        echo $html->formTag('/comments/add/','post', array("onsubmit"=>"return chkForm()"));
-        echo $html->hiddenTag('Comment/redirect_to', '/users/entry/'.$blog["User"]["username"].'/'.$entry_id);
-        echo $html->hiddenTag('Comment/entry_id', $entry_id);
+        echo $form->create('Comments', array("onsubmit"=>"return chkForm()", "action"=>"add"));
+        echo $form->hidden('Comment.redirect_to', '/users/entry/'.$blog["User"]["username"].'/'.$entry_id);
+        echo $form->hidden('Comment.entry_id', $entry_id);
         
-        if ( $othAuth->sessionValid() )
+        if ( isset( $cU['User']['id'] ) )
         {
 ?>
@@ -63 +63 @@
          <legend id="new_comment">New Comment</legend>
          <?php
-            echo $html->hidden('Comment/user_id', array("value"=>$othAuth->user('id')));
-            echo $html->hidden('Comment/username', array("value"=>$othAuth->user('username')));
-            echo $othAuth->user('username') . "  writes:";
+            echo $html->hidden('Comment.user_id', array("value"=>$cU['User']['id'] ));
+            echo $html->hidden('Comment.username', array("value"=>$cU['User']['username']));
+            echo $cU['User']['username'] . "  writes:";
          ?>
          <p>
-         <?php echo $form->labelTag('Comment/comment', 'Comment:' );?><br />
-         <?php echo $html->textarea('Comment/comment', array("rows" => 10, "cols" => 50)); ?>
-         <?php echo $html->tagErrorMsg('Comment/comment', 'A comment is required.'); ?>
+         <?php echo $form->labelTag('Comment.comment', 'Comment:' );?><br />
+         <?php echo $form->textarea('Comment.comment', array("rows" => 10, "cols" => 50)); ?>
+         <?php echo $form->error('Comment.comment', 'A comment is required.'); ?>
          </p>
          <br />
-         <?php echo $html->submit('Send') ?>
+         <?php echo $form->end('Send') ?>
          </fieldset>
          </form>
@@ -80 +80 @@
          else
          {
-            echo '<p>' . $html->link('You must be logged to write a comment', '/users/login'). '</p>';
+            echo $html->para(null, $html->link('You must be logged to write a comment', '/users/login'));
          }