Changeset 765

Show
Ignore:
Timestamp:
09/11/08 15:04:23 (2 months ago)
Author:
aarkerio
Message:

New wikpages

Location:
trunk/app
Files:
12 added
1 removed
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/app/app_controller.php

    r699 r765  
    2020 public function beforeFilter() 
    2121 { 
    22    //set locale 
     22   //set locale (es or en by now) 
    2323   $this->__setLocale(); 
    2424 
    25    // Auth stuff 
     25   // Auth configuratin 
    2626   $this->Auth->fields         = array('username'   => 'email', 'password' => 'pwd'); 
    2727   $this->Auth->loginAction    = array('controller' => 'users', 'action'   => 'login'); 
    … …  
    4949 { 
    5050     $this->Session->setFlash($msg); // http://manual.cakephp.org/chapter/session 
    51           
    52      $this->redirect($to); 
    53         
    54      exit; 
     51     $this->redirect($to);        
     52     return true; 
    5553 } 
    5654 

  • trunk/app/config/sql/postgresql/acquaintances.sql

    r436 r765  
    44   name varchar(50) NOT NULL, 
    55   url varchar(250), 
    6    user_id int REFERENCES users(id) ON DELETE CASCADE, 
     6   user_id int NOT NULL REFERENCES users(id) ON DELETE CASCADE, 
    77   description text 
    88); 

  • trunk/app/views/layouts/basic.ctp

    r750 r765  
    4545<?php  
    4646 echo $html->link('eduBlog',   '/blog/'.$blog['User']['username']);  
    47  echo $html->link('Portfolio', '/users/portfolio/'.$blog['User']['username']);  
     47 echo $html->link('ePortfolio', '/users/portfolio/'.$blog['User']['username']);  
    4848 echo $html->link('About me',  '/vclassrooms/aboutme/'.$blog['User']['username']); 
    4949 echo $html->link('Contact',   '/messages/message/'.$blog['User']['username']); 

  • trunk/app/views/layouts/rubyx.ctp

    r651 r765  
    55<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">  
    66<head>  
    7     <?php 
    8     if ( isset($javascript) ): 
     7<?php 
     8 if ( isset($javascript) ): 
    99          echo $html->charset('UTF-8'); 
    1010          echo $javascript->link('prototype'); 
    1111          echo $javascript->link('myfunctions'); 
    1212          echo $javascript->link('scriptaculous.js?load=effects'); 
    13      endif; 
    14     ?> 
    15  
     13 endif; 
     14?> 
    1615<meta http-equiv="content-type" content="text/html; charset=utf-8" />  
    1716<meta http-equiv="content-language" content="cs" />  
    … …  
    5958                      
    6059   <?php echo ($this->action == 'portfolio') ? '<li id="active">' : '<li>'; ?>  
    61      <a href="/users/portfolio/<?php echo $blog['User']['username'] ?>">Portfolio<span class="tab-l"></span><span class="tab-r"></span></a></li>  
     60     <a href="/users/portfolio/<?php echo $blog['User']['username'] ?>">ePortfolio<span class="tab-l"></span><span class="tab-r"></span></a></li>  
    6261                      
    6362   <?php echo ($this->action == 'aboutme') ? '<li id="active">' : '<li>'; ?>