Changeset 276

Show
Ignore:
Timestamp:
02/23/08 17:16:49 (11 months ago)
Author:
aarkerio
Message:

Upgrade to 1.2

Location:
trunk/app
Files:
5 removed
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/app/config/routes.php

    r238 r276  
    77    Router::connect('/', array('controller' => 'news', 'action' => 'display', 'home')); 
    88/** 
    9  * ...and connect the rest of 'Pages' controller's urls. 
     9 * ...and connect the rest of 'blog' controller's urls. 
    1010 */ 
    11     Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display')); 
     11    Router::connect('/blog/*', array('controller' => 'users', 'action' => 'blog')); 
    1212/** 
    1313 * Then we connect url '/test' to our test controller. This is helpfull in 

  • trunk/app/controllers/newsletters_controller.php

    r247 r276  
    1414   
    1515  public $components       = array('Portal', 'Email'); 
     16   
     17  public function beforeFiler() 
     18  { 
     19    $this->Auth->allow('subscribe'); 
     20    parent::beforeFilter();    
     21  } 
    1622   
    1723  public function isAuthorized() 
    … …  
    3238         $this->set('Element', $this->Portal->statics()); // Charge Portal components aka Sidebars 
    3339  } 
    34   public function all($page=1) 
     40 
     41  public function display($page=1) 
    3542  {   
    3643     $this->layout = 'portal'; 

  • trunk/app/controllers/users_controller.php

    r274 r276  
    1414     
    1515  public $components       = array('Edublog', 'Portal', 'Email', 'Adds'); 
     16 
    1617  public function beforeFiler() 
    1718  { 
    18     $this->Auth->allow( array('entry', 'about') ); 
     19    $this->Auth->allow( array('entry', 'about', 'bloggers', 'blog', 'recover', 'directory') ); 
    1920    parent::beforeFilter(); 
    2021  }   
    … …  
    5859     $this->layout    = $this->Edublog->layout($user_id); 
    5960         
    60      //$this->Edublog->blog($user_id); 
     61     $this->Edublog->blog($user_id); 
    6162    } 
    6263     
    … …  
    292293        $this->set('data', $this->User->findAll($conditions, $fields, $order, $limit)); 
    293294         
    294         $this->set('Element', $this->Portal->statics()); // Using Portal component 
     295        $this->Portal->statics(); // Using Portal component 
    295296 } 
    296297       

  • trunk/app/views/elements/login_hide.ctp

    r246 r276  
    1919<legend>Login</legend> 
    2020  <?php  
    21    echo  $form->label('User.username', 'Username:') . "<br />";   
    22    echo  $form->input('User.username', array('size' => 15, 'maxlength'=>30)) . "<br />"; 
    23  
     21   echo  $form->input('User.username', array('size' => 15, 'maxlength'=>30, 'between' => ': <br />')) . "<br />"; 
    2422    
    2523   echo  $form->label('User.pwd', 'Password:') . "<br />"; 

  • trunk/app/views/entries/admin_listing.ctp

    r258 r276  
    44<?php $session->flash(); ?> 
    55 
    6 <?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?>  
    7  
    8 <?php echo $html->getCrumbs(' / '); ?> 
     6<?php  
     7 echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
     8 echo $html->getCrumbs(' / ');  
     9?> 
    910 
    1011<div class="title_section">Entries </div> 
    … …  
    4142</table> 
    4243 
    43 <?php echo $pagination; ?> 
     44<?php  
     45//echo $pagination;  
     46?> 

  • trunk/app/views/helpers/gags.php

    r187 r276  
    1010   
    1111   public  $initialized = false; 
    12    public  $helpers = array('Html', 'Ajax'); 
     12   public  $helpers = array('Html', 'Ajax', 'Form'); 
    1313    
    1414   public function confirmDel($id, $controller)  
    1515   { 
    1616         
    17         $strB  = $this->Html->formTag('/admin/'.$controller.'/delete/'.$id.'/', 'post', array("onsubmit"=>"return confirm('Are you sure to delete?')")); 
    18         $strB .= $this->Html->submit('Delete'); 
    19         $strB .= "</form>"; 
     17        $strB  = $this->Form->create(null, array('action'=>'/admin/'.$controller.'/delete/'.$id, "onsubmit"=>"return confirm('Are you sure to delete?')")); 
     18        $strB .= $this->Form->end('Delete'); 
    2019         
    2120        return $strB; 
    … …  
    2524   { 
    2625         
    27         $strB  = $this->Html->formTag('/admin/'.$controller.'/edit/'.$id, 'post'); 
    28         $strB .= $this->Html->submit('Edit'); 
    29         $strB .= "</form>"; 
     26        $strB  = $this->Form->create(null, array('action'=>'/admin/'.$controller.'/edit/'.$id)); 
     27        $strB .= $this->Form->end('Edit'); 
    3028         
    3129        return $strB;