some fixes and added jquery

pvalencia · Apr 1, 2010 · 6289f2a · 6289f2a
1 parent ab4374f
commit 6289f2a
Show file tree

Hide file tree

Showing 5 changed files with 185 additions and 37 deletions.
diff --git a/app_controller.php b/app_controller.php
@@ -5,10 +5,10 @@
 /**
  */
 class AppController extends Controller {
-	var $helpers = array('Html', 'Form');
+	var $helpers = array('Html', 'Form', 'Session');
 
 	var $components = array(
-		'Cookies' => array(
+		'Cookie' => array(
 			'name' => 'VolunteerCoord',
 			'time' => '2 weeks',
 		),

diff --git a/config/schema/schema.php b/config/schema/schema.php
@@ -11,12 +11,27 @@ function before($event = array()) {
 	function after($event = array()) {
 	}
 
-	var $users = array(
+	var $people = array(
 		'id' => array('type' =>'integer', 'length' => 11, 'default' => null, 'null' => false, 'key' => 'primary'),
 		'name' => array('type' => 'string', 'length' => 64, 'default' => null, 'null' => false),
 		'email' => array('type' => 'string', 'length' => 255, 'default' => null, 'null' => false),
 		'password' => array('type' => 'string', 'length' => 255, 'default' => null, 'null' => false),
 		'active' => array('type' => 'boolean', 'default' => false, 'null' => false),
+		'created' => array('type' => 'datetime', 'default' => null, 'null' => false),
+		'modified' => array('type' => 'datetime', 'default' => null, 'null' => false),
+	);
+
+	var $person_users = array(
+		'id' => array('type' =>'integer', 'length' => 11, 'default' => null, 'null' => false, 'key' => 'primary'),
+		'person_id' => array('type' =>'integer', 'length' => 11, 'default' => null, 'null' => false),
+		'user_id' => array('type' =>'integer', 'length' => 11, 'default' => null, 'null' => false),
+		'created' => array('type' => 'datetime', 'default' => null, 'null' => false),
+		'modified' => array('type' => 'datetime', 'default' => null, 'null' => false),
+	);
+
+	var $users = array(
+		'id' => array('type' =>'integer', 'length' => 11, 'default' => null, 'null' => false, 'key' => 'primary'),
+		'name' => array('type' => 'string', 'length' => 64, 'default' => null, 'null' => false),
 		'organization_id' => array('type' => 'integer', 'length' => 11, 'default' => null, 'null' => false),
 		'role_id' => array('type' => 'integer', 'length' => 11, 'default' => null, 'null' => false),
 		'created' => array('type' => 'datetime', 'default' => null, 'null' => false),

diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp
@@ -1,22 +1,3 @@
-<?php
-/**
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.cake.console.libs.templates.skel.views.layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -28,8 +9,11 @@
 	<?php
 		echo $this->Html->meta('icon');
 
-		echo $this->Html->css('cake.generic');
-
+		if(Configure::read() > 0)
+			echo $this->Html->script('jquery-1.4.2.min.js');
+		else
+			echo $this->Html->script('http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js');
+
 		echo $scripts_for_layout;
 	?>
 </head>

diff --git a/webroot/index.php b/webroot/index.php
@@ -1,28 +1,23 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
- * Short description for file.
+ * Index
  *
- * Long description for file
+ * The Front Controller for handling every request
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot
  * @since         CakePHP(tm) v 0.2.9
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 /**
  * Use the DS to separate the directories in other defines
@@ -85,7 +80,7 @@
 		return;
 	} else {
 		$Dispatcher = new Dispatcher();
-		$Dispatcher->dispatch($url);
+		$Dispatcher->dispatch();
 	}
 	if (Configure::read() > 0) {
 		echo "<!-- " . round(getMicrotime() - $TIME_START, 4) . "s -->";