Merge out from the pre_0.1 branch (previous so called 'merge in' was also really a merge out)

git-svn-id: file:///svn-source/pmgr/branches/sandbox_0.1@796 97e9348a-65ac-dc4b-aefc-98561f571b83

build.cmd

@@ -1,3 +1,6 @@
 @echo off
-mysql --user=pmgr --password=pmgruser < %~dp0\db\property_manager.sql
+sed "s/property_manager/pmgr_sand/g" %~dp0\db\property_manager.sql > H:\pmgr_sand.sql
-echo Done!
+mysql --user=pmgr --password=pmgruser < H:\pmgr_sand.sql
+del H:\pmgr_sand.sql
+echo Rebuild Complete!
+

db/property_manager.sql

@@ -230,7 +230,7 @@ CREATE TABLE `pmgr_contact_addresses` (
   `country` varchar(128) DEFAULT NULL,
   `comment` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=47 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=46 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -282,7 +282,6 @@ INSERT INTO `pmgr_contact_addresses` VALUES (42,'2272 Shoshone','Boise','ID','83
 INSERT INTO `pmgr_contact_addresses` VALUES (43,'PO Box 626','Chewelah','WA','99109','USA',NULL);
 INSERT INTO `pmgr_contact_addresses` VALUES (44,'4565 Hwy 231','Springdale','WA','99173','USA',NULL);
 INSERT INTO `pmgr_contact_addresses` VALUES (45,'3463 B Hwy 395 South','Loon Lake','WA','99148','USA',NULL);
-INSERT INTO `pmgr_contact_addresses` VALUES (46,'PO Box 51','Valley','WA','99181',NULL,NULL);
 /*!40000 ALTER TABLE `pmgr_contact_addresses` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -739,7 +738,6 @@ INSERT INTO `pmgr_contacts_methods` VALUES (65,'PHONE',63,'MAIN','PRIMARY',NULL)
 INSERT INTO `pmgr_contacts_methods` VALUES (66,'PHONE',64,'MAIN','PRIMARY',NULL);
 INSERT INTO `pmgr_contacts_methods` VALUES (77,'PHONE',65,'MAIN','PRIMARY',NULL);
 INSERT INTO `pmgr_contacts_methods` VALUES (76,'PHONE',66,'MAIN','PRIMARY',NULL);
-INSERT INTO `pmgr_contacts_methods` VALUES (60,'ADDRESS',46,'MAIN','PRIMARY',NULL);
 /*!40000 ALTER TABLE `pmgr_contacts_methods` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -811,7 +809,7 @@ INSERT INTO `pmgr_customers` VALUES (40,'Hovland, Pamela',55,1,1,0,NULL);
 INSERT INTO `pmgr_customers` VALUES (41,'Hooke, R.R.',57,1,1,0,NULL);
 INSERT INTO `pmgr_customers` VALUES (42,'Clark, Bill',58,1,0,1,NULL);
 INSERT INTO `pmgr_customers` VALUES (43,'Jackson, Shirley',59,1,0,1,NULL);
-INSERT INTO `pmgr_customers` VALUES (44,'Conway, Cathy',60,1,0,1,NULL);
+INSERT INTO `pmgr_customers` VALUES (44,'Conway, Cathy',60,1,1,0,NULL);
 INSERT INTO `pmgr_customers` VALUES (45,'Walch, John',61,1,0,1,NULL);
 INSERT INTO `pmgr_customers` VALUES (46,'Johnson, Joni',62,1,0,1,NULL);
 INSERT INTO `pmgr_customers` VALUES (47,'Mancini, Krystan',63,1,1,0,NULL);
@@ -832,57 +830,6 @@ INSERT INTO `pmgr_customers` VALUES (61,'Selle-Jackson, Angela',77,1,1,0,NULL);
 /*!40000 ALTER TABLE `pmgr_customers` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `pmgr_default_options`
---
-
-DROP TABLE IF EXISTS `pmgr_default_options`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `pmgr_default_options` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `option_value_id` int(10) unsigned NOT NULL,
-  `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `pmgr_default_options`
---
-
-LOCK TABLES `pmgr_default_options` WRITE;
-/*!40000 ALTER TABLE `pmgr_default_options` DISABLE KEYS */;
-INSERT INTO `pmgr_default_options` VALUES (1,1,NULL);
-INSERT INTO `pmgr_default_options` VALUES (2,3,NULL);
-/*!40000 ALTER TABLE `pmgr_default_options` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `pmgr_default_permissions`
---
-
-DROP TABLE IF EXISTS `pmgr_default_permissions`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `pmgr_default_permissions` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `permission_value_id` int(10) unsigned NOT NULL,
-  `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `pmgr_default_permissions`
---
-
-LOCK TABLES `pmgr_default_permissions` WRITE;
-/*!40000 ALTER TABLE `pmgr_default_permissions` DISABLE KEYS */;
-INSERT INTO `pmgr_default_permissions` VALUES (1,1,NULL);
-/*!40000 ALTER TABLE `pmgr_default_permissions` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `pmgr_deposits`
 --
@@ -924,7 +871,7 @@ CREATE TABLE `pmgr_double_entries` (
   `credit_entry_id` int(10) unsigned NOT NULL,
   `comment` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=765 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=761 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -1661,10 +1608,6 @@ INSERT INTO `pmgr_double_entries` VALUES (756,1511,1512,NULL);
 INSERT INTO `pmgr_double_entries` VALUES (757,1514,1513,NULL);
 INSERT INTO `pmgr_double_entries` VALUES (758,1515,1516,NULL);
 INSERT INTO `pmgr_double_entries` VALUES (759,1518,1517,NULL);
-INSERT INTO `pmgr_double_entries` VALUES (761,1521,1522,NULL);
-INSERT INTO `pmgr_double_entries` VALUES (762,1524,1523,NULL);
-INSERT INTO `pmgr_double_entries` VALUES (763,1526,1525,NULL);
-INSERT INTO `pmgr_double_entries` VALUES (764,1527,1528,NULL);
 /*!40000 ALTER TABLE `pmgr_double_entries` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1676,13 +1619,12 @@ DROP TABLE IF EXISTS `pmgr_group_options`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `pmgr_group_options` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `group_id` int(10) unsigned NOT NULL,
-  `option_value_id` int(10) unsigned NOT NULL,
+  `name` varchar(50) NOT NULL,
+  `value` varchar(255) NOT NULL,
   `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
+  PRIMARY KEY (`group_id`,`name`)
-  KEY `group_key` (`group_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -1691,8 +1633,6 @@ SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `pmgr_group_options` WRITE;
 /*!40000 ALTER TABLE `pmgr_group_options` DISABLE KEYS */;
-INSERT INTO `pmgr_group_options` VALUES (1,1,2,NULL);
-INSERT INTO `pmgr_group_options` VALUES (2,2,4,NULL);
 /*!40000 ALTER TABLE `pmgr_group_options` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1704,13 +1644,12 @@ DROP TABLE IF EXISTS `pmgr_group_permissions`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `pmgr_group_permissions` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `group_id` int(10) unsigned NOT NULL,
-  `permission_value_id` int(10) unsigned NOT NULL,
+  `name` char(30) NOT NULL,
+  `access` enum('ALLOWED','DENIED','FORCED') NOT NULL DEFAULT 'ALLOWED',
   `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
+  PRIMARY KEY (`group_id`,`name`)
-  KEY `group_key` (`group_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -1719,9 +1658,7 @@ SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `pmgr_group_permissions` WRITE;
 /*!40000 ALTER TABLE `pmgr_group_permissions` DISABLE KEYS */;
-INSERT INTO `pmgr_group_permissions` VALUES (1,1,4,NULL);
+INSERT INTO `pmgr_group_permissions` VALUES (1,'EVERYTHING','FORCED',NULL);
-INSERT INTO `pmgr_group_permissions` VALUES (2,2,4,NULL);
-INSERT INTO `pmgr_group_permissions` VALUES (3,3,3,NULL);
 /*!40000 ALTER TABLE `pmgr_group_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1736,10 +1673,9 @@ CREATE TABLE `pmgr_groups` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `code` varchar(12) NOT NULL,
   `name` varchar(80) NOT NULL,
-  `rank` smallint(5) unsigned NOT NULL DEFAULT '100',
   `comment` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -1748,11 +1684,7 @@ SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `pmgr_groups` WRITE;
 /*!40000 ALTER TABLE `pmgr_groups` DISABLE KEYS */;
-INSERT INTO `pmgr_groups` VALUES (1,'Developer','Software Development Group',1,NULL);
+INSERT INTO `pmgr_groups` VALUES (1,'Owner','Owner Group',NULL);
-INSERT INTO `pmgr_groups` VALUES (2,'Owner','Owner Group',25,NULL);
-INSERT INTO `pmgr_groups` VALUES (3,'Admin','Administrator Group',50,NULL);
-INSERT INTO `pmgr_groups` VALUES (4,'Manager','Manager Group',75,NULL);
-INSERT INTO `pmgr_groups` VALUES (5,'Temp','Temporary Manager',100,NULL);
 /*!40000 ALTER TABLE `pmgr_groups` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1883,7 +1815,7 @@ INSERT INTO `pmgr_leases` VALUES (34,'34',1,69,41,NULL,'2008-11-14',NULL,'2008-1
 INSERT INTO `pmgr_leases` VALUES (35,'35',1,35,1,NULL,'2009-01-01',NULL,'2009-01-01','2009-05-31',NULL,NULL,NULL,'2009-05-31','2009-05-31','2009-05-31',NULL,45.00,NULL,NULL,NULL);
 INSERT INTO `pmgr_leases` VALUES (36,'36',1,52,43,NULL,'2009-01-01',NULL,'2009-01-01','2009-03-28',NULL,NULL,NULL,'2009-03-28','2009-03-31','2009-03-31',25.00,30.00,NULL,NULL,NULL);
 INSERT INTO `pmgr_leases` VALUES (37,'37',1,21,46,NULL,'2009-02-01',NULL,'2009-02-01','2009-03-31',NULL,NULL,NULL,'2009-03-31','2009-03-31','2009-03-31',NULL,70.00,NULL,NULL,NULL);
-INSERT INTO `pmgr_leases` VALUES (38,'38',1,25,44,NULL,'2009-02-01',NULL,'2009-02-01','2009-08-26',NULL,NULL,NULL,'2009-08-26','2009-08-31','2009-08-31',25.00,70.00,NULL,NULL,NULL);
+INSERT INTO `pmgr_leases` VALUES (38,'38',1,25,44,NULL,'2009-02-01',NULL,'2009-02-01',NULL,NULL,NULL,NULL,NULL,'2009-08-31','2009-08-31',25.00,70.00,NULL,NULL,NULL);
 INSERT INTO `pmgr_leases` VALUES (39,'39',1,64,45,NULL,'2009-02-01',NULL,'2009-02-01','2009-03-10',NULL,NULL,NULL,'2009-03-10','2009-03-31','2009-03-31',NULL,70.00,NULL,NULL,NULL);
 INSERT INTO `pmgr_leases` VALUES (40,'40',1,41,8,NULL,'2009-02-01',NULL,'2009-02-01',NULL,NULL,NULL,NULL,NULL,'2009-08-31','2009-08-31',150.00,375.00,NULL,NULL,NULL);
 INSERT INTO `pmgr_leases` VALUES (41,'41',1,45,42,NULL,'2009-02-01',NULL,'2009-02-01','2009-03-31',NULL,NULL,NULL,'2009-03-31','2009-03-31','2009-03-31',NULL,49.00,NULL,NULL,NULL);
@@ -1937,7 +1869,7 @@ CREATE TABLE `pmgr_ledger_entries` (
   `amount` float(12,2) NOT NULL,
   `comment` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1529 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=1521 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -3402,14 +3334,6 @@ INSERT INTO `pmgr_ledger_entries` VALUES (1515,645,24,55,'DEBIT',25.00,NULL);
 INSERT INTO `pmgr_ledger_entries` VALUES (1516,645,1,27,'CREDIT',25.00,NULL);
 INSERT INTO `pmgr_ledger_entries` VALUES (1517,692,13,39,'CREDIT',10.00,NULL);
 INSERT INTO `pmgr_ledger_entries` VALUES (1518,692,1,27,'DEBIT',10.00,NULL);
-INSERT INTO `pmgr_ledger_entries` VALUES (1521,693,12,38,'DEBIT',25.00,'Released Security Deposit');
-INSERT INTO `pmgr_ledger_entries` VALUES (1522,693,1,27,'CREDIT',25.00,NULL);
-INSERT INTO `pmgr_ledger_entries` VALUES (1523,693,24,55,'CREDIT',25.00,NULL);
-INSERT INTO `pmgr_ledger_entries` VALUES (1524,693,1,27,'DEBIT',25.00,NULL);
-INSERT INTO `pmgr_ledger_entries` VALUES (1525,694,20,46,'CREDIT',25.00,NULL);
-INSERT INTO `pmgr_ledger_entries` VALUES (1526,694,1,27,'DEBIT',25.00,NULL);
-INSERT INTO `pmgr_ledger_entries` VALUES (1527,693,24,55,'DEBIT',25.00,NULL);
-INSERT INTO `pmgr_ledger_entries` VALUES (1528,693,1,27,'CREDIT',25.00,NULL);
 /*!40000 ALTER TABLE `pmgr_ledger_entries` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3634,44 +3558,6 @@ INSERT INTO `pmgr_maps_units` VALUES (78,1,78,372,2214,1);
 /*!40000 ALTER TABLE `pmgr_maps_units` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `pmgr_memberships`
---
-
-DROP TABLE IF EXISTS `pmgr_memberships`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `pmgr_memberships` (
-  `site_id` int(10) unsigned NOT NULL,
-  `user_id` int(10) unsigned NOT NULL,
-  `group_id` int(10) unsigned NOT NULL,
-  `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`site_id`,`user_id`,`group_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `pmgr_memberships`
---
-
-LOCK TABLES `pmgr_memberships` WRITE;
-/*!40000 ALTER TABLE `pmgr_memberships` DISABLE KEYS */;
-INSERT INTO `pmgr_memberships` VALUES (1,1,1,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,1,2,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,1,3,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,1,4,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,2,2,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,2,3,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,2,4,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,3,2,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,3,3,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,3,4,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,4,4,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,5,4,NULL);
-INSERT INTO `pmgr_memberships` VALUES (1,6,5,NULL);
-/*!40000 ALTER TABLE `pmgr_memberships` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `pmgr_notes`
 --
@@ -3700,118 +3586,6 @@ LOCK TABLES `pmgr_notes` WRITE;
 /*!40000 ALTER TABLE `pmgr_notes` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `pmgr_option_values`
---
-
-DROP TABLE IF EXISTS `pmgr_option_values`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `pmgr_option_values` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `option_id` int(10) unsigned NOT NULL,
-  `value` varchar(255) NOT NULL,
-  `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `pmgr_option_values`
---
-
-LOCK TABLES `pmgr_option_values` WRITE;
-/*!40000 ALTER TABLE `pmgr_option_values` DISABLE KEYS */;
-INSERT INTO `pmgr_option_values` VALUES (1,1,'0',NULL);
-INSERT INTO `pmgr_option_values` VALUES (2,1,'1',NULL);
-INSERT INTO `pmgr_option_values` VALUES (3,2,'0',NULL);
-INSERT INTO `pmgr_option_values` VALUES (4,2,'1',NULL);
-/*!40000 ALTER TABLE `pmgr_option_values` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `pmgr_options`
---
-
-DROP TABLE IF EXISTS `pmgr_options`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `pmgr_options` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) NOT NULL,
-  `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name_key` (`name`)
-) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `pmgr_options`
---
-
-LOCK TABLES `pmgr_options` WRITE;
-/*!40000 ALTER TABLE `pmgr_options` DISABLE KEYS */;
-INSERT INTO `pmgr_options` VALUES (1,'dev','Developer Flag');
-INSERT INTO `pmgr_options` VALUES (2,'admin','Administrator Flag');
-/*!40000 ALTER TABLE `pmgr_options` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `pmgr_permission_values`
---
-
-DROP TABLE IF EXISTS `pmgr_permission_values`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `pmgr_permission_values` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `permission_id` int(10) unsigned NOT NULL,
-  `access` enum('ALLOW','DENY') NOT NULL DEFAULT 'DENY',
-  `level` smallint(5) unsigned DEFAULT NULL,
-  `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `pmgr_permission_values`
---
-
-LOCK TABLES `pmgr_permission_values` WRITE;
-/*!40000 ALTER TABLE `pmgr_permission_values` DISABLE KEYS */;
-INSERT INTO `pmgr_permission_values` VALUES (1,1,'DENY',NULL,NULL);
-INSERT INTO `pmgr_permission_values` VALUES (2,1,'ALLOW',10,NULL);
-INSERT INTO `pmgr_permission_values` VALUES (3,1,'ALLOW',5,NULL);
-INSERT INTO `pmgr_permission_values` VALUES (4,1,'ALLOW',1,NULL);
-/*!40000 ALTER TABLE `pmgr_permission_values` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `pmgr_permissions`
---
-
-DROP TABLE IF EXISTS `pmgr_permissions`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `pmgr_permissions` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) NOT NULL,
-  `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name_key` (`name`)
-) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `pmgr_permissions`
---
-
-LOCK TABLES `pmgr_permissions` WRITE;
-/*!40000 ALTER TABLE `pmgr_permissions` DISABLE KEYS */;
-INSERT INTO `pmgr_permissions` VALUES (1,'controller.accounts',NULL);
-/*!40000 ALTER TABLE `pmgr_permissions` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `pmgr_reservations`
 --
@@ -3894,6 +3668,32 @@ INSERT INTO `pmgr_site_areas` VALUES (1,1,'Main','Main Facility Area',NULL);
 /*!40000 ALTER TABLE `pmgr_site_areas` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `pmgr_site_memberships`
+--
+
+DROP TABLE IF EXISTS `pmgr_site_memberships`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `pmgr_site_memberships` (
+  `site_id` int(10) unsigned NOT NULL,
+  `user_id` int(10) unsigned NOT NULL,
+  `group_id` int(10) unsigned NOT NULL,
+  `comment` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`site_id`,`user_id`,`group_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `pmgr_site_memberships`
+--
+
+LOCK TABLES `pmgr_site_memberships` WRITE;
+/*!40000 ALTER TABLE `pmgr_site_memberships` DISABLE KEYS */;
+INSERT INTO `pmgr_site_memberships` VALUES (1,1,1,NULL);
+/*!40000 ALTER TABLE `pmgr_site_memberships` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `pmgr_site_options`
 --
@@ -3902,12 +3702,11 @@ DROP TABLE IF EXISTS `pmgr_site_options`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `pmgr_site_options` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `site_id` int(10) unsigned NOT NULL,
-  `option_value_id` int(10) unsigned NOT NULL,
+  `name` varchar(50) NOT NULL,
+  `value` varchar(255) NOT NULL,
   `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
+  PRIMARY KEY (`site_id`,`name`)
-  KEY `site_key` (`site_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
@@ -3920,32 +3719,6 @@ LOCK TABLES `pmgr_site_options` WRITE;
 /*!40000 ALTER TABLE `pmgr_site_options` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `pmgr_site_permissions`
---
-
-DROP TABLE IF EXISTS `pmgr_site_permissions`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `pmgr_site_permissions` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `site_id` int(10) unsigned NOT NULL,
-  `permission_value_id` int(10) unsigned NOT NULL,
-  `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `site_key` (`site_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `pmgr_site_permissions`
---
-
-LOCK TABLES `pmgr_site_permissions` WRITE;
-/*!40000 ALTER TABLE `pmgr_site_permissions` DISABLE KEYS */;
-/*!40000 ALTER TABLE `pmgr_site_permissions` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `pmgr_sites`
 --
@@ -3995,7 +3768,7 @@ CREATE TABLE `pmgr_statement_entries` (
   `reverse_transaction_id` int(10) unsigned DEFAULT NULL,
   `comment` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=900 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=897 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -4835,8 +4608,6 @@ INSERT INTO `pmgr_statement_entries` VALUES (891,'REFUND',690,'2009-08-05',NULL,
 INSERT INTO `pmgr_statement_entries` VALUES (892,'DISBURSEMENT',646,'2009-08-05',NULL,NULL,58,NULL,25.00,24,891,NULL,NULL);
 INSERT INTO `pmgr_statement_entries` VALUES (894,'DISBURSEMENT',645,'2009-08-05',NULL,NULL,59,NULL,25.00,24,893,NULL,NULL);
 INSERT INTO `pmgr_statement_entries` VALUES (895,'CHARGE',692,'2009-06-27','2009-07-11',NULL,37,72,10.00,13,NULL,NULL,NULL);
-INSERT INTO `pmgr_statement_entries` VALUES (898,'REFUND',694,'2009-09-03',NULL,NULL,44,NULL,25.00,20,NULL,NULL,NULL);
-INSERT INTO `pmgr_statement_entries` VALUES (899,'DISBURSEMENT',693,'2009-09-03',NULL,NULL,44,NULL,25.00,24,898,NULL,NULL);
 /*!40000 ALTER TABLE `pmgr_statement_entries` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5161,7 +4932,7 @@ CREATE TABLE `pmgr_transactions` (
   `amount` float(12,2) DEFAULT NULL,
   `comment` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=695 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=693 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -5837,8 +5608,6 @@ INSERT INTO `pmgr_transactions` VALUES (689,'RECEIPT','2009-08-18 04:19:02',38,1
 INSERT INTO `pmgr_transactions` VALUES (690,'PAYMENT','2009-08-05 07:00:00',58,1,27,'DEBIT',25.00,NULL);
 INSERT INTO `pmgr_transactions` VALUES (691,'PAYMENT','2009-08-05 07:00:00',59,1,27,'DEBIT',25.00,NULL);
 INSERT INTO `pmgr_transactions` VALUES (692,'INVOICE','2009-06-27 07:00:00',37,1,27,'DEBIT',10.00,'In consideration with other leases, $10 for temporary boat trailer storage');
-INSERT INTO `pmgr_transactions` VALUES (693,'RECEIPT','2009-08-26 07:00:00',44,1,27,'CREDIT',25.00,'Security Deposit Release');
-INSERT INTO `pmgr_transactions` VALUES (694,'PAYMENT','2009-09-03 18:16:00',44,1,27,'DEBIT',25.00,'Paid online.  Confirmation #0909040056');
 /*!40000 ALTER TABLE `pmgr_transactions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5970,7 +5739,7 @@ INSERT INTO `pmgr_units` VALUES (21,3,'32','32','VACANT',43,27,25.00,70.00,NULL)
 INSERT INTO `pmgr_units` VALUES (22,3,'33','33','OCCUPIED',44,26,25.00,70.00,NULL);
 INSERT INTO `pmgr_units` VALUES (23,3,'34','34','OCCUPIED',45,25,25.00,70.00,NULL);
 INSERT INTO `pmgr_units` VALUES (24,3,'35','35','VACANT',46,24,25.00,70.00,NULL);
-INSERT INTO `pmgr_units` VALUES (25,3,'36','36','VACANT',47,23,25.00,70.00,NULL);
+INSERT INTO `pmgr_units` VALUES (25,3,'36','36','OCCUPIED',47,23,25.00,70.00,NULL);
 INSERT INTO `pmgr_units` VALUES (26,4,'37','37','OCCUPIED',48,22,25.00,50.00,NULL);
 INSERT INTO `pmgr_units` VALUES (27,4,'38','38','COMPANY',49,21,25.00,50.00,'Contains lumber, tools, etc.');
 INSERT INTO `pmgr_units` VALUES (28,5,'39','39','OCCUPIED',50,68,25.00,80.00,NULL);
@@ -6035,12 +5804,11 @@ DROP TABLE IF EXISTS `pmgr_user_options`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `pmgr_user_options` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL,
-  `option_value_id` int(10) unsigned NOT NULL,
+  `name` varchar(50) NOT NULL,
+  `value` varchar(255) NOT NULL,
   `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
+  PRIMARY KEY (`user_id`,`name`)
-  KEY `user_key` (`user_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
@@ -6053,32 +5821,6 @@ LOCK TABLES `pmgr_user_options` WRITE;
 /*!40000 ALTER TABLE `pmgr_user_options` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `pmgr_user_permissions`
---
-
-DROP TABLE IF EXISTS `pmgr_user_permissions`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `pmgr_user_permissions` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `user_id` int(10) unsigned NOT NULL,
-  `permission_value_id` int(10) unsigned NOT NULL,
-  `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `user_key` (`user_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `pmgr_user_permissions`
---
-
-LOCK TABLES `pmgr_user_permissions` WRITE;
-/*!40000 ALTER TABLE `pmgr_user_permissions` DISABLE KEYS */;
-/*!40000 ALTER TABLE `pmgr_user_permissions` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `pmgr_users`
 --
@@ -6090,10 +5832,12 @@ CREATE TABLE `pmgr_users` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `code` varchar(12) NOT NULL,
   `login` varchar(30) NOT NULL,
-  `contact_id` int(10) unsigned DEFAULT NULL,
+  `salt` char(12) DEFAULT NULL,
+  `passhash` varchar(255) DEFAULT NULL,
+  `contact_id` int(10) unsigned NOT NULL,
   `comment` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -6102,12 +5846,7 @@ SET character_set_client = @saved_cs_client;
 
 LOCK TABLES `pmgr_users` WRITE;
 /*!40000 ALTER TABLE `pmgr_users` DISABLE KEYS */;
-INSERT INTO `pmgr_users` VALUES (1,'AP','abijah',NULL,NULL);
+INSERT INTO `pmgr_users` VALUES (1,'AP','abijah',NULL,NULL,1,NULL);
-INSERT INTO `pmgr_users` VALUES (2,'KD','kevin',NULL,NULL);
-INSERT INTO `pmgr_users` VALUES (3,'AB','adam',NULL,NULL);
-INSERT INTO `pmgr_users` VALUES (4,'SK','shirley',NULL,NULL);
-INSERT INTO `pmgr_users` VALUES (5,'MK','mike',NULL,NULL);
-INSERT INTO `pmgr_users` VALUES (6,'DE','dan',NULL,NULL);
 /*!40000 ALTER TABLE `pmgr_users` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6124,4 +5863,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2009-09-03 18:19:01
+-- Dump completed on 2009-08-26 20:06:39

db/schema.sql

@@ -25,9 +25,9 @@
 -- REVISIT <AP>: 20090511
 --   By not specifying the database, the script can
 --   make the determination of which one to use.
-DROP DATABASE IF EXISTS `property_manager`;
+-- DROP DATABASE IF EXISTS `property_manager`;
-CREATE DATABASE `property_manager`;
+-- CREATE DATABASE `property_manager`;
-USE `property_manager`;
+-- USE `property_manager`;
 
 
 -- ######################################################################
@@ -241,7 +241,7 @@ CREATE TABLE `pmgr_contacts_methods` (
 -- ######################################################################
 -- ######################################################################
 -- ##
--- ## GROUPS / USERS
+-- ## GROUPS
 -- ##
 
 
@@ -256,103 +256,80 @@ CREATE TABLE `pmgr_groups` (
   --   code may not be userful
   `code`                 VARCHAR(12) NOT NULL, -- User style "id"
   `name`                 VARCHAR(80) NOT NULL,
-
-  -- Lower ranks are given higher priority
-  `rank`                 SMALLINT UNSIGNED NOT NULL DEFAULT 100,
   `comment`              VARCHAR(255) DEFAULT NULL,
 
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_users
-
-DROP TABLE IF EXISTS `pmgr_users`;
-CREATE TABLE `pmgr_users` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `code`                 VARCHAR(12) NOT NULL, -- User style "id"
-  `login`                VARCHAR(30) NOT NULL,
-
-  -- Contact information for this user
-  `contact_id`           INT(10) UNSIGNED DEFAULT NULL,
-
-  -- Specific comments
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ##
--- ## OPTIONS
--- ##
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_options
-
-DROP TABLE IF EXISTS `pmgr_options`;
-CREATE TABLE `pmgr_options` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `name`                 VARCHAR(50)  NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  UNIQUE KEY `name_key` (`name`),
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_option_values
-
-DROP TABLE IF EXISTS `pmgr_option_values`;
-CREATE TABLE `pmgr_option_values` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `option_id`            INT(10) UNSIGNED NOT NULL,
-  `value`                VARCHAR(255) NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_default_options
-
-DROP TABLE IF EXISTS `pmgr_default_options`;
-CREATE TABLE `pmgr_default_options` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `option_value_id`      INT(10) UNSIGNED NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
 -- TABLE pmgr_group_options
 
 DROP TABLE IF EXISTS `pmgr_group_options`;
 CREATE TABLE `pmgr_group_options` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
   `group_id`             INT(10) UNSIGNED NOT NULL,
-  `option_value_id`      INT(10) UNSIGNED NOT NULL,
+  `name`                 VARCHAR(50)  NOT NULL,
+  `value`                VARCHAR(255) NOT NULL,
   `comment`              VARCHAR(255) DEFAULT NULL,
-  KEY `group_key` (`group_id`),
+
+  PRIMARY KEY (`group_id`, `name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_group_permissions
+
+DROP TABLE IF EXISTS `pmgr_group_permissions`;
+CREATE TABLE `pmgr_group_permissions` (
+  `group_id`             INT(10) UNSIGNED NOT NULL,
+  `name`                 CHAR(30) NOT NULL,
+  `access`               ENUM('ALLOWED',
+                              'DENIED',
+                              'FORCED')
+                           NOT NULL DEFAULT 'ALLOWED',
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`group_id`, `name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ##
+-- ## USERS
+-- ##
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_users
+
+DROP TABLE IF EXISTS `pmgr_users`;
+CREATE TABLE `pmgr_users` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `code`                 VARCHAR(12) NOT NULL, -- User style "id"
+
+  -- Login details.  Passwords are not yet used (and so NULL).
+  `login`                VARCHAR(30)  NOT NULL,
+  `salt`                 CHAR(12)     DEFAULT NULL,
+  `passhash`             VARCHAR(255) DEFAULT NULL,
+
+  -- Contact information for this user
+  `contact_id`           INT(10) UNSIGNED NOT NULL,
+
+  -- Specific comments
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
@@ -363,131 +340,12 @@ CREATE TABLE `pmgr_group_options` (
 
 DROP TABLE IF EXISTS `pmgr_user_options`;
 CREATE TABLE `pmgr_user_options` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
   `user_id`              INT(10) UNSIGNED NOT NULL,
-  `option_value_id`      INT(10) UNSIGNED NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  KEY `user_key` (`user_id`),
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_site_options
-
-DROP TABLE IF EXISTS `pmgr_site_options`;
-CREATE TABLE `pmgr_site_options` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `site_id`              INT(10) UNSIGNED NOT NULL,
-  `option_value_id`      INT(10) UNSIGNED NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  KEY `site_key` (`site_id`),
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
-
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ##
--- ## PERMISSIONS
--- ##
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_permissions
-
-DROP TABLE IF EXISTS `pmgr_permissions`;
-CREATE TABLE `pmgr_permissions` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
   `name`                 VARCHAR(50)  NOT NULL,
+  `value`                VARCHAR(255) NOT NULL,
   `comment`              VARCHAR(255) DEFAULT NULL,
-  UNIQUE KEY `name_key` (`name`),
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-
+  PRIMARY KEY (`user_id`, `name`)
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_permission_values
-
-DROP TABLE IF EXISTS `pmgr_permission_values`;
-CREATE TABLE `pmgr_permission_values` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `permission_id`        INT(10) UNSIGNED NOT NULL,
-  `access`               ENUM('ALLOW',
-                              'DENY')
-                           NOT NULL DEFAULT 'DENY',
-  `level`                SMALLINT UNSIGNED DEFAULT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_default_permissions
-
-DROP TABLE IF EXISTS `pmgr_default_permissions`;
-CREATE TABLE `pmgr_default_permissions` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_group_permissions
-
-DROP TABLE IF EXISTS `pmgr_group_permissions`;
-CREATE TABLE `pmgr_group_permissions` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `group_id`             INT(10) UNSIGNED NOT NULL,
-  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  KEY `group_key` (`group_id`),
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_user_permissions
-
-DROP TABLE IF EXISTS `pmgr_user_permissions`;
-CREATE TABLE `pmgr_user_permissions` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `user_id`              INT(10) UNSIGNED NOT NULL,
-  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  KEY `user_key` (`user_id`),
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_site_permissions
-
-DROP TABLE IF EXISTS `pmgr_site_permissions`;
-CREATE TABLE `pmgr_site_permissions` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `site_id`              INT(10) UNSIGNED NOT NULL,
-  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  KEY `site_key` (`site_id`),
-  PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
@@ -522,6 +380,46 @@ CREATE TABLE `pmgr_sites` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_site_options
+
+DROP TABLE IF EXISTS `pmgr_site_options`;
+CREATE TABLE `pmgr_site_options` (
+  `site_id`              INT(10) UNSIGNED NOT NULL,
+  `name`                 VARCHAR(50)  NOT NULL,
+  `value`                VARCHAR(255) NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`site_id`, `name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_site_memberships
+--
+-- Which users are allowed to access which sites,
+-- and under which set of group permissions (possibly multiple)
+
+-- SELECT U.id, P.name, MAX(P.access)
+--  FROM pmgr_users U
+--    LEFT JOIN pmgr_site_membership   M ON M.user_id = U.id
+--    LEFT JOIN pmgr_groups            G ON G.id = M.group_id
+--    LEFT JOIN pmgr_group_permissions P ON P.group_id = G.id
+-- GROUP BY U.id, P.name
+
+DROP TABLE IF EXISTS `pmgr_site_memberships`;
+CREATE TABLE `pmgr_site_memberships` (
+  `site_id`              INT(10) UNSIGNED NOT NULL,
+  `user_id`              INT(10) UNSIGNED NOT NULL,
+  `group_id`             INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`site_id`, `user_id`, `group_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
 -- TABLE pmgr_site_areas
@@ -539,38 +437,6 @@ CREATE TABLE `pmgr_site_areas` (
 
 
 
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ##
--- ## MEMBERSHIPS
--- ##
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_memberships
---
--- Which users are allowed to access which sites,
--- and under which set of group permissions (possibly multiple)
-
-DROP TABLE IF EXISTS `pmgr_memberships`;
-CREATE TABLE `pmgr_memberships` (
-  `site_id`              INT(10) UNSIGNED NOT NULL,
-  `user_id`              INT(10) UNSIGNED NOT NULL,
-  `group_id`             INT(10) UNSIGNED NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`site_id`, `user_id`, `group_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
 -- ######################################################################
 -- ######################################################################
 -- ######################################################################

db/scratch.sql

@@ -157,422 +157,3 @@ WHERE
  -- catch other types not considered in this query
  OR T.type NOT IN ('RECEIPT', 'CREDIT_NOTE', 'INVOICE', 'PAYMENT')
 
-
-
-
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- #################################################################
--- ## USER / GROUP
-
-INSERT INTO pmgr_groups (`code`, `name`, `rank`)
- VALUES('Owner', 'Owner Group', 25);
-SET @o_gid = LAST_INSERT_ID();
-
-INSERT INTO pmgr_groups (`code`, `name`, `rank`)
- VALUES('Admin', 'Admin Group', 50);
-SET @a_gid = LAST_INSERT_ID();
-
-INSERT INTO pmgr_groups (`code`, `name`, `rank`)
- VALUES('Manager', 'Manager Group', 75);
-SET @m_gid = LAST_INSERT_ID();
-
-INSERT INTO pmgr_groups (`code`, `name`)
- VALUES('Temp', 'Temporary Help');
-SET @t_gid = LAST_INSERT_ID();
-
-INSERT INTO pmgr_users (`code`, `login`, `contact_id`)
- VALUES('AP', 'abijah', 0);
-SET @a_uid = LAST_INSERT_ID();
-
-INSERT INTO pmgr_users (`code`, `login`, `contact_id`)
- VALUES('SK', 'shirley', 0);
-SET @s_uid = LAST_INSERT_ID();
-
-INSERT INTO pmgr_users (`code`, `login`, `contact_id`)
- VALUES('DE', 'dan', 0);
-SET @d_uid = LAST_INSERT_ID();
-
-INSERT INTO pmgr_users (`code`, `login`, `contact_id`)
- VALUES('KD', 'kevin', 0);
-SET @k_uid = LAST_INSERT_ID();
-
-INSERT INTO pmgr_sites (`code`, `name`)
- VALUES('VSS', 'Valley Storage');
-SET @v_sid = LAST_INSERT_ID();
-
-INSERT INTO pmgr_sites (`code`, `name`)
- VALUES('FAKE', 'Fake Site');
-SET @f_sid = LAST_INSERT_ID();
-
--- Site Membership
-
-INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
- VALUES(@v_sid, @a_uid, @o_gid);
-INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
- VALUES(@v_sid, @a_uid, @a_gid);
-INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
- VALUES(@v_sid, @a_uid, @m_gid);
-INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
- VALUES(@v_sid, @s_uid, @m_gid);
-INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
- VALUES(@v_sid, @d_uid, @t_gid);
-INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
- VALUES(@f_sid, @s_uid, @a_gid);
-INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
- VALUES(@f_sid, @s_uid, @m_gid);
-INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
- VALUES(@f_sid, @k_uid, @o_gid);
-INSERT INTO pmgr_site_memberships (`site_id`, `user_id`, `group_id`)
- VALUES(@f_sid, @d_uid, @t_gid);
-
-
--- Options
-
-INSERT INTO pmgr_options (`name`) VALUES ('theme');
-SET @t_oid = LAST_INSERT_ID();
-INSERT INTO pmgr_options (`name`) VALUES ('menu');
-SET @m_oid = LAST_INSERT_ID();
-
--- Default Option Values
-
-INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@t_oid, 'blue');
-INSERT INTO pmgr_default_options (`option_value_id`) VALUES(LAST_INSERT_ID());
-INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@m_oid, 'basic');
-INSERT INTO pmgr_default_options (`option_value_id`) VALUES(LAST_INSERT_ID());
-
--- Group options
-
-INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@t_oid, 'gold');
-INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
- VALUES(@o_gid, LAST_INSERT_ID());
-INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@t_oid, 'silver');
-INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
- VALUES(@a_gid, LAST_INSERT_ID());
-INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@t_oid, 'red');
-INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
- VALUES(@m_gid, LAST_INSERT_ID());
-
-INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@m_oid, 'advanced');
-INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
- VALUES(@o_gid, LAST_INSERT_ID());
-INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@m_oid, 'advanced');
-INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
- VALUES(@a_gid, LAST_INSERT_ID());
-INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@m_oid, 'restricted');
-INSERT INTO pmgr_group_options (`group_id`, `option_value_id`)
- VALUES(@t_gid, LAST_INSERT_ID());
-
--- User Options
-INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@m_oid, 'special');
-INSERT INTO pmgr_user_options (`user_id`, `option_value_id`)
- VALUES(@s_uid, LAST_INSERT_ID());
-
--- Site Options
-INSERT INTO pmgr_option_values (`option_id`, `value`) VALUES (@t_oid, 'site-theme');
-INSERT INTO pmgr_site_options (`site_id`, `option_value_id`)
- VALUES(@f_sid, LAST_INSERT_ID());
-
-
--- SELECT U.id, P.name, MAX(P.access)
---  FROM pmgr_users U
---    LEFT JOIN pmgr_site_membership   M ON M.user_id = U.id
---    LEFT JOIN pmgr_groups            G ON G.id = M.group_id
---    LEFT JOIN pmgr_group_permissions P ON P.group_id = G.id
--- GROUP BY U.id, P.name
-
-
--- User access to site
-SELECT U.id, U.login, COUNT(G.id) AS 'groups', MIN(G.rank) AS highest_rank
- FROM pmgr_users U
-   JOIN pmgr_site_memberships  M ON M.user_id = U.id
-   JOIN pmgr_sites             S ON S.id = M.site_id
-   JOIN pmgr_groups            G ON G.id = M.group_id
-WHERE S.code = 'VSS'
-GROUP BY U.id
-
-
--- User Options
-SELECT O.id, O.name, O.default,
-       GROUP_CONCAT(Uopt.value) AS 'value', COUNT(U.id) AS 'count'
- FROM pmgr_options O
-   LEFT JOIN pmgr_user_options  Uopt ON Uopt.option_id = O.id
-   LEFT JOIN pmgr_users         U    ON U.id = Uopt.user_id
-WHERE U.id = 1
-GROUP BY O.id
-
--- Group Options
-SELECT O.id, O.name, O.default,
-       GROUP_CONCAT(Gopt.value) AS 'value', COUNT(G.id) AS 'count'
- FROM pmgr_options O
-   LEFT JOIN pmgr_group_options  Gopt ON Gopt.option_id = O.id
-   LEFT JOIN pmgr_groups         G    ON G.id = Gopt.group_id
-WHERE G.id = 1
-GROUP BY O.id
-
-
--- Site Options
-SELECT O.id, O.name, O.default,
-       GROUP_CONCAT(Sopt.value) AS 'value', COUNT(S.id) AS 'count'
- FROM pmgr_options O
-   LEFT JOIN pmgr_site_options  Sopt ON Sopt.option_id = O.id
-   LEFT JOIN pmgr_sites         S    ON S.id = Sopt.site_id
-WHERE S.id = 1
-GROUP BY O.id
-
-
--- Option value for member & site
-SELECT O.id, O.name, O.default,
-       S.id AS site_id, Sopt.value,
-       G.id AS group_id, Gopt.value,
-       U.id AS user_id, Uopt.value
- FROM pmgr_options O
-   LEFT JOIN pmgr_site_options  Sopt ON Sopt.option_id = O.id
-   LEFT JOIN pmgr_sites         S    ON S.id = Sopt.site_id
-   LEFT JOIN pmgr_group_options Gopt ON Gopt.option_id = O.id
-   LEFT JOIN pmgr_groups        G    ON G.id = Gopt.group_id
-   LEFT JOIN pmgr_user_options  Uopt ON Uopt.option_id = O.id
-   LEFT JOIN pmgr_users         U    ON U.id = Uopt.user_id
-WHERE O.name = 'theme'
---GROUP BY O.id
-
-
-
--- Option value for member & site
--- 1) User
-SET @sid = 1;
-SET @uid = 1;
-SET @oid = 1;
-SELECT O.name, U.id, Uopt.value
- FROM pmgr_options O
-   JOIN pmgr_user_options      Uopt ON Uopt.option_id = O.id
-   JOIN pmgr_users             U    ON U.id = Uopt.user_id
---   JOIN pmgr_site_memberships  M    ON M.user_id = U.id
---   JOIN pmgr_groups            G    ON G.id = M.group_id
---   JOIN pmgr_sites             S    ON S.id = M.site_id
-WHERE -- S.id = @sid AND
-     U.id = @uid AND O.id = @oid
-;
-
--- 2) Group
-SELECT O.name, G.rank, G.id, Gopt.value
- FROM pmgr_options O
-   JOIN pmgr_group_options     Gopt ON Gopt.option_id = O.id
-   JOIN pmgr_groups            G    ON G.id = Gopt.group_id
-   JOIN pmgr_site_memberships  M    ON M.group_id = G.id
-   JOIN pmgr_users             U    ON U.id = M.user_id
-   JOIN pmgr_sites             S    ON S.id = M.site_id
-WHERE S.id = @sid AND U.id = @uid AND O.id = @oid
-ORDER BY G.rank
-;
-
--- 3) Site
-SELECT O.name, S.id, Sopt.value
- FROM pmgr_options O
-   JOIN pmgr_site_options      Sopt ON Sopt.option_id = O.id
-   JOIN pmgr_sites             S    ON S.id = Sopt.site_id
---    JOIN pmgr_site_memberships  M    ON M.site_id = S.id
---    JOIN pmgr_groups            G    ON G.id = M.group_id
---    JOIN pmgr_users             U    ON U.id = M.user_id
-WHERE S.id = @sid
---      AND U.id = @uid
-      AND O.id = @oid
-;
-
--- 3) Default
-SELECT O.name, O.default AS 'value'
- FROM pmgr_options O
-WHERE O.id = @oid
-;
-
-
--- User Permissions
-
-
--- Group Permissions
-
--- All option values, in order
-SELECT O.name, V.value,
-       U.id AS uid, G.id AS gid, S.id as sid,
-       Dopt.id AS did, G.rank
- FROM pmgr_option_values V
-   JOIN pmgr_options              O    ON O.id = V.option_id
-   LEFT JOIN pmgr_user_options    Uopt ON Uopt.option_value_id = V.id
-   LEFT JOIN pmgr_group_options   Gopt ON Gopt.option_value_id = V.id
-   LEFT JOIN pmgr_site_options    Sopt ON Sopt.option_value_id = V.id
-   LEFT JOIN pmgr_default_options Dopt ON Dopt.option_value_id = V.id
-   LEFT JOIN pmgr_groups          G    ON G.id = Gopt.group_id
-   LEFT JOIN pmgr_users           U    ON U.id = Uopt.user_id
-   LEFT JOIN pmgr_sites           S    ON S.id = Sopt.site_id
-WHERE O.id = @oid
-ORDER BY IF(U.id IS NOT NULL, 1,
-            IF (G.id IS NOT NULL, 2,
-                IF (S.id IS NOT NULL, 3, 4))) ASC,
-         IF (G.id IS NOT NULL, G.rank, 0) ASC
-
-
--- Option values relevant to the user and site, in order
-SELECT O.name, V.value,
-       U.id AS uid, G.id AS gid, S.id as sid,
-       Dopt.id AS did, G.rank
- FROM pmgr_option_values V
-   JOIN pmgr_options              O    ON O.id = V.option_id
-   LEFT JOIN pmgr_user_options    Uopt ON Uopt.option_value_id = V.id
-   LEFT JOIN pmgr_group_options   Gopt ON Gopt.option_value_id = V.id
-   LEFT JOIN pmgr_site_options    Sopt ON Sopt.option_value_id = V.id
-   LEFT JOIN pmgr_default_options Dopt ON Dopt.option_value_id = V.id
-   LEFT JOIN pmgr_groups          G    ON G.id = Gopt.group_id
-   LEFT JOIN pmgr_users           U    ON U.id = Uopt.user_id
-   LEFT JOIN pmgr_sites           S    ON S.id = Sopt.site_id
-   JOIN pmgr_site_memberships  M    ON M.user_id = U.id AND M.site_id = S.id
-WHERE S.id = @sid AND U.id = @uid AND O.id = @oid
-ORDER BY IF(U.id IS NOT NULL, 1,
-            IF (G.id IS NOT NULL, 2,
-                IF (S.id IS NOT NULL, 3, 4))) ASC,
-         IF (G.id IS NOT NULL, G.rank, 0) ASC
-
-
-
-
-
-SET @sid = 1;
-SET @uid = 1;
-SET @oid = 1;
-SELECT O.name, V.value,
-       U.id AS uid,
-		 -- G.id AS gid,
-		 S.id as sid,
-       Dopt.id AS did
-		 -- G.rank
- FROM pmgr_option_values V
-   JOIN pmgr_options              O    ON O.id = V.option_id
-   LEFT JOIN pmgr_user_options    Uopt ON Uopt.option_value_id = V.id
-   LEFT JOIN pmgr_site_options    Sopt ON Sopt.option_value_id = V.id
---   LEFT JOIN pmgr_users           U    ON U.id = Uopt.user_id
---   LEFT JOIN pmgr_group_options   Gopt ON Gopt.option_value_id = V.id
-   LEFT JOIN pmgr_default_options Dopt ON Dopt.option_value_id = V.id
---   LEFT JOIN pmgr_groups          G    ON G.id = Gopt.group_id
-   LEFT JOIN pmgr_users           U    ON U.id = Uopt.user_id
-   LEFT JOIN pmgr_sites           S    ON S.id = Sopt.site_id
-   JOIN pmgr_site_memberships     M    ON M.user_id = U.id -- AND M.site_id = S.id
-WHERE -- S.id = @sid AND U.id = @uid AND 
-  O.id = @oid
-ORDER BY IF(U.id IS NOT NULL, 1,
---            IF (G.id IS NOT NULL, 2,
-                IF (S.id IS NOT NULL, 3, 4)) -- ) ASC,
---         IF (G.id IS NOT NULL, G.rank, 0) ASC
-
-
-
-
-
--- ------------------------------------------------------------
--- ------------------------------------------------------------
--- ------------------------------------------------------------
---  Working version (without defaults)
-SET @sid = 1;
-SET @uid = 1;
-SET @oid = 1;
-SELECT O.name, O.id AS oid, V.value, V.id AS vid,
-       U.id AS uid,
-       G.id AS gid,
-       S.id AS sid,
---       Dopt.id AS did
-       G.rank
- FROM pmgr_users U
-   JOIN pmgr_site_memberships     M ON M.user_id = U.id
-   JOIN pmgr_sites                S ON S.id = M.site_id
-   LEFT JOIN pmgr_groups          G ON G.id = M.group_id
-   LEFT JOIN pmgr_user_options    Uopt ON Uopt.user_id  = U.id
-   LEFT JOIN pmgr_group_options   Gopt ON Gopt.group_id = G.id
-   LEFT JOIN pmgr_site_options    Sopt ON Sopt.site_id  = S.id
-   LEFT JOIN pmgr_option_values   V    ON (V.id = Uopt.option_value_id OR
-                                           V.id = Gopt.option_value_id OR
-                                           V.id = Sopt.option_value_id)
-   JOIN pmgr_options              O    ON O.id = V.option_id
-WHERE S.id = @sid AND U.id = @uid AND O.id = @oid
-ORDER BY IF(U.id IS NOT NULL, 1,
-            IF (G.id IS NOT NULL, 2,
-                IF (S.id IS NOT NULL, 3, 4))) ASC,
-         IF (G.id IS NOT NULL, G.rank, 0) ASC
-;
-
-
-
-
-SET @sid = 1;
-SET @uid = 1;
-SET @oid = 1;
-SELECT O.name, O.id AS oid, V.value, V.id AS vid,
-       U.id AS uid,
-       G.id AS gid,
-       S.id AS sid,
---       Dopt.id AS did
-       G.rank
- FROM pmgr_options O
-   LEFT JOIN pmgr_option_values     V    ON V.option_id = O.id
-   -- Now have the option and all possible values
-   LEFT JOIN pmgr_user_options      Uopt ON Uopt.option_value_id = V.id
-   LEFT JOIN pmgr_group_options     Gopt ON Gopt.option_value_id = V.id
-   LEFT JOIN pmgr_site_options      Sopt ON Sopt.option_value_id = V.id
-   -- Now have the user/group/site that each value applies to
-   LEFT JOIN pmgr_users U           U    ON Uopt.user_id = U.id OR Uopt.user_id IS NULL
-   -- Now restricted to our user
-        JOIN pmgr_site_memberships  M    ON M.user_id = U.id
-        JOIN pmgr_sites             S    ON S.id = M.site_id
-
-
-
-   ON O.id = V.option_id
-   LEFT JOIN pmgr_groups          G ON G.id = M.group_id
-   LEFT JOIN pmgr_option_values   V    ON (V.id = Uopt.option_value_id OR
-                                           V.id = Gopt.option_value_id OR
-                                           V.id = Sopt.option_value_id)
-   JOIN 
-WHERE S.id = @sid AND U.id = @uid AND O.id = @oid
-ORDER BY IF(U.id IS NOT NULL, 1,
-            IF (G.id IS NOT NULL, 2,
-                IF (S.id IS NOT NULL, 3, 4))) ASC,
-         IF (G.id IS NOT NULL, G.rank, 0) ASC
-;
-
-
-
-
-
-
-
-
-
-SET @sid = 1;
-SET @uid = 1;
-SET @oid = 1;
-SELECT O.name, O.id AS oid, V.value, V.id AS vid,
-       U.id AS uid,
-       G.id AS gid,
-       S.id AS sid,
---       Dopt.id AS did
-       G.rank
- FROM pmgr_options O LEFT JOIN pmgr_option_values V ON V.option_id = O.id,
-   pmgr_users U
-   JOIN pmgr_site_memberships     M ON M.user_id = U.id
-   JOIN pmgr_sites                S ON S.id = M.site_id
-   LEFT JOIN pmgr_groups          G ON G.id = M.group_id
-   LEFT JOIN pmgr_user_options    Uopt ON Uopt.user_id  = U.id
-   LEFT JOIN pmgr_group_options   Gopt ON Gopt.group_id = G.id
-   LEFT JOIN pmgr_site_options    Sopt ON Sopt.site_id  = S.id,
-WHERE S.id = @sid AND U.id = @uid AND O.id = @oid
-  AND (V.id = Uopt.option_value_id OR
-       V.id = Gopt.option_value_id OR
-       V.id = Sopt.option_value_id)
-ORDER BY IF(U.id IS NOT NULL, 1,
-            IF (G.id IS NOT NULL, 2,
-                IF (S.id IS NOT NULL, 3, 4))) ASC,
-         IF (G.id IS NOT NULL, G.rank, 0) ASC
-;

site/.htaccess

@@ -10,9 +10,9 @@ deny from all
 
 # Now allow local access
 # Localhost
-# allow from 127.0.0
+allow from 127.0.0
 # Local subnet
-# allow from 192.168.7
+allow from 192.168.7
 
 # Provide a mechanism for user authentication
 AuthType Digest

site/app_controller.php

@@ -35,11 +35,10 @@
  * @subpackage    cake.app
  */
 class AppController extends Controller {
-  var $uses = array('Option', 'Permission');
   var $helpers = array('Html', 'Form', 'Javascript', 'Format', 'Time', 'Grid');
   var $components = array('DebugKit.Toolbar');
 
-  var $sidemenu   = array('areas' => array('SITE' => false, 'CONTROLLER' => false, 'ACTION' => false, 'SANDBOX' => false));
+  var $sidemenu   = array('areas' => array('SITE' => false, 'CONTROLLER' => false, 'ACTION' => false));
   var $std_area   = 10;
   var $admin_area = 20;
   var $dev_area   = 30;
@@ -71,8 +70,6 @@ class AppController extends Controller {
       $name = Inflector::humanize($this->params['controller']);
     elseif ($area == 'ACTION')
       $name = Inflector::humanize(Inflector::singularize($this->params['controller']));
-    elseif ($area == 'SANDBOX')
-      $name = 'Sandbox';
 
     if (empty($this->sidemenu['areas'][$area]))
       $this->sidemenu['areas'][$area]
@@ -199,6 +196,7 @@ class AppController extends Controller {
 			   array('controller' => 'transactions', 'action' => 'deposit'), null,
 			   'SITE');
 
+
     $this->addSideMenuLink('Accounts',
 			   array('controller' => 'accounts', 'action' => 'index'), null,
 			   'SITE', $this->admin_area);
@@ -223,6 +221,9 @@ class AppController extends Controller {
     $this->addSideMenuLink('Assess Charges',
 			   array('controller' => 'leases', 'action' => 'assess_all'), null,
 			   'SITE', $this->admin_area);
+    $this->addSideMenuLink('RESET DATA',
+			   array('controller' => 'accounts', 'action' => 'reset_data'), null,
+			   'SITE', $this->admin_area);
 
 
     $this->addSideMenuLink('Un-Nuke',
@@ -232,53 +233,28 @@ class AppController extends Controller {
     $this->addSideMenuLink('New Ledgers',
 			   array('controller' => 'accounts', 'action' => 'newledger'), null,
 			   'SITE', $this->dev_area);
-    //array('name' => 'RESET DATA',  array('controller' => 'accounts', 'action' => 'reset_data'));
 
 
     $this->addSideMenuLink('New Receipt',
 			   array('controller' => 'customers', 'action' => 'receipt'), null,
 			   'SITE', $this->op_area);
+
     $this->addSideMenuLink('New Invoice',
 			   array('controller' => 'leases', 'action' => 'invoice'), null,
 			   'SITE', $this->op_area);
+
     $this->addSideMenuLink('Move-In',
 			   array('controller' => 'customers', 'action' => 'move_in'), null,
 			   'SITE', $this->op_area);
+
     $this->addSideMenuLink('Move-Out',
 			   array('controller' => 'leases', 'action' => 'move_out'), null,
 			   'SITE', $this->op_area);
+
     $this->addSideMenuLink('New Deposit',
 			   array('controller' => 'tenders', 'action' => 'deposit'), null,
 			   'SITE', $this->op_area);
 
-    $url_components = array('plugin', 'controller', 'action', 'named');
-    if (devbox()) {
-/*       $sources = ConnectionManager::sourceList(); */
-/*       $db = ConnectionManager::getDataSource($sources[0])->config['database']; */
-/*       $this->sideMenuAreaName($db, 'SANDBOX', $this->std_area); */
-      $this->sideMenuAreaName('DevBox', 'SANDBOX', $this->std_area);
-      $this->addSideMenuLink('Rebuild DevBox',
-			     array('controller' => 'util', 'action' => 'rebuild_devbox'), null,
-			     'SANDBOX');
-    }
-    elseif (sandbox()) {
-      $this->addSideMenuLink('Rebuild Sandbox',
-			     array('controller' => 'util', 'action' => 'rebuild_sandbox'), null,
-			     'SANDBOX');
-      $this->addSideMenuLink('Leave Sandbox',
-			     array('sand_route' => false)
-			     + array_intersect_key($this->params, array_flip($url_components))
-			     + $this->params['pass'],
-			     null, 'SANDBOX');
-    }
-    else {
-      $this->addSideMenuLink('Enter Sandbox',
-			     array('sand_route' => true)
-			     + array_intersect_key($this->params, array_flip($url_components))
-			     + $this->params['pass'],
-			     null, 'SANDBOX');
-    }
-
     // REVISIT <AP>: 20090824
     //  Depending on preference, we may put this into the gridView
     //  function, making the links available only when navigating.
@@ -304,32 +280,23 @@ class AppController extends Controller {
    */
 
   function beforeFilter() {
-    $this->params['user']  = $this->Permission->User->currentUser();
+    $this->params['dev'] =
-    $this->params['admin'] = $this->Option->enabled('admin');
+      (!empty($this->params['dev_route']));
-    $this->params['dev']   = devbox();
+    $this->params['admin'] =
-
+      (!empty($this->params['admin_route']) || !empty($this->params['dev_route']));
-    if ($this->params['dev'] && !$this->Option->enabled('dev'))
-      $this->redirect("/");
 
     if (!$this->params['dev'])
       Configure::write('debug', '0');
 
     $this->addDefaultSideMenuLinks();
-    //$this->sideMenuEnable('SITE', $this->op_area, false);
+    $this->sideMenuEnable('SITE', $this->op_area, false);
 
     foreach ($this->sidemenu['areas'] AS $area_name => $area) {
       if (empty($this->params['dev']))
 	$this->sideMenuEnable($area_name, $this->dev_area, false);
       if (empty($this->params['admin']))
 	$this->sideMenuEnable($area_name, $this->admin_area, false);
-    }
+  }
-
-    $this->authorize("controller.{$this->params['controller']}");
-    $this->authorize("action.{$this->params['controller']}.{$this->params['action']}");
-
-    $this->log('----------------------------------------------------------------------', 'request');
-    $this->log('----------------------------------------------------------------------', 'request');
-    $this->log($this->params, 'request');
   }
 
 
@@ -366,21 +333,21 @@ class AppController extends Controller {
 	foreach ($subarea['priorities'] AS $pname => &$priority) {
 	  if (empty($priority))
 	    unset($subarea['priorities'][$pname]);
-	}
+      }
 	unset($priority);
 
 	if (empty($subarea['priorities']))
 	  unset($area['subareas'][$sname]);
-      }
+    }
       unset($subarea);
 
       if (empty($area['subareas']))
 	unset($this->sidemenu['areas'][$aname]);
-    }
+  }
     unset($area);
 
     // Activate a default section (unless already specified)
-    foreach (array_reverse(array_diff_key($this->sidemenu['areas'], array('SANDBOX'=>1))) AS $area_name => $area) {
+    foreach (array_reverse($this->sidemenu['areas']) AS $area_name => $area) {
       if (empty($area))
 	continue;
 
@@ -429,6 +396,35 @@ class AppController extends Controller {
   }
 
 
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: reset_data
+   *  - Development function.  TO BE DELETED
+   */
+
+  function reset_data() {
+    $this->layout = null;
+    $this->autoLayout = false;
+    $this->autoRender = false;
+    Configure::write('debug', '0');
+    $script = preg_replace("%/webroot/index\.php$%",
+			   "/../build.cmd",
+			   $_SERVER['SCRIPT_FILENAME']);
+    echo "<P>" . date('r') . "\n";
+    $db = & $this->Account->getDataSource();
+    $script .= ' "' . $db->config['database'] . '"';
+    $script .= ' "' . $db->config['login']    . '"';
+    $script .= ' "' . $db->config['password'] . '"';
+    $handle = popen($script . ' 2>&1', 'r');
+    echo "<P>\n";
+    while (($read = fread($handle, 2096))) {
+      echo str_replace("\n", "<BR>\n", htmlspecialchars($read));
+    }
+    pclose($handle);
+  }
+
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -600,8 +596,8 @@ class AppController extends Controller {
     // Grouping (which would not be typical)
     $query['group'] = $this->gridDataCountGroup($params, $model);
 
-    if ($params['debug'])
+    // DEBUG PURPOSES ONLY!
-      $params['count_query'] = $query;
+    $params['count_query'] = $query;
 
     // Get the number of records prior to pagination
     return $this->gridDataCountExecute($params, $model, $query);
@@ -857,8 +853,8 @@ class AppController extends Controller {
 					      isset($params['sidx']) ? $params['sidx'] : null,
 					      isset($params['sord']) ? $params['sord'] : null);
 
-    if ($params['debug'])
+    // DEBUG PURPOSES ONLY!
-      $params['query'] = $query;
+    $params['query'] = $query;
 
     return $this->gridDataRecordsExecute($params, $model, $query);
   }
@@ -981,7 +977,6 @@ class AppController extends Controller {
     $this->gridDataPostProcessLinks($params, $model, $records, array());
 
     // DEBUG PURPOSES ONLY!
-    //if ($params['debug'])
     //$params['records'] = $records;
   }
 
@@ -1059,7 +1054,6 @@ class AppController extends Controller {
 	    continue;
 
 	  // DEBUG PURPOSES ONLY!
-	  //if ($params['debug'])
 	  //$params['linkrecord'][] = compact('table', 'field', 'id', 'controller', 'record');
 	  $record[$table][$field] =
 	    '<A HREF="' .
@@ -1092,7 +1086,7 @@ class AppController extends Controller {
   function gridDataOutputHeader(&$params, &$model) {
     if (!$params['debug'])
       header("Content-type: text/xml;charset=utf-8");
-  }
+    }
 
   function gridDataOutputXMLHeader(&$params, &$model) {
     echo "<?xml version='1.0' encoding='utf-8'?>\n";
@@ -1154,26 +1148,14 @@ class AppController extends Controller {
       echo "  <cell><![CDATA[$data]]></cell>\n"; 
   }
 
-  function authorize($name) {
-    if ($this->Permission->deny($name))
-      $this->UNAUTHORIZED("Unauthorized: $name");
-  }
-
-  function UNAUTHORIZED($msg) {
-    //$this->redirect('controller' => '???', 'action' => 'login');
-    //$this->render('/unauthorized');
-    $this->set('message', '<H2>' . $msg . '</H2>');
-    $this->render_empty();
-  }
-
   function INTERNAL_ERROR($msg, $depth = 0) {
     INTERNAL_ERROR($msg, false, $depth+1);
     $this->render_empty();
+    $this->_stop();
   }
 
   function render_empty() {
-    echo $this->render('/empty');
+    $this->render('/empty');
-    $this->_stop();
   }
 
 }

site/app_helper.php

@@ -39,7 +39,7 @@ App::import('Core', 'Helper');
 class AppHelper extends Helper {
 
   function url($url = null, $full = false) {
-    foreach(array('sand_route', 'dev_route') AS $mod) {
+    foreach(array('admin_route', 'dev_route') AS $mod) {
       if (isset($this->params[$mod]) && is_array($url) && !isset($url[$mod]))
             $url[$mod] = $this->params[$mod];
     }

site/app_model.php

@@ -42,10 +42,6 @@ class AppModel extends Model {
   var $useNullForEmpty = true;
   var $formatDateFields = true;
 
-  // Loaded related models with no association
-  var $knows = array();
-  var $app_knows = array('Option');
-
   // Default Log Level, if not specified at the function level
   var $default_log_level = 5;
 
@@ -62,35 +58,16 @@ class AppModel extends Model {
   var $max_log_level;
 
 
-  /**************************************************************************
+  // REVISIT <AP>: 20090730
-   **************************************************************************
+  //  Why is this constructor crashing?
-   **************************************************************************
+  //  Clearly it's in some sort of infinite
-   * function: __construct
+  //  loop, but it seems the correct way
-   */
+  //  to have a constructor call the parent...
-
-  function __construct($id = false, $table = null, $ds = null) {
-    parent::__construct($id, $table, $ds);
-
-    $this->knows = array_merge($this->app_knows, $this->knows);
-    //$this->pr(1, array('knows' => $this->knows));
-    foreach ($this->knows as $alias => $modelName) {
-      if (is_numeric($alias)) {
-	$alias = $modelName;
-      }
-
-      // Don't overwrite any existing alias
-      if (!empty($this->{$alias}) || get_class($this) == $alias)
-	continue;
-
-      $model = array('class' => $modelName, 'alias' => $alias);
-      if (PHP5) {
-	$this->{$alias} = ClassRegistry::init($model);
-      } else {
-	$this->{$alias} =& ClassRegistry::init($model);
-      }
-    }
-  }
 
+/*   function __construct() { */
+/*     parent::__construct(); */
+/*     $this->prClassLevel(5, 'Model'); */
+/*   } */
 
   /**************************************************************************
    **************************************************************************
@@ -104,8 +81,7 @@ class AppModel extends Model {
     $caller = array_shift($trace);
     $caller = array_shift($trace);
     if (empty($class))
-      $class = get_class($this);
+      $class = $caller['class'];
-    $this->pr(50, compact('class', 'level'));
     $this->class_log_level[$class] = $level;
   }
 
@@ -114,10 +90,9 @@ class AppModel extends Model {
     $caller = array_shift($trace);
     $caller = array_shift($trace);
     if (empty($class))
-      $class = get_class($this);
+      $class = $caller['class'];
     if (empty($function))
       $function = $caller['function'];
-    $this->pr(50, compact('class', 'function', 'level'));
     $this->function_log_level["{$class}-{$function}"] = $level;
   }
 
@@ -305,9 +280,7 @@ class AppModel extends Model {
       if (preg_match("/^_/", $name) && !$all)
 	unset($vars[$name]);
     }
-    //$vars['class'] = get_class_vars(get_class($this));
+    pr($vars);
-
-    $this->pr(1, $vars);
   }
 
 
@@ -507,9 +480,9 @@ class AppModel extends Model {
       return date('Y-m-d', strtotime($dateString));
   }
 
-  function INTERNAL_ERROR($msg, $depth = 0, $force_stop = false) {
+  function INTERNAL_ERROR($msg, $depth = 0) {
-    INTERNAL_ERROR($msg, $force_stop, $depth+1);
+    INTERNAL_ERROR($msg, false, $depth+1);
-    echo $this->requestAction(array('controller' => 'util',
+    echo $this->requestAction(array('controller' => 'accounts',
 				    'action' => 'render_empty'),
 			      array('return', 'bare' => false)
 			      );

site/build_devbox.cmd

@@ -1,5 +0,0 @@
-@echo off
-mysqldump --user=pmgr --password=pmgruser --opt property_manager > H:\pmgr_dev.sql
-mysql --user=pmgr --password=pmgruser --database=pmgr_dev < H:\pmgr_dev.sql
-del H:\pmgr_dev.sql
-echo Build Complete!

site/build_sandbox.cmd

@@ -1,5 +0,0 @@
-@echo off
-mysqldump --user=pmgr --password=pmgruser --opt property_manager > H:\pmgr_sand.sql
-mysql --user=pmgr --password=pmgruser --database=pmgr_sand < H:\pmgr_sand.sql
-del H:\pmgr_sand.sql
-echo Build Complete!

site/config/bootstrap.php

@@ -32,29 +32,7 @@
  *
  */
 
-function sandbox() {
-  $r = Router::requestRoute();
-  return !empty($r[3]['sand_route']);
-}
-
-function devbox() {
-  $r = Router::requestRoute();
-  return !empty($r[3]['dev_route']);
-}
-
-function server_request_var($var) {
-  if (preg_match("/^HTTP_ACCEPT|REMOTE_PORT/", $var))
-    return false;
-  return (preg_match("/^HTTP|REQUEST|REMOTE/", $var));
-}
-
 function INTERNAL_ERROR($message, $exit = true, $drop = 0) {
-  $O = new Object();
-  for ($i=0; $i<3; ++$i) {
-    $O->log(str_repeat("\\", 80));
-    $O->log(str_repeat("/", 80));
-  }
-  $O->log("INTERNAL ERROR: $message");
   echo '<DIV class="internal-error" style="color:#000; background:#c22; padding:0.5em 1.5em 0.5em 1.5em;">' . "\n";
   echo '<H1 style="color:#000; margin-bottom:0.2em; font-size:2em;">INTERNAL ERROR:</H1>' . "\n";
   echo '<H2 style="color:#000; margin-top:0; margin-left:1.5em; font-size:1.5em">' . $message . '</H2>' . "\n";
@@ -62,10 +40,8 @@ function INTERNAL_ERROR($message, $exit = true, $drop = 0) {
   echo '<BR>It is a problem within the application itself and should be reported to the administrator.</H4>' . "\n";
 
   // Print out the entire stack trace
-  $O->log(str_repeat("-", 30));
-  $O->log("Stack:");
   echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nStack Trace:\n";
-  echo '<OL style="margin-top:0.5em; margin-left:0.0em";>' . "\n";
+  echo '<OL style="margin-left:1.5em";>' . "\n";
   $trace = array_slice(debug_backtrace(false), $drop);
   for ($i = 0; $i < count($trace); ++$i) {
     $bline = $trace[$i]['line'];
@@ -81,36 +57,14 @@ function INTERNAL_ERROR($message, $exit = true, $drop = 0) {
       $bclas = null;
     }
 
-    $O->log("   $bfile:$bline (" . ($bclas ? "$bclas::$bfunc" : "entry point") . ")");
     echo("<LI>$bfile:$bline (" . ($bclas ? "$bclas::$bfunc" : "entry point") . ")</LI>\n");
   }
   echo "</OL>\n";
 
-  $O->log(str_repeat("-", 30));
-  $O->log("HTTP Request:");
   echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nHTTP Request:\n";
-  echo '<UL style="margin-top:0.5em; margin-left:0.0em";>' . "\n";
+  echo '<P><PRE style="color:#000; background:#c22;">' . "\n";
-  foreach($_REQUEST AS $k => $v) {
+  print_r($_REQUEST);
-    $O->log(sprintf("   %-20s => %s", $k, $v));
+  echo "\n</PRE>\n";
-    echo("<LI>$k =&gt; $v</LI>\n");
-  }
-  echo "</UL>\n";
-
-  $O->log(str_repeat("-", 30));
-  $O->log("Server:");
-  $SRV = array_intersect_key($_SERVER, array_flip(array_filter(array_keys($_SERVER), 'server_request_var')));
-  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nServer:\n";
-  echo '<UL style="margin-top:0.5em; margin-left:0.0em";>' . "\n";
-  foreach($SRV AS $k => $v) {
-    if ($k == 'REQUEST_TIME')
-      $v = date('c', $v);
-    $O->log(sprintf("   %-20s => %s", $k, $v));
-    echo("<LI>$k =&gt; $v</LI>\n");
-  }
-  echo "</UL>\n";
-
-  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\n";
-  echo date('c') . "<BR>\n";
 
   echo '</DIV>';
   if ($exit)

site/config/database.php

@@ -7,14 +7,12 @@ class DATABASE_CONFIG {
 		'host' => 'localhost',
 		'login' => 'pmgr',
 		'password' => 'pmgruser',
-		'database' => 'property_manager',
+		'database' => 'pmgr_sand',
 		'prefix' => 'pmgr_',
 	);
 
 	function __construct() {
-		if (devbox())
+		if (preg_match("%^/[^/]*sand/%", $_SERVER['REQUEST_URI']))
-			$this->default['database'] = 'pmgr_dev';
-		if (sandbox())
 			$this->default['database'] = 'pmgr_sand';
 	}
 }

site/config/routes.php

@@ -37,15 +37,15 @@ $default_path = array('controller' => 'maps', 'action' => 'view', '1');
 Router::connect('/', $default_path);
 
 /*
- * Route for sandbox functionality
+ * Route for admin functionality
  */
-Router::connect('/sand',
+Router::connect('/admin',
-		array('sand_route' => true) + $default_path);
+		array('admin_route' => true) + $default_path);
-Router::connect('/sand/:controller/:action/*',
+Router::connect('/admin/:controller/:action/*',
-		array('sand_route' => true, 'action' => null));
+		array('admin_route' => true, 'action' => null));
 
 /*
- * Route for developement functionality
+ * Route for development functionality
  */
 Router::connect('/dev',
 		array('dev_route' => true) + $default_path);

site/controllers/accounts_controller.php

@@ -2,6 +2,8 @@
 
 class AccountsController extends AppController {
 
+  var $uses = array('Account', 'LedgerEntry');
+
 
   /**************************************************************************
    **************************************************************************
@@ -98,8 +100,9 @@ class AccountsController extends AppController {
       $conditions[] = array('Account.type' => strtoupper($params['action']));
     }
 
-    $conditions[] = array('Account.level >=' =>
+    // REVISIT <AP>: 20090811
-			  $this->Permission->level('controller.accounts'));
+    //  No security issues have been worked out yet
+    $conditions[] = array('Account.level >=' => 10);
 
     return $conditions;
   }
@@ -180,8 +183,9 @@ class AccountsController extends AppController {
 			 ('order' => array('CloseTransaction.stamp' => 'DESC'))),
 		   ),
 	     'conditions' => array(array('Account.id' => $id),
-				   array('Account.level >=' =>
+				   // REVISIT <AP>: 20090811
-					 $this->Permission->level('controller.accounts')),
+				   //  No security issues have been worked out yet
+				   array('Account.level >=' => 10),
 				   ),
 	     )
        );

site/controllers/customers_controller.php

@@ -23,9 +23,9 @@ class CustomersController extends AppController {
 			   array('controller' => 'customers', 'action' => 'all'), null,
 			   'CONTROLLER');
 
-/*     $this->addSideMenuLink('New Customer', */
+    $this->addSideMenuLink('New Customer',
-/* 			   array('controller' => 'customers', 'action' => 'add'), null, */
+			   array('controller' => 'customers', 'action' => 'add'), null,
-/* 			   'CONTROLLER', $this->new_area); */
+			   'ACTION', $this->new_area);
   }
 
 

site/controllers/double_entries_controller.php

@@ -34,9 +34,6 @@ class DoubleEntriesController extends AppController {
        array('contain' => array('Ledger' => array('Account')),
 	     'conditions' => array('DebitEntry.id' => $entry['DebitEntry']['id']),
 	     ));
-    $entry['Ledger']['link'] =
-      $entry['Ledger']['Account']['level'] >=
-      $this->Permission->level('controller.accounts');
     $entry['DebitLedger'] = $entry['Ledger'];
     unset($entry['Ledger']);
 
@@ -45,9 +42,6 @@ class DoubleEntriesController extends AppController {
        array('contain' => array('Ledger' => array('Account')),
 	     'conditions' => array('CreditEntry.id' => $entry['CreditEntry']['id']),
 	     ));
-    $entry['Ledger']['link'] =
-      $entry['Ledger']['Account']['level'] >=
-      $this->Permission->level('controller.accounts');
     $entry['CreditLedger'] = $entry['Ledger'];
     unset($entry['Ledger']);
 

site/controllers/ledger_entries_controller.php

@@ -117,12 +117,8 @@ class LedgerEntriesController extends AppController {
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['LedgerEntry']    = array('id');
     $links['Transaction']    = array('id');
-    // REVISIT <AP>: 20090827
+    $links['Ledger']         = array('id');
-    //  Need to take 'level' into account
+    $links['Account']        = array('controller' => 'accounts', 'name');
-    if ($this->Permission->allow('controller.accounts')) {
-      $links['Ledger']         = array('id');
-      $links['Account']        = array('name');
-    }
     $links['Tender']         = array('name');
     return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
@@ -148,8 +144,12 @@ class LedgerEntriesController extends AppController {
 	      array('fields' => array('id', 'sequence', 'name'),
 		    'Account' => 
 		    array('fields' => array('id', 'name', 'type'),
-			  ),
+			  'conditions' =>
-		    ),
+			  // REVISIT <AP>: 20090811
+			  //  No security issues have been worked out yet
+			  array('Account.level >=' => 5),
+			),
+		  ),
 
 	      'Tender' =>
 	      array('fields' => array('id', 'name'),

site/controllers/ledgers_controller.php

@@ -86,8 +86,9 @@ class LedgersController extends AppController {
       $conditions[] = array('Ledger.close_transaction_id !=' => null);
     }
 
-    $conditions[] = array('Account.level >=' =>
+    // REVISIT <AP>: 20090811
-			  $this->Permission->level('controller.accounts'));
+    //  No security issues have been worked out yet
+    $conditions[] = array('Account.level >=' => 10);
 
     return $conditions;
   }
@@ -106,12 +107,8 @@ class LedgersController extends AppController {
   }
 
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
-    // REVISIT <AP>: 20090827
+    $links['Ledger'] = array('name');
-    //  Need to take 'level' into account
+    $links['Account'] = array('name');
-    if ($this->Permission->allow('controller.accounts')) {
-      $links['Ledger'] = array('sequence');
-      $links['Account'] = array('name');
-    }
     return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
@@ -131,8 +128,9 @@ class LedgersController extends AppController {
 		   'Account',
 		   ),
 	     'conditions' => array(array('Ledger.id' => $id),
-				   array('Account.level >=' =>
+				   // REVISIT <AP>: 20090811
-					 $this->Permission->level('controller.accounts')),
+				   //  No security issues have been worked out yet
+				   array('Account.level >=' => 10),
 				   ),
 	     )
        );

site/controllers/statement_entries_controller.php

@@ -108,10 +108,11 @@ class StatementEntriesController extends AppController {
     if (isset($customer_id))
       $conditions[] = array('StatementEntry.customer_id' => $customer_id);
 
-    if (isset($statement_entry_id))
+    if (isset($statement_entry_id)) {
       $conditions[] = array('OR' =>
 			    array(array('ChargeEntry.id' => $statement_entry_id),
 				  array('DisbursementEntry.id' => $statement_entry_id)));
+    }
 
     if ($params['action'] === 'unreconciled') {
       $query = array('conditions' => $conditions);
@@ -131,10 +132,7 @@ class StatementEntriesController extends AppController {
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['StatementEntry'] = array('id');
     $links['Transaction']    = array('id');
-    // REVISIT <AP>: 20090827
+    $links['Account']        = array('name');
-    //  Need to take 'level' into account
-    if ($this->Permission->allow('controller.accounts'))
-      $links['Account']        = array('name');
     $links['Customer']       = array('name');
     $links['Lease']          = array('number');
     $links['Unit']           = array('name');
@@ -255,12 +253,15 @@ class StatementEntriesController extends AppController {
       ('first',
        array('contain' => array
 	     ('Transaction' => array('fields' => array('id', 'type', 'stamp')),
-	      'Account' => array('id', 'name', 'type', 'level'),
+	      'Account' => array('id', 'name', 'type'),
 	      'Customer' => array('fields' => array('id', 'name')),
 	      'Lease' => array('fields' => array('id', 'number')),
 	      ),
 
 	     'conditions' => array(array('StatementEntry.id' => $id),
+				   // REVISIT <AP>: 20090811
+				   //  No security issues have been worked out yet
+				   array('Account.level >=' => 5)
 				   ),
 	     ));
 
@@ -269,10 +270,6 @@ class StatementEntriesController extends AppController {
       $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
     }
 
-    $entry['Account']['link'] =
-      $entry['Account']['level'] >=
-      $this->Permission->level('controller.accounts');
-
     $stats = $this->StatementEntry->stats($id);
 
     if (in_array(strtoupper($entry['StatementEntry']['type']), $this->StatementEntry->debitTypes()))

site/controllers/tenders_controller.php

@@ -62,7 +62,7 @@ class TendersController extends AppController {
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['Tender']      = array('name', 'id');
     $links['Customer']    = array('name');
-    //$links['TenderType']  = array('name');
+    $links['TenderType']  = array('name');
     return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 

site/controllers/transactions_controller.php

@@ -48,9 +48,9 @@ class TransactionsController extends AppController {
   function invoice()  { $this->gridView('Invoices'); }
   function receipt()  { $this->gridView('Receipts'); }
   function deposit()  {
-/*     $this->addSideMenuLink('New Deposit', */
+    $this->addSideMenuLink('New Deposit',
-/* 			   array('controller' => 'tenders', 'action' => 'deposit'), null, */
+			   array('controller' => 'tenders', 'action' => 'deposit'), null,
-/* 			   'CONTROLLER', $this->new_area); */
+			   'ACTION', $this->new_area);
     $this->gridView('Deposits');
   }
 
@@ -95,6 +95,10 @@ class TransactionsController extends AppController {
     if (in_array($params['action'], array('invoice', 'receipt', 'deposit')))
       $conditions[] = array('Transaction.type' => strtoupper($params['action']));
 
+    // REVISIT <AP>: 20090811
+    //  No security issues have been worked out yet
+    $conditions[] = array('Account.level >=' => 5);
+
     return $conditions;
   }
 
@@ -276,7 +280,7 @@ class TransactionsController extends AppController {
       $this->Session->setFlash(__('Unable to Create Deposit', true));
       $this->redirect(array('controller' => 'tenders', 'action'=>'deposit'));
     }
-
+      
     // Present the deposit slip to the user
     $this->redirect(array('controller' => 'transactions',
 			  'action' => 'deposit_slip',
@@ -395,23 +399,28 @@ class TransactionsController extends AppController {
       ('first',
        array('contain' =>
 	     array(// Models
-		   'Account(id,name,level)',
+		   'Account(id,name)',
 		   'Ledger(id,sequence)',
 		   'NsfTender(id,name)',
 		   ),
 	     'conditions' => array(array('Transaction.id' => $id),
+				   // REVISIT <AP>: 20090811
+				   //  No security issues have been worked out yet
+				   array('OR' =>
+					 array(array('Account.level >=' => 5),
+					       array('Account.id' => null))),
 				   ),
 	     ));
 
+    // REVISIT <AP>: 20090815
+    //  for debug purposes only (pr output)
+    $this->Transaction->stats($id);
+
     if (empty($transaction)) {
       $this->Session->setFlash(__('Invalid Item.', true));
       $this->redirect(array('action'=>'index'));
     }
 
-    $transaction['Account']['link'] =
-      $transaction['Account']['level'] >=
-      $this->Permission->level('controller.accounts');
-
     if ($transaction['Transaction']['type'] === 'DEPOSIT')
       $this->addSideMenuLink('View Slip',
 			     array('action' => 'deposit_slip', $id), null,
@@ -440,12 +449,15 @@ class TransactionsController extends AppController {
    */
 
   function deposit_slip($id) {
-    // Find the deposit transaction
+    // Build a container for the deposit slip data
-    $this->Transaction->id = $id;
+    $deposit = array('types' => array());
-    $deposit = $this->Transaction->find('first', array('contain' => false));
+
+    $this->id = $id;
+    $deposit +=
+      $this->Transaction->find('first', array('contain' => false));
 
     // Get a summary of all forms of tender in the deposit
-    $tenders = $this->Transaction->find
+    $result = $this->Transaction->find
       ('all',
        array('link' => array('DepositTender' =>
 			     array('fields' => array(),
@@ -460,17 +472,16 @@ class TransactionsController extends AppController {
 	     'group' => 'TenderType.id',
 	     ));
 
-    // Verify the deposit exists, and that something was actually deposited
+    if (empty($result)) {
-    if (empty($deposit) || empty($tenders)) {
+      die();
       $this->Session->setFlash(__('Invalid Deposit.', true));
       $this->redirect(array('action'=>'deposit'));
     }
 
     // Add the summary to our deposit slip data container
-    $deposit['types'] = array();
+    foreach ($result AS $type) {
-    foreach ($tenders AS $tender) {
+      $deposit['types'][$type['TenderType']['id']] =
-      $deposit['types'][$tender['TenderType']['id']] =
+	$type['TenderType'] + $type[0];
-	$tender['TenderType'] + $tender[0];
     }
 
     $deposit_total = 0;

site/controllers/util_controller.php

@@ -1,65 +0,0 @@
-<?php
-
-class UtilController extends AppController {
-
-  var $uses = array();
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: reset_data
-   *  - Development function.  TO BE DELETED
-   */
-
-  function reset_data() {
-    $this->layout = null;
-    $this->autoLayout = false;
-    $this->autoRender = false;
-    Configure::write('debug', '0');
-    $script = $_SERVER['DOCUMENT_ROOT'] . '/pmgr/build.cmd';
-    echo "<P>" . date('r') . "\n";
-    //echo "<P>Script: $script" . "\n";
-    $handle = popen($script . ' 2>&1', 'r');
-    //echo "<P>Handle: $handle; " . gettype($handle) . "\n";
-    echo "<P><PRE>\n";
-    while (($read = fread($handle, 2096))) {
-      echo $read;
-    }
-    echo "</PRE>\n";
-    pclose($handle);
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: rebuild_box
-   */
-
-  function rebuild_box($type) {
-    $this->layout = null;
-    $this->autoLayout = false;
-    $this->autoRender = false;
-    Configure::write('debug', '0');
-    $script = preg_replace('%/webroot/index.php$%',
-			   '/build_'.$type.'box.cmd',
-			   $_SERVER['SCRIPT_FILENAME']);
-
-    // REVISIT <AP>: 20090828
-    //  Just use system call
-    $handle = popen($script . ' 2>&1', 'r');
-    while (($read = fread($handle, 2096))) {
-      // Do nothing
-    }
-    pclose($handle);
-
-    $url = $_SERVER['HTTP_REFERER'];
-    if (empty($url))
-      $url = "/";
-
-    $this->redirect($url);
-  }
-
-  function rebuild_sandbox() { $this->rebuild_box('sand'); }
-  function rebuild_devbox()  { $this->rebuild_box('dev'); }
-
-}

site/models/default_option.php

@@ -1,21 +0,0 @@
-<?php
-class DefaultOption extends AppModel {
-
-  var $belongsTo =
-    array('OptionValue',
-	  );
-
-
-  function values($name = null) {
-    $this->prEnter(compact('name'));
-
-    $query = array();
-    $this->queryInit($query);
-
-    $query['link']['DefaultOption'] = array();
-    $query['link']['DefaultOption']['type'] = 'INNER';
-    $query['link']['DefaultOption']['fields'] = array();
-    return $this->prReturn($this->OptionValue->values($name, $query));
-  }
-
-}

site/models/default_permission.php

@@ -1,21 +0,0 @@
-<?php
-class DefaultPermission extends AppModel {
-
-  var $belongsTo =
-    array('PermissionValue',
-	  );
-
-
-  function values($name = null) {
-    $this->prEnter(compact('name'));
-
-    $query = array();
-    $this->queryInit($query);
-
-    $query['link']['DefaultPermission'] = array();
-    $query['link']['DefaultPermission']['type'] = 'INNER';
-    $query['link']['DefaultPermission']['fields'] = array();
-    return $this->prReturn($this->PermissionValue->values($name, $query));
-  }
-
-}

site/models/group.php

@@ -1,38 +0,0 @@
-<?php
-class Group extends AppModel {
-
-  var $hasMany =
-    array('GroupOption',
-	  'Membership',
-	  );
-
-  var $knows = 
-    array('User',
-	  'Site',
-	  );
-
-  static $current_group_ids;
-  function currentGroupIds() {
-    if (empty(self::$current_group_ids))
-      self::$current_group_ids = $this->groupIds();
-
-    if (empty(self::$current_group_ids))
-      // We must force a stop here, since this is typically
-      // called very early on, and so will cause a recursive
-      // crash as we try to render the internal error and
-      // again stumble on this problem.
-      $this->INTERNAL_ERROR('INVALID MEMBERSHIP', 0, true);
-
-    return self::$current_group_ids;
-  }
-
-  function groupIds($user_id = null, $site_id = null) {
-    if (empty($user_id))
-      $user_id = $this->User->currentUserId();
-    if (empty($site_id))
-      $site_id = $this->Site->currentSiteId();
-
-    return $this->Membership->memberGroups($user_id, $site_id);
-  }
-
-}

site/models/group_option.php

@@ -1,25 +0,0 @@
-<?php
-class GroupOption extends AppModel {
-
-  var $belongsTo =
-    array('Group',
-	  'OptionValue',
-	  );
-
-
-  function values($ids, $name = null) {
-    $this->prEnter(compact('id', 'name'));
-
-    $query = array();
-    $this->queryInit($query);
-
-    $query['link']['GroupOption'] = array();
-    $query['link']['GroupOption']['fields'] = array();
-    $query['link']['GroupOption']['Group'] = array();
-    $query['link']['GroupOption']['Group']['fields'] = array();
-    $query['conditions'][] = array('Group.id' => $ids);
-    $query['order'][] = 'Group.rank';
-    return $this->prReturn($this->OptionValue->values($name, $query));
-  }
-
-}

site/models/group_permission.php

@@ -1,25 +0,0 @@
-<?php
-class GroupPermission extends AppModel {
-
-  var $belongsTo =
-    array('Group',
-	  'PermissionValue',
-	  );
-
-
-  function values($ids, $name = null) {
-    $this->prEnter(compact('id', 'name'));
-
-    $query = array();
-    $this->queryInit($query);
-
-    $query['link']['GroupPermission'] = array();
-    $query['link']['GroupPermission']['fields'] = array();
-    $query['link']['GroupPermission']['Group'] = array();
-    $query['link']['GroupPermission']['Group']['fields'] = array();
-    $query['conditions'][] = array('Group.id' => $ids);
-    $query['order'][] = 'Group.rank';
-    return $this->prReturn($this->PermissionValue->values($name, $query));
-  }
-
-}

site/models/membership.php

@@ -1,37 +0,0 @@
-<?php
-class Membership extends AppModel {
-
-  var $belongsTo =
-    array('User',
-	  'Site',
-	  'Group'
-	  );
-
-  function memberGroups($user_id, $site_id) {
-    $this->prEnter(compact('user_id', 'site_id'));
-
-    $this->cacheQueries = true;
-    $groups = $this->find('all', array
-			  ('recursive' => -1,
-			   'fields' => array('group_id'),
-			   'conditions' => array(array('user_id' => $user_id),
-						 array('site_id' => $site_id)),
-			   ));
-    $this->cacheQueries = false;
-
-    if (empty($groups))
-      return $this->prReturn(null);
-
-    $group_ids = array();
-    foreach ($groups AS $group)
-      $group_ids[] = $group['Membership']['group_id'];
-
-    return $this->prReturn($group_ids);
-  }
-
-  function memberOf($user_id, $site_id) {
-    $groups = $this->memberGroups($user_id, $site_id);
-    return (!empty($groups));
-  }
-
-}

site/models/option.php

@@ -1,76 +0,0 @@
-<?php
-class Option extends AppModel {
-
-  var $hasMany =
-    array('OptionValue',
-	  );
-
-  var $knows =
-    array('User', 'Site', 'Group');
-
-
-  static $option_set = array();
-
-  function getAll($name, $force = false) {
-/*     $this->prClassLevel(30); */
-/*     //$this->OptionValue->prClassLevel(30); */
-/*     $this->Group->Membership->prClassLevel(30); */
-/*     $this->OptionValue->SiteOption->prClassLevel(30); */
-/*     $this->OptionValue->UserOption->prClassLevel(30); */
-/*     $this->OptionValue->GroupOption->prClassLevel(30); */
-/*     $this->OptionValue->DefaultOption->prClassLevel(30); */
-    $this->prEnter(compact('name'));
-
-    if (!empty(self::$option_set[$name]) && !$force)
-      return $this->prReturn(self::$option_set[$name]);
-
-    self::$option_set[$name] = array();
-
-    $site_id   = $this->Site->currentSiteId();
-    $user_id   = $this->User->currentUserId();
-    $group_ids = $this->Group->currentGroupIds();
-
-/*     $site_id = 2; */
-/*     $user_id = 4; */
-/*     $group_ids = $this->Group->groupIds($user_id, $site_id); */
-
-    if (!empty($site_id))
-      self::$option_set[$name] =
-	array_merge(self::$option_set[$name],
-		    $this->OptionValue->SiteOption->values($site_id, $name));
-
-    if (!empty($user_id))
-      self::$option_set[$name] =
-	array_merge(self::$option_set[$name],
-		    $this->OptionValue->UserOption->values($user_id, $name));
-
-    if (!empty($group_ids))
-      self::$option_set[$name] =
-	array_merge(self::$option_set[$name],
-		    $this->OptionValue->GroupOption->values($group_ids, $name));
-
-    self::$option_set[$name] =
-      array_merge(self::$option_set[$name],
-		  $this->OptionValue->DefaultOption->values($name));
-
-    return $this->prReturn(self::$option_set[$name]);
-  }
-
-  function get($name) {
-    $this->prEnter(compact('name'));
-    $values = $this->getAll($name);
-    if (empty($values))
-      return null;
-    return $this->prReturn($values[0]);
-  }
-
-  function enabled($name) {
-    $val = $this->get($name);
-    return (!empty($val));
-  }
-
-  function disabled($name) {
-    return (!$this->enabled($name));
-  }
-
-}

site/models/option_value.php

@@ -1,35 +0,0 @@
-<?php
-class OptionValue extends AppModel {
-
-  var $belongsTo =
-    array('Option',
-	  );
-
-  var $hasMany =
-    array('UserOption',
-	  'SiteOption',
-	  'GroupOption',
-	  'DefaultOption',
-	  );
-
-  function values($name = null, $query = null) {
-    $this->prEnter(compact('name', 'query'));
-    $this->queryInit($query);
-
-    $query['link']['Option'] = array();
-
-    if (!empty($name)) {
-      $query['conditions'][] = array('Option.name' => $name);
-      $query['link']['Option']['fields'] = array();
-    }
-
-    $this->cacheQueries = true;
-    $values = array();
-    foreach ($this->find('all', $query) AS $result)
-      $values[] = $result['OptionValue']['value'];
-    $this->cacheQueries = false;
-
-    return $this->prReturn($values);
-  }
-
-}

site/models/permission.php

@@ -1,105 +0,0 @@
-<?php
-class Permission extends AppModel {
-
-  var $hasMany =
-    array('PermissionValue',
-	  );
-
-  var $knows =
-    array('User', 'Site', 'Group');
-
-  static $permission_set = array();
-
-  function getAll($name, $force = false) {
-/*     $this->prClassLevel(30); */
-/*     $this->PermissionValue->prClassLevel(30); */
-/*     $this->Group->Membership->prClassLevel(30); */
-/*     $this->PermissionValue->SitePermission->prClassLevel(30); */
-/*     $this->PermissionValue->UserPermission->prClassLevel(30); */
-/*     $this->PermissionValue->GroupPermission->prClassLevel(30); */
-/*     $this->PermissionValue->DefaultPermission->prClassLevel(30); */
-    $this->prEnter(compact('name'));
-
-    if (!empty(self::$permission_set[$name]) && !$force)
-      return $this->prReturn(self::$permission_set[$name]);
-
-    self::$permission_set[$name] = array();
-
-    $site_id   = $this->Site->currentSiteId();
-    $user_id   = $this->User->currentUserId();
-    $group_ids = $this->Group->currentGroupIds();
-
-/*     $site_id = 1; */
-/*     $user_id = 2; */
-/*     $group_ids = $this->Group->groupIds($user_id, $site_id); */
-
-    if (empty($group_ids)) {
-      self::$permission_set[$name][$name][] = array('access' => 'DENY', 'level' => null);
-      $site_id = null;
-      $user_id = null;
-    }
-
-    if (!empty($site_id))
-      self::$permission_set[$name] =
-	array_merge(self::$permission_set[$name],
-		    $this->PermissionValue->SitePermission->values($site_id, $name));
-
-    if (!empty($user_id))
-      self::$permission_set[$name] =
-	array_merge(self::$permission_set[$name],
-		    $this->PermissionValue->UserPermission->values($user_id, $name));
-
-    if (!empty($group_ids)) {
-      self::$permission_set[$name] =
-	array_merge(self::$permission_set[$name],
-		    $this->PermissionValue->GroupPermission->values($group_ids, $name));
-
-      self::$permission_set[$name] =
-	array_merge(self::$permission_set[$name],
-		    $this->PermissionValue->DefaultPermission->values($name));
-
-      self::$permission_set[$name][] = array('access' => 'ALLOW', 'level' => null);
-    }
-
-    return $this->prReturn(self::$permission_set[$name]);
-  }
-
-  function get($name) {
-    $this->prEnter(compact('name'));
-
-    // REVISIT <AP>: 20090827
-    //  This is a pretty crappy algorithm.  How do we decide whether DENY really
-    //  means DENY, or whether an ALLOW has priority.  
-    //  Oh well, it works for now...
-    
-    $values = $this->getAll($name);
-    $result = array_shift($values);
-
-    foreach ($values AS $value)
-      if (empty($result['level']) || (!empty($value['level']) && $value['level'] < $result['level']))
-	$result['level'] = $value['level'];
-
-    if ($result['access'] !== 'ALLOW')
-      $result['level'] = 9999999;
-
-    return $this->prReturn($result);
-  }
-
-  function allow($name) {
-    $this->prEnter(compact('name'));
-    $result = $this->get($name);
-    return $this->prReturn($result['access'] === 'ALLOW');
-  }
-
-  function deny($name) {
-    $this->prEnter(compact('name'));
-    return $this->prReturn(!$this->allow($name));
-  }
-
-  function level($name) {
-    $this->prEnter(compact('name'));
-    $result = $this->get($name);
-    return $this->prReturn($result['level']);
-  }
-
-}

site/models/permission_value.php

@@ -1,36 +0,0 @@
-<?php
-class PermissionValue extends AppModel {
-
-  var $belongsTo =
-    array('Permission',
-	  );
-
-  var $hasMany =
-    array('UserPermission',
-	  'SitePermission',
-	  'GroupPermission',
-	  'DefaultPermission',
-	  );
-
-  function values($name = null, $query = null) {
-    $this->prEnter(compact('name', 'query'));
-    $this->queryInit($query);
-
-    $query['link']['Permission'] = array();
-
-    if (!empty($name)) {
-      $query['conditions'][] = array('Permission.name' => $name);
-      $query['link']['Permission']['fields'] = array();
-    }
-
-    $this->cacheQueries = true;
-    $values = array();
-    foreach ($this->find('all', $query) AS $result)
-      $values[] = array('access' => $result['PermissionValue']['access'],
-			'level'  => $result['PermissionValue']['level']);
-    $this->cacheQueries = false;
-
-    return $this->prReturn($values);
-  }
-
-}

site/models/site.php

@@ -1,37 +1,16 @@
 <?php
 class Site extends AppModel {
 
-  var $hasMany =
+	var $name = 'Site';
-    array('SiteArea',
+	var $validate = array(
-	  'SiteOption',
+		'id' => array('numeric'),
-	  'Membership',
+		'name' => array('notempty')
-	  );
+	);
 
-  static $current_site_id;
+	var $hasMany = array(
+		'SiteArea',
+		'SiteOption',
+	);
 
-  function currentSiteId() {
-    if (!empty(self::$current_site_id))
-      return self::$current_site_id;
-
-    // REVISIT <AP>: 20090827
-    //  Must get the actual site
-    $code = 'VSS';
-
-    $site = $this->find
-      ('first',
-       array('recursive' => -1,
-	     'conditions' => compact('code')));
-
-    if (!empty($site['Site']['id']))
-      self::$current_site_id = $site['Site']['id'];
-    else
-      // We must force a stop here, since this is typically
-      // called very early on, and so will cause a recursive
-      // crash as we try to render the internal error and
-      // again stumble on this problem.
-      $this->INTERNAL_ERROR('UNKNOWN SITE', 0, true);
-
-    return self::$current_site_id;
-  }
 }
 ?>

site/models/site_option.php

@@ -1,24 +0,0 @@
-<?php
-class SiteOption extends AppModel {
-
-  var $belongsTo =
-    array('Site',
-	  'OptionValue',
-	  );
-
-
-  function values($id, $name = null) {
-    $this->prEnter(compact('id', 'name'));
-
-    $query = array();
-    $this->queryInit($query);
-
-    $query['link']['SiteOption'] = array();
-    $query['link']['SiteOption']['fields'] = array();
-    $query['link']['SiteOption']['Site'] = array();
-    $query['link']['SiteOption']['Site']['fields'] = array();
-    $query['conditions'][] = array('Site.id' => $id);
-    return $this->prReturn($this->OptionValue->values($name, $query));
-  }
-
-}

site/models/site_permission.php

@@ -1,24 +0,0 @@
-<?php
-class SitePermission extends AppModel {
-
-  var $belongsTo =
-    array('Site',
-	  'PermissionValue',
-	  );
-
-
-  function values($id, $name = null) {
-    $this->prEnter(compact('id', 'name'));
-
-    $query = array();
-    $this->queryInit($query);
-
-    $query['link']['SitePermission'] = array();
-    $query['link']['SitePermission']['fields'] = array();
-    $query['link']['SitePermission']['Site'] = array();
-    $query['link']['SitePermission']['Site']['fields'] = array();
-    $query['conditions'][] = array('Site.id' => $id);
-    return $this->prReturn($this->PermissionValue->values($name, $query));
-  }
-
-}

site/models/transaction.php

@@ -350,14 +350,10 @@ class Transaction extends AppModel {
     if (isset($ids['transaction_id']))
       $ids['deposit_id'] = $ids['transaction_id'];
 
-    $this->pr(21, array_intersect_key($ids, array('deposit_id'=>1))
+    if (!empty($ids['deposit_id']) && !empty($control['update_tender'])) {
-	      + array_intersect_key($data['control'], array('update_tender'=>1)));
-
-    if (!empty($ids['deposit_id']) && !empty($data['control']['update_tender'])) {
-      $this->pr(21, compact('tender_groups'));
       foreach ($tender_groups AS $group => $tender_ids) {
 	$entry_id = $ids['entries'][$group]['DoubleEntry']['Entry2']['ledger_entry_id'];
-	$this->pr(19, compact('group', 'tender_ids', 'entry_id'));
+	$this->pr(10, compact('group', 'tender_ids', 'entry_id'));
 	$this->LedgerEntry->Tender->updateAll
 	  (array('Tender.deposit_transaction_id'  => $ids['deposit_id'],
 		 'Tender.deposit_ledger_entry_id' => $entry_id),
@@ -534,8 +530,6 @@ class Transaction extends AppModel {
 	(in_array($transaction['type'], array('INVOICE', 'RECEIPT'))
 	 && empty($transaction['customer_id']))
 	) {
-      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
-      $this->INTERNAL_ERROR('Transaction verification failed');
       return $this->prReturn(false);
     }
 
@@ -551,8 +545,6 @@ class Transaction extends AppModel {
       }
       if (!empty($se) &&
 	  !$this->StatementEntry->verifyStatementEntry($se)) {
-	// REVISIT <AP>: 20090828; Callers are not yet able to handle errors
-	$this->INTERNAL_ERROR('Transaction entry verification failed');
 	return $this->prReturn(false);
       }
     }
@@ -592,11 +584,8 @@ class Transaction extends AppModel {
 
     // Save transaction to the database
     $this->create();
-    if (!$this->save($transaction)) {
+    if (!$this->save($transaction))
-      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
-      $this->INTERNAL_ERROR('Failed to save Transaction');
       return $this->prReturn(array('error' => true) + $ret);
-    }
     $ret['transaction_id'] = $transaction['id'] = $this->id;
 
     // Add the entries
@@ -672,11 +661,6 @@ class Transaction extends AppModel {
     if (!empty($transaction['customer_id'])) {
       $this->Customer->update($transaction['customer_id']);
     }
-
-    if (!empty($ret['error']))
-      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
-      $this->INTERNAL_ERROR('Failed to save Transaction');
-
     return $this->prReturn($ret);
   }
 
@@ -697,11 +681,8 @@ class Transaction extends AppModel {
     $this->prEnter(compact('control', 'transaction', 'entries', 'split'));
 
     // Verify that we have a transaction
-    if (empty($transaction['id'])) {
+    if (empty($transaction['id']))
-      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
-      $this->INTERNAL_ERROR('Invalid Transaction ID for adding entries');
       return $this->prReturn(array('error' => true));
-    }
 
     // If the entries are not already split, do so now.
     if ($split) {
@@ -761,10 +742,6 @@ class Transaction extends AppModel {
       }
     }
 
-    if (!empty($ret['error']))
-      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
-      $this->INTERNAL_ERROR('Failed to save Transaction Entries');
-
     return $this->prReturn($ret);
   }
 
@@ -785,11 +762,8 @@ class Transaction extends AppModel {
 
     // Verify that we have a transaction and entries
     if (empty($transaction) ||
-	(empty($entries) && empty($control['allow_no_entries']))) {
+	(empty($entries) && empty($control['allow_no_entries'])))
-      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
-      $this->INTERNAL_ERROR('Split Entries failed to validate');
       return $this->prReturn(array('error' => true));
-    }
 
     // set ledger ID as the current ledger of the specified account
     if (empty($transaction['ledger_id']))
@@ -998,11 +972,8 @@ class Transaction extends AppModel {
 	));
 
     $this->pr(20, compact('nsf_ledger_entry'));
-    if (!$nsf_ledger_entry) {
+    if (!$nsf_ledger_entry)
-      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
-      $this->INTERNAL_ERROR('Failed to locate NSF ledger entry');
       return $this->prReturn(array('error' => true) + $ret);
-    }
 
     // Build a transaction to adjust all of the statement entries
     $rollback =

site/models/user.php

@@ -1,39 +0,0 @@
-<?php
-class User extends AppModel {
-
-  var $hasMany =
-    array('UserOption',
-	  'Membership',
-	  );
-
-  static $current_user_id;
-
-  function currentUser() {
-    if (!empty($_SERVER['REMOTE_USER']))
-      return $_SERVER['REMOTE_USER'];
-
-    return null;
-  }
-
-  function currentUserId() {
-    if (!empty(self::$current_user_id))
-      return self::$current_user_id;
-
-    $user = $this->find
-      ('first',
-       array('recursive' => -1,
-	     'conditions' => array('login' => $this->currentUser())));
-
-    if (!empty($user['User']['id']))
-      self::$current_user_id = $user['User']['id'];
-    else
-      // We must force a stop here, since this is typically
-      // called very early on, and so will cause a recursive
-      // crash as we try to render the internal error and
-      // again stumble on this problem.
-      $this->INTERNAL_ERROR('UNKNOWN USER', 0, true);
-
-    return self::$current_user_id;
-  }
-
-}

site/models/user_option.php

@@ -1,24 +0,0 @@
-<?php
-class UserOption extends AppModel {
-
-  var $belongsTo =
-    array('User',
-	  'OptionValue',
-	  );
-
-
-  function values($id, $name = null) {
-    $this->prEnter(compact('id', 'name'));
-
-    $query = array();
-    $this->queryInit($query);
-
-    $query['link']['UserOption'] = array();
-    $query['link']['UserOption']['fields'] = array();
-    $query['link']['UserOption']['User'] = array();
-    $query['link']['UserOption']['User']['fields'] = array();
-    $query['conditions'][] = array('User.id' => $id);
-    return $this->prReturn($this->OptionValue->values($name, $query));
-  }
-
-}

site/models/user_permission.php

@@ -1,24 +0,0 @@
-<?php
-class UserPermission extends AppModel {
-
-  var $belongsTo =
-    array('User',
-	  'PermissionValue',
-	  );
-
-
-  function values($id, $name = null) {
-    $this->prEnter(compact('id', 'name'));
-
-    $query = array();
-    $this->queryInit($query);
-
-    $query['link']['UserPermission'] = array();
-    $query['link']['UserPermission']['fields'] = array();
-    $query['link']['UserPermission']['User'] = array();
-    $query['link']['UserPermission']['User']['fields'] = array();
-    $query['conditions'][] = array('User.id' => $id);
-    return $this->prReturn($this->PermissionValue->values($name, $query));
-  }
-
-}

site/views/accounts/collected.ctp

@@ -178,8 +178,20 @@ echo $this->element('statement_entries', array
 
 <script type="text/javascript"><!--
   $(document).ready(function(){
-      datepicker('TxFromDate');
+      $("#TxFromDate")
-      datepicker('TxThroughDate');
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+                      showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
+
+      $("#TxThroughDate")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+                      showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
+
       resetForm();
   });
 --></script>

site/views/customers/receipt.ctp

@@ -25,56 +25,20 @@ Configure::write('debug', '0');
       beforeSubmit:  verifyRequest,  // pre-submit callback 
       success:       showResponse,  // post-submit callback 
  
-      url: "<?php echo $html->url(array('controller' => 'transactions',
-					'action' => 'postReceipt', 0)); ?>",
- 
       // other available options: 
       //clearForm: true,        // clear all form fields after successful submit 
       //resetForm: true,        // reset the form after successful submit 
       }; 
 
     // bind form using 'ajaxForm' 
-    if ($('#receipt-form').ajaxForm != null)
+    $('#receipt-form').ajaxForm(options); 
-      $('#receipt-form').ajaxForm(options);
-    else
-      $('#repeat, label[for=repeat]').remove();
     }); 
  
 // pre-submit callback 
-function verifyRequest(formData, jqForm, options) {
+function verifyRequest(formData, jqForm, options) { 
-  //$("#debug").html('');
-  for (var i = 0; i < formData.length; ++i) {
-    //$("#debug").append(i + ') ' + dump(formData[i]) + '<BR>');
-    if (formData[i]['name'] == "data[Customer][id]" &&
-	!(formData[i]['value'] > 0)) {
-      //$("#debug").append('<P>Missing Customer ID');
-      alert("Must select a customer first");
-      return false;
-    }
-
-    if (formData[i]['name'] == "data[Transaction][stamp]" &&
-	formData[i]['value'] == '') {
-      //$("#debug").append('<P>Bad Stamp');
-      alert("Must enter a valid date stamp");
-      return false;
-    }
-
-    // Terrible way to accomplish this...
-    for (var j = 0; j < 20; ++j) {
-      if (formData[i]['name'] == "data[Entry]["+j+"][amount]" &&
-	  !(formData[i]['value'] > 0)) {
-	//$("#debug").append('<P>Bad Amount');
-	alert("Must enter a valid amount");
-	return false;
-      }
-    }
-
-  }
-
-  //$("#debug").append('OK');
-  //return false;
-
   $('#results').html('Working <BLINK>...</BLINK>');
+  // here we could return false to prevent the form from being submitted; 
+  // returning anything other than false will allow the form submit to continue 
   return true; 
 } 
  
@@ -399,9 +363,13 @@ Configure::write('debug', '0');
 
 <script type="text/javascript"><!--
   $(document).ready(function(){
-      datepicker('TransactionStamp');
+      $("#TransactionStamp")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+                      showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
 
-      $("#customer-id").val(0);
       $("#receipt-customer-name").html("INTERNAL ERROR");
       $("#receipt-balance").html("INTERNAL ERROR");
       $("#receipt-charges-caption").html("Outstanding Charges");

site/views/double_entries/view.ctp

@@ -56,18 +56,14 @@ foreach ($ledgers AS $type => $ledger) {
 /* 					   array('controller' => 'entries', */
 /* 						 'action'     => 'view', */
 /* 						 $entries[$type]['id']))); */
-  $rows[] = array('Account',   ($ledger['link']
+  $rows[] = array('Account',   $html->link($ledger['Account']['name'],
-				? $html->link($ledger['Account']['name'],
+					   array('controller' => 'accounts',
-					      array('controller' => 'accounts',
+						 'action'     => 'view',
-						    'action'     => 'view',
+						 $ledger['Account']['id'])));
-						    $ledger['Account']['id']))
+  $rows[] = array('Ledger',    $html->link('#' . $ledger['sequence'],
-				: $ledger['Account']['name']));
+					   array('controller' => 'ledgers',
-  $rows[] = array('Ledger',    ($ledger['link']
+						 'action'     => 'view',
-				? $html->link('#' . $ledger['sequence'],
+						 $ledger['id'])));
-					      array('controller' => 'ledgers',
-						    'action'     => 'view',
-						    $ledger['id']))
-				: '#' . $ledger['sequence']));
   $rows[] = array('Amount',    FormatHelper::currency($entries[$type]['amount']));
   //$rows[] = array('Effect',    $ledger['Account']['ftype'] == $type ? 'INCREASE' : 'DECREASE');
 

site/views/elements/contacts.ctp

@@ -4,8 +4,8 @@
 $cols = array();
 $cols['Relationship'] = array('index' => 'ContactsCustomer.type',   'formatter' => 'enum');
 $cols['Name']         = array('index' => 'Contact.display_name',    'formatter' => 'longname');
-$cols['Last Name']    = array('index' => 'Contact.last_name',       'formatter' => 'name');
+$cols['Last Name']    = array('index' => 'Contact.last_name',       'formatter' => 'longname');
-$cols['First Name']   = array('index' => 'Contact.first_name',      'formatter' => 'name');
+$cols['First Name']   = array('index' => 'Contact.first_name',      'formatter' => 'longname');
 $cols['Company']      = array('index' => 'Contact.company_name',    'formatter' => 'longname');
 $cols['Comment']      = array('index' => 'Contact.comment',         'formatter' => 'comment');
 

site/views/elements/jqGrid.ctp

@@ -148,14 +148,8 @@ foreach ($jqGridColumns AS $header => &$col) {
       // No special formatting for name
       unset($col['formatter']);
     }
-    elseif (preg_match("/^(long|short)?enum$/",
+    elseif ($col['formatter'] === 'enum') {
-		       $col['formatter'], $matches)) {
       $default['width'] = 60;
-      if (!empty($matches[1]) && $matches[1] === 'long')
-	$default['width'] *= 1.5;
-      if (!empty($matches[1]) && $matches[1] === 'short')
-	$default['width'] *= 0.7;
-
       //$default['align'] = 'right';
 
       // No special formatting for enum
@@ -172,8 +166,7 @@ foreach ($jqGridColumns AS $header => &$col) {
 
     // Just a rough approximation to ensure columns
     // are wide enough to fully display their header.
-    $min_width = strlen($header) * 7;
+    $min_width = strlen($header) * 10;
-    $min_width = 0; // REVISIT <AP>: 20090829; if/while jqGrid is fixed width
     if ((!isset($default['width']) || $default['width'] < $min_width) && !$default['force'])
       $default['width'] = $min_width;
   }
@@ -246,7 +239,6 @@ $jqGrid_setup = array_merge
 	 'colNames'    => array_keys($jqGridColumns),
 	 'colModel'    => array('--special' => $jqGridColumns),
 	 'height'      => $height,
-	 'width'       => 700,
 	 'rowNum'      => $limit,
 	 'rowList'     => $limitOptions,
 	 'sortname'    => $sortname,
@@ -266,46 +258,50 @@ $jqGrid_setup = array_merge
 // to kick this thing off.
 ?>
 
-<?php if ($first_grid): ?>
-<script type="text/javascript"><!--
-var currencyFormatter = function(cellval, opts, rowObject) {
-  if (!cellval)
-    return "";
-  return fmtCurrency(cellval);
-}
-
-var percentageFormatter = function(cellval, opts, rowObject) {
-  var precision;
-  if (typeof(opts.colModel) != 'undefined' &&
-      typeof(opts.colModel.formatoptions) != 'undefined' &&
-      typeof(opts.colModel.formatoptions.precision) != 'undefined')
-    precision = opts.colModel.formatoptions.precision;
-  else
-    precision = 0;
-  amount = cellval.toString().replace(/\%/g,'');
-  amount = (amount*100).toFixed(precision);
-  return amount+'%';
-}
-
-var idFormatter = function(cellval, opts, rowObject) {
-  if (!cellval)
-    return cellval;
-  return '#'+cellval;
-}
---></script>
-<?php endif; ?>
-
-
 <DIV ID="<?php echo $grid_div_id; ?>" CLASS="<?php echo $grid_div_class; ?>">
 <table id="<?php echo $grid_id; ?>" class="scroll"></table> 
 <div id="<?php echo $grid_id; ?>-pager" class="scroll" style="text-align:right"></div> 
 <script type="text/javascript"><!--
+
 jQuery(document).ready(function(){ 
+  currencyFormatter = function(cellval, opts, rowObject) {
+    if (!cellval)
+      return "";
+    return fmtCurrency(cellval);
+  }
+
+  percentageFormatter = function(cellval, opts, rowObject) {
+    var precision;
+    if (typeof(opts.colModel) != 'undefined' &&
+	typeof(opts.colModel.formatoptions) != 'undefined' &&
+	typeof(opts.colModel.formatoptions.precision) != 'undefined')
+      precision = opts.colModel.formatoptions.precision;
+    else
+      precision = 0;
+    amount = cellval.toString().replace(/\%/g,'');
+    amount = (amount*100).toFixed(precision);
+    return amount+'%';
+  }
+
+  idFormatter = function(cellval, opts, rowObject) {
+    if (!cellval)
+      return cellval;
+    return '#'+cellval;
+  }
+
   jQuery('#<?php echo $grid_id; ?>').jqGrid(
-    <?php echo FormatHelper::phpVarToJavascript($jqGrid_setup) . "\n"; ?>
+    <?php echo FormatHelper::phpVarToJavascript($jqGrid_setup); ?>
-  ).navGrid('#<?php echo $grid_id; ?>-pager', { view:false,edit:false,add:false,del:false,search:true,refresh:true});
+  ).navGrid('#<?php echo $grid_id; ?>-pager',
+	    { view:false,
+		edit:false,
+		add:false,
+		del:false,
+		search:true,
+		refresh:true});
 });
+
 --></script>
+
 <?php
   if (count($search_fields) > 0) {
     echo('<div>Search By:<BR>' . "\n");

site/views/elements/leases.ctp

@@ -3,16 +3,16 @@
 // Define the table columns
 $cols = array();
 $cols['Lease']     = array('index' => 'Lease.number',        'formatter' => 'id');
-$cols['Unit']      = array('index' => 'Unit.name',           'formatter' => 'shortname',  'align' => 'center');
+$cols['Unit']      = array('index' => 'Unit.name',           'width' => '50',  'align' => 'center');
 $cols['Customer']  = array('index' => 'Customer.name',       'formatter' => 'longname');
-$cols['Rent']      = array('index' => 'Lease.rent',          'formatter' => 'currency');
+$cols['Rent']      = array('index' => 'Lease.rent',          'formatter' => 'currency', 'hiddenz' => true);
-$cols['Deposit']   = array('index' => 'Lease.deposit',       'formatter' => 'currency');
+$cols['Deposit']   = array('index' => 'Lease.deposit',       'formatter' => 'currency', 'hiddenz' => true);
 $cols['Signed']    = array('index' => 'Lease.lease_date',    'formatter' => 'date');
 $cols['Move-In']   = array('index' => 'Lease.movein_date',   'formatter' => 'date');
 $cols['Move-Out']  = array('index' => 'Lease.moveout_date',  'formatter' => 'date');
 $cols['Closed']    = array('index' => 'Lease.close_date',    'formatter' => 'date');
 $cols['Paid-Thru'] = array('index' => 'Lease.paid_through_date', 'formatter' => 'date');
-$cols['Status']    = array('index' => 'status',              'formatter' => 'longenum');
+$cols['Status']    = array('index' => 'status',              'formatter' => 'enum', 'width' => 100);
 $cols['Balance']   = array('index' => 'balance',             'formatter' => 'currency');
 $cols['Comment']   = array('index' => 'Lease.comment',       'formatter' => 'comment');
 

site/views/elements/ledgers.ctp

@@ -15,8 +15,8 @@ $cols['Balance']     = array('index' => 'balance',             'formatter' => 'c
 // Render the grid
 $grid
 ->columns($cols)
-->sortField('Sequence')
+->sortField('Account')
-->defaultFields(array('Sequence'))
+->defaultFields(array('Account', 'Sequence'))
-->searchFields(array('Comment'))
+->searchFields(array('Account', 'Comment'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Account', 'Open Date', 'Comment')));
+	 array_diff(array_keys($cols), array('Open Date', 'Comment')));

site/views/elements/sidemenu.ctp

@@ -70,16 +70,14 @@ echo('</DIV>' . "\n"); // End #sidemenu-container
 $javascript->codeBlock(
 <<<JSCB
 jQuery(document).ready(function(){ 
-    if (jQuery("#sidemenu").accordion != null) {
+  jQuery("#sidemenu").accordion
-      jQuery("#sidemenu").accordion
+    ({  fillSpace : true,
-	({  fillSpace : true,
+	event : "click hoverintent",
-	    event : "click hoverintent",
+	animated : "bounceslide",
-	    animated : "bounceslide",
 JSCB
 . (isset($active_section) ? "\tactive : $active_section,\n" : '') .
 <<<JSCB
 	});
-    }
   });
 JSCB
 , array('inline' => false));

site/views/elements/statement_entries.ctp

@@ -15,7 +15,7 @@ $cols['Unit']           = array('index' => 'Unit.name',           'formatter' =>
 
 $cols['Comment']        = array('index' => 'StatementEntry.comment', 'formatter' => 'comment', 'width'=>150);
 
-$cols['Type']           = array('index' => 'StatementEntry.type', 'formatter' => 'longenum');
+$cols['Type']           = array('index' => 'StatementEntry.type', 'formatter' => 'enum', 'width'=>120);
 $cols['Account']        = array('index' => 'Account.name',        'formatter' => 'name');
 $cols['Debit']          = array('index' => 'charge',              'formatter' => 'currency');
 $cols['Credit']         = array('index' => 'disbursement',        'formatter' => 'currency');

site/views/elements/tenders.ctp

@@ -17,4 +17,4 @@ $grid
 ->defaultFields(array('Date', 'Name', 'Amount'))
 ->searchFields(array('Name', 'Type'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Comment', 'Sub-Total')));
+	 array_diff(array_keys($cols), array('Sub-Total')));

site/views/elements/units.ctp

@@ -9,7 +9,7 @@ $cols['Size']     = array('index' => 'UnitSize.name', 'formatter' => 'shortname'
 $cols['Area']     = array('index' => 'sqft',          'formatter' => 'number');
 $cols['Rent']     = array('index' => 'Unit.rent',     'formatter' => 'currency');
 $cols['Deposit']  = array('index' => 'Unit.deposit',  'formatter' => 'currency');
-$cols['Status']   = array('index' => 'Unit.status',   'formatter' => 'enum');
+$cols['Status']   = array('index' => 'Unit.status',   'formatter' => 'name'); // We have enough real estate
 $cols['Balance']  = array('index' => 'balance',       'formatter' => 'currency');
 $cols['Comment']  = array('index' => 'Unit.comment',  'formatter' => 'comment');
 

site/views/empty.ctp

@@ -1,3 +1,5 @@
 <?php /* -*- mode:PHP -*- */
 if (!empty($message))
    echo $message;
+
+

site/views/helpers/format.php

@@ -268,21 +268,14 @@ class FormatHelper extends AppHelper {
 
 
   // Helper function to convert PHP vars to javascript
-  function phpVarToJavascript($var, $name = '', $depth='', $special = false, $pretty = false) {
+  function phpVarToJavascript($var, $name = '', $depth='', $special = false) {
 
     // Establish a prefix to use before printing $var
-    if ($pretty) {
+    $prefix = $depth;
-      $prefix = $depth;
-      $pretty_sp = " ";
-      $pretty_nl = "\n";
-    }
-    else {
-      $prefix = $pretty_sp = $pretty_nl = '';
-    }
 
     // If given a name, set it up JS style
     if ($name)
-      $prefix .= $name . ":" . $pretty_sp;
+      $prefix .= $name . ": ";
 
     if (!isset($var))
       return $prefix . 'null';
@@ -335,22 +328,22 @@ class FormatHelper extends AppHelper {
     // PHP array indices can be a mix of integer and string based.
     // Just guess here, unless flagged as a special case.
     if (isset($var[0]) || $special)
-      return ($prefix . "[" . $pretty_nl
+      return ($prefix . "[\n"
-	      . implode("," . $pretty_nl,
+	      . implode(",\n",
 			array_map(array('FormatHelper', 'phpVarToJavascript'),
 				  array_values($var),
 				  array(),
 				  array_fill(0, count($var), $depth.'   ')
 				  ))
-	      . ($pretty ? "\n$depth" : '') . "]");
+	      . "\n$depth]");
 
-    return ($prefix . "{" . $pretty_nl
+    return ($prefix . "{\n"
-	    . implode("," . $pretty_nl,
+	    . implode(",\n",
 		      array_map(array('FormatHelper', 'phpVarToJavascript'),
 				array_values($var), array_keys($var),
 				array_fill(0, count($var), $depth.'   ')
 				))
-	    . ($pretty ? "\n$depth" : '') . "}");
+	    . "\n$depth}");
   }
 
 }

site/views/helpers/grid.php

@@ -6,7 +6,6 @@ class GridHelper extends AppHelper {
   var $included, $invalid;
   var $columns;
   var $controller;
-  static $first_grid = true;
 
   function __construct() {
     $this->reset();
@@ -219,12 +218,8 @@ class GridHelper extends AppHelper {
     if (isset($config))
       $this->jqGrid_options = array_merge($this->jqGrid_options, $config);
 
-    // Set flag whether or not this is the first grid
-    $this->jqGrid_options['first_grid'] = self::$first_grid;
-
     //pr(compact('config') + array('jqGrid_options' => $this->jqGrid_options));
     echo $view->element('jqGrid', $this->jqGrid_options);
-    self::$first_grid = false;
 
     // Since we only have one instance of this class
     // as a helper, we must assume it could be used

site/views/layouts/default.ctp

@@ -34,11 +34,7 @@
 <head>
 	<?php echo $html->charset(); ?>
 	<title>
-                <?php if (devbox()) echo "*DEVBOX* "; ?>
-                <?php if (sandbox()) echo "*SANDBOX* "; ?>
 		Property Manager: <?php echo $title_for_layout; ?>
-                <?php if (sandbox()) echo " *SANDBOX*"; ?>
-                <?php if (devbox()) echo " *DEVBOX*"; ?>
 	</title>
 	<?php
 		// Reset the __scripts variable, which has already been dumped to
@@ -52,7 +48,7 @@
 		// mechanism _additional_ to what Cake has provided :-/
 		$this->__scripts = array();
 
- 		if (!empty($_SERVER['HTTPS']))
+		if (!empty($_SERVER['HTTPS']))
 			$protocol = 'https://';
 		else
 			$protocol = 'http://';
@@ -62,27 +58,14 @@
 		echo $html->css('layout') . "\n";
 		echo $html->css('print', null, array('media' => 'print')) . "\n";
 		echo $html->css('sidemenu') . "\n";
-
+		echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js') . "\n";
-		$theme = 'smoothness';
+		echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js') . "\n";
-		$theme = 'base';
+		//echo $html->css('themes/base/ui.all') . "\n";
-		$theme = 'dotluv';
+		echo $html->css('themes/smoothness/ui.all') . "\n";
-		$theme = 'dark-hive';
+		//echo $html->css('themes/dotluv/ui.all') . "\n";
-		$theme = 'start';
+		//echo $html->css('themes/start/ui.all') . "\n";
-		if (devbox())
-			$theme = 'dotluv';
-		if (sandbox())
-			$theme = 'darkness';
-
-		echo $html->css('themes/'.$theme.'/ui.all') . "\n";
-
-		echo $javascript->link('jquery-1.3.2.min') . "\n";
-		echo $javascript->link('jquery-ui-1.7.2.custom.min') . "\n";
-		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.js') . "\n";
-		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.js') . "\n";
-		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js') . "\n";
-		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js') . "\n";
 		echo $javascript->link('jquery.form') . "\n";
-		echo $javascript->link('jquery.hoverIntent') . "\n";
+		echo $javascript->link('pmgr.jquery') . "\n";
 		echo $javascript->link('pmgr') . "\n";
 		echo $scripts_for_layout . "\n";
 	?>

site/views/leases/invoice.ctp

@@ -27,69 +27,25 @@ Configure::write('debug', '0');
 
   // prepare the form when the DOM is ready 
   $(document).ready(function() { 
-      $("#debug").append('doc ready1' + '<BR>');
       var options = { 
       target:        '#output-debug',   // target element(s) to be updated with server response 
       beforeSubmit:  verifyRequest,  // pre-submit callback 
       success:       showResponse,  // post-submit callback 
-
-      url: "<?php echo $html->url(array('controller' => 'transactions',
-					'action' => 'postInvoice', 0)); ?>",
  
       // other available options: 
       //clearForm: true,        // clear all form fields after successful submit 
       //resetForm: true,        // reset the form after successful submit 
-      };
+      }; 
-
-      if ($('#invoice-form').ajaxForm != null) 
-	$("#debug").append('ajax present' + '<BR>');
-      else
-	$("#debug").append('ajax not present' + '<BR>');
 
       // bind form using 'ajaxForm' 
-      if ($('#invoice-form').ajaxForm != null) {
+      $('#invoice-form').ajaxForm(options); 
-	$("#debug").append('go ajax' + '<BR>');
+    }); 
-	$('#invoice-form').ajaxForm(options); 
-	$("#debug").append('ajax set' + '<BR>');
-      }
-      else
-	$('#repeat, label[for=repeat]').remove();
-    });
  
 // pre-submit callback 
 function verifyRequest(formData, jqForm, options) { 
-  //$("#debug").html('');
-  for (var i = 0; i < formData.length; ++i) {
-    //$("#debug").append(i + ') ' + dump(formData[i]) + '<BR>');
-    if (formData[i]['name'] == "data[Lease][id]" &&
-	!(formData[i]['value'] > 0)) {
-      //$("#debug").append('<P>Missing Lease ID');
-      alert("Must select a lease first");
-      return false;
-    }
-
-    if (formData[i]['name'] == "data[Transaction][stamp]" &&
-	formData[i]['value'] == '') {
-      //$("#debug").append('<P>Bad Stamp');
-      alert("Must enter a valid date stamp");
-      return false;
-    }
-
-    // Terrible way to accomplish this...
-/*     for (var j = 0; j < 20; ++j) { */
-/*       if (formData[i]['name'] == "data[Entry]["+j+"][amount]" && */
-/* 	  !(formData[i]['value'] > 0)) { */
-/* 	//$("#debug").append('<P>Bad Amount'); */
-/* 	alert("Must enter a valid amount"); */
-/* 	return false; */
-/*       } */
-/*     } */
-  }
-
-  //$("#debug").append('OK');
-  //return false;
-
   $('#results').html('Working <BLINK>...</BLINK>');
+  // here we could return false to prevent the form from being submitted; 
+  // returning anything other than false will allow the form submit to continue 
   return true; 
 } 
  
@@ -131,13 +87,11 @@ function showResponse(responseText, statusText)  {
 
 // Reset the form
 function resetForm(nocharge) {
-  $("#debug").append('reset form: ' + nocharge + '<BR>');
   $('#charge-entry-id').val(1);
   $('#charges').html('');
 
   if (!nocharge)
     addChargeSource(false);
-  $("#debug").append('reset form done' + '<BR>');
 }
 
 
@@ -163,7 +117,6 @@ function onRowSelect(grid_id, lease_id) {
 }
 
 function onGridState(grid_id, state) {
-  $("#debug").append('on grid state: ' + grid_id + '; ' + state + '<BR>');
   if (state == 'visible') {
     $(".lease-selection-invalid").hide();
     $(".lease-selection-valid").hide();
@@ -177,11 +130,9 @@ function onGridState(grid_id, state) {
       $(".lease-selection-invalid").show();
     }
   }
-  $("#debug").append('on grid state done' + '<BR>');
 }
 
 function addChargeSource(flash) {
-  $("#debug").append('add charge source' + '<BR>');
   var id = $("#charge-entry-id").val();
   addDiv('charge-entry-id', 'charge', 'charges', flash,
 	 // HTML section
@@ -218,14 +169,21 @@ function addChargeSource(flash) {
 
 	 '</FIELDSET>'
 	 );
-  $("#debug").append('add div complete' + '<BR>');
 
-  $("#debug").append('add datepicker1' + '<BR>');
+  $("#Entry"+id+"EffectiveDate")
-  datepicker("Entry"+id+"EffectiveDate");
+    .attr('autocomplete', 'off')
-  $("#debug").append('add datepicker2' + '<BR>');
+    .datepicker({ constrainInput: true,
-  datepicker("Entry"+id+"ThroughDate");
+	          numberOfMonths: [1, 1],
+	          showCurrentAtPos: 0,
+                  dateFormat: 'mm/dd/yy' });
+
+  $("#Entry"+id+"ThroughDate")
+    .attr('autocomplete', 'off')
+    .datepicker({ constrainInput: true,
+	          numberOfMonths: [1, 1],
+	          showCurrentAtPos: 0,
+                  dateFormat: 'mm/dd/yy' });
 
-  $("#debug").append('add charge source complete' + '<BR>');
   return id;
   }
 
@@ -289,12 +247,6 @@ echo $form->input("Lease.id",
 			'type' => 'hidden',
 			'value' => 0));
 
-if (!empty($movein))
-  echo $form->input("Customer.id",
-		    array('id' => 'customer-id',
-			  'type' => 'hidden',
-			  'value' => $customer['id']));
-
 /* echo '<fieldset CLASS="invoice">' . "\n"; */
 /* echo ' <legend>Invoice</legend>' . "\n"; */
 
@@ -349,10 +301,13 @@ Configure::write('debug', '0');
   };
 
   $(document).ready(function(){
-      $("#debug").append('doc ready2' + '<BR>');
+      $("#TransactionStamp")
-      datepicker('TransactionStamp');
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+	              showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
 
-      $("#lease-id").val(0);
       $("#invoice-lease").html("INTERNAL ERROR");
       $("#invoice-unit").html("INTERNAL ERROR");
       $("#invoice-customer").html("INTERNAL ERROR");
@@ -362,17 +317,15 @@ Configure::write('debug', '0');
 
       <?php if (empty($movein)): ?>
 
-      $("#debug").append('movein empty' + '<BR>');
       resetForm();
       datepickerNow('TransactionStamp');
 
       <?php else: ?>
 
-      $("#debug").append('movein not empty' + '<BR>');
       var id;
       resetForm(true);
 
-      $("#TransactionStamp").attr('disabled', true);
+      $("#TransactionStamp").datepicker('disable');
       $("#TransactionStamp").val("<?php echo date('m/d/Y', $movein['time']); ?>");
       $('#TransactionStamp').after
 	('<input type="hidden"' +

site/views/leases/move.ctp

@@ -34,39 +34,6 @@ function resetForm() {
   datepickerNow('LeaseMoveDate', false);
 }
 
-// pre-submit callback 
-function verifyRequest() { 
-  //$("#debug").html('');
-  <?php if ($move_type === 'out'): ?>
-
-  if (!($("#lease-id").val() > 0)) {
-    //$("#debug").append('<P>Missing Lease ID');
-    alert("Please select the lease");
-    return false;
-  }
-
-  <?php else: ?>
-
-  if (!($("#customer-id").val() > 0)) {
-    //$("#debug").append('<P>Missing Customer ID');
-    alert("Please select the customer");
-    return false;
-  }
-
-  if (!($("#unit-id").val() > 0)) {
-    //$("#debug").append('<P>Missing Unit ID');
-    alert("Please select the unit");
-    return false;
-  }
-
-  <?php endif; ?>
-
-  //$("#debug").append('OK');
-  //return false;
-
-  return true; 
-} 
-
 function onRowSelect(grid_id, item_type, item_id) {
   cell_name = item_type.charAt(0).toUpperCase() + item_type.substr(1);
   if (item_type == 'lease')
@@ -242,7 +209,6 @@ else {
 }
 
 echo $form->create(null, array('id' => 'move-inout-form',
-			       'onsubmit' => 'return verifyRequest();',
 			       'url' => array('controller' => 'leases',
 					      'action' => $move_action)));
 
@@ -316,7 +282,13 @@ echo $form->end('Perform Move ' . ucfirst($move_type));
 
 <script type="text/javascript"><!--
   $(document).ready(function(){
-      datepicker('LeaseMoveDate');
+      $("#LeaseMoveDate")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+	              showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
+
       resetForm();
 
       <?php if ($move_type === 'out') { ?>

site/views/statement_entries/reverse.ctp

@@ -60,7 +60,13 @@ function resetForm() {
 }
 
   $(document).ready(function(){
-      datepicker('TransactionStamp');
+      $("#TransactionStamp")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+                      showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
+
       resetForm();
   });
 --></script>

site/views/statement_entries/view.ctp

@@ -29,12 +29,10 @@ if (in_array($entry['type'], array('CHARGE', 'PAYMENT')))
   $rows[] = array('Through',          FormatHelper::date($entry['through_date']));
 $rows[] = array('Type',             $entry['type']);
 $rows[] = array('Amount',           FormatHelper::currency($entry['amount']));
-$rows[] = array('Account',          ($account['link']
+$rows[] = array('Account',          $html->link($account['name'],
-				     ? $html->link($account['name'],
+						array('controller' => 'accounts',
-						   array('controller' => 'accounts',
+						      'action'     => 'view',
-							 'action'     => 'view',
+						      $account['id'])));
-							 $account['id']))
-				     : $account['name']));
 $rows[] = array('Customer',         (isset($customer['name'])
 				     ? $html->link($customer['name'],
 						   array('controller' => 'customers',

site/views/tenders/nsf.ctp

@@ -60,7 +60,13 @@ function resetForm() {
 }
 
   $(document).ready(function(){
-      datepicker('TransactionStamp');
+      $("#TransactionStamp")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+                      showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
+
       resetForm();
   });
 --></script>

site/views/tenders/view.ctp

@@ -36,7 +36,7 @@ for ($i=1; $i<=4; ++$i)
 if (!empty($tender['deposit_transaction_id']))
   $rows[] = array('Deposit',     $html->link('#'.$tender['deposit_transaction_id'],
 					     array('controller' => 'transactions',
-						   'action'     => 'deposit_slip',
+						   'action'     => 'view',
 						   $tender['deposit_transaction_id'])));
 
 if (!empty($tender['nsf_transaction_id']))

site/views/transactions/bad_debt.ctp

@@ -75,7 +75,13 @@ function resetForm() {
 }
 
   $(document).ready(function(){
-      datepicker('TransactionStamp');
+      $("#TransactionStamp")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+                      showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
+
       resetForm();
   });
 --></script>

site/views/transactions/refund.ctp

@@ -92,7 +92,13 @@ function resetForm() {
 }
 
 $(document).ready(function(){
-    datepicker('TransactionStamp');
+    $("#TransactionStamp")
+      .attr('autocomplete', 'off')
+      .datepicker({ constrainInput: true,
+	            numberOfMonths: [1, 1],
+                    showCurrentAtPos: 0,
+                    dateFormat: 'mm/dd/yy' });
+
     resetForm();
   });
 --></script>

site/views/transactions/view.ctp

@@ -21,19 +21,19 @@ $rows[] = array('ID',        $transaction['id']);
 $rows[] = array('Type',      str_replace('_', ' ', $transaction['type']));
 $rows[] = array('Timestamp', FormatHelper::datetime($transaction['stamp']));
 $rows[] = array('Amount',    FormatHelper::currency($transaction['amount']));
-$rows[] = array('Account',   ($account['link']
+$rows[] = array('Account',   $html->link($account['name'],
-			      ? $html->link($account['name'],
+					 array('controller' => 'accounts',
-					    array('controller' => 'accounts',
+					       'action'     => 'view',
-						  'action'     => 'view',
+					       $account['id'])));
-						  $account['id']))
+$rows[] = array('Ledger',    $html->link('#' . $ledger['sequence'],
-			      : $account['name']));
+					 array('controller' => 'ledgers',
-
+					       'action'     => 'view',
+					       $ledger['id'])));
 if (!empty($nsf_tender['id']))
   $rows[] = array('NSF Tender', $html->link($nsf_tender['name'],
 					    array('controller' => 'tenders',
 						  'action'     => 'view',
 						  $nsf_tender['id'])));
-
 $rows[] = array('Comment',   $transaction['comment']);
 
 echo $this->element('table',

site/webroot/css/cake.generic.css

@@ -22,6 +22,11 @@
  */
 
 
+* {
+	margin:0;
+	padding:0;
+}
+
 /* Layout */
 #container {
 	text-align: left;

site/webroot/css/layout.css

@@ -11,7 +11,6 @@
  * Overall page layout
  */
 
-body           { padding: 0; margin: 0 }
 table#layout   { width: 100% }
 td#sidecolumn  ,
 td#pagecolumn  { vertical-align: top; }
@@ -278,15 +277,19 @@ span.grid-error {
 	color: #a00;
 }
 
-.ui-jqgrid span.ui-jqgrid-title { 
+span.ui-jqgrid-title { 
-	font-size: 160%;
+	color: #ffb;
- 	margin: 0;
+	font-family:'Gill Sans','lucida grande',helvetica, arial, sans-serif;
+	font-size: 180%;
+ 	margin-bottom: 0.0em;
 }
 
-.ui-jqgrid span.ui-jqgrid-title h2 {
+span.ui-jqgrid-title h2 {
+	color: #ffb;
+	font-family:'Gill Sans','lucida grande',helvetica, arial, sans-serif;
         font-weight: bold;
 	font-size: 140%;
-	margin: 0;
+ 	margin-bottom: 0.0em;
 }
 
 
@@ -362,18 +365,45 @@ fieldset fieldset div {
 /* 	margin: 0 20px; */
 }
 
+/*
+ * REVISIT <AP>: 20090728
+ *  This "form div" is way too generic, and in fact
+ *  it's screwing up the jqGrid header.  I'm commenting
+ *  it out for now, to see if it actually is needed 
+ *  anywhere, and hope to delete it in the near future.
+ */
+/* form div { */
+/* 	clear: both; */
+/* /\* 	margin-bottom: 1em; *\/ */
+/* /\* 	padding: .5em; *\/ */
+/* 	vertical-align: text-top; */
+/* } */
+form div.input {
+	color: #444;
+}
+form div.required {
+	color: #333;
+	font-weight: bold;
+}
 form div.submit {
 	border: 0;
 	clear: both;
 	margin-top: 10px;
+/* 	margin-left: 140px; */
 }
 
-
 /************************************************************
  ************************************************************
  * General Style Info
  */
 
+body {
+/* 	background: #003d4c; */
+/* 	color: #fff; */
+	font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
+	font-size:90%;
+	margin: 0;
+}
 a {
 	color: #003d4c;
 	text-decoration: underline;
@@ -383,4 +413,35 @@ a:hover {
 	color: #00f;
 	text-decoration:none;
 }
+a img {
+	border:none;
+}
+
+h1, h2, h3, h4 {
+	font-weight: normal;
+}
+
+h1 {
+	color: #003d4c;
+	font-size: 100%;
+	margin: 0.1em 0;
+}
+h2 {
+/* 	color: #e32; */
+	color: #993;
+	font-family:'Gill Sans','lucida grande',helvetica, arial, sans-serif;
+	font-size: 190%;
+	margin-bottom: 0.3em;
+}
+h3 {
+	color: #993;
+	font-family:'Gill Sans','lucida grande',helvetica, arial, sans-serif;
+/* 	font-size: 165%; */
+}
+h4 {
+	color: #993;
+	font-weight: normal;
+	padding-top: 0.5em;
+}
+
 

site/webroot/css/sidemenu.css

@@ -18,4 +18,3 @@
 #sidemenu.ui-accordion .ui-accordion-header  { padding: 0 0.5em 0 1.1em; }
 #sidemenu.ui-accordion .ui-accordion-content { padding: 0 0.5em 0 1.1em; }
 
-#sidemenu a { font-size: 90%; }

site/webroot/css/themes/dark-hive/ui.all.css

@@ -1,406 +0,0 @@
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,%20Arial,%20sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=444444&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=44&borderColorHeader=333333&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=000000&bgTextureContent=14_loop.png&bgImgOpacityContent=25&borderColorContent=555555&fcContent=ffffff&iconColorContent=cccccc&bgColorDefault=222222&bgTextureDefault=03_highlight_soft.png&bgImgOpacityDefault=35&borderColorDefault=444444&fcDefault=eeeeee&iconColorDefault=cccccc&bgColorHover=003147&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=33&borderColorHover=0b93d5&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=0972a5&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=20&borderColorActive=26b3f7&fcActive=ffffff&iconColorActive=222222&bgColorHighlight=eeeeee&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=80&borderColorHighlight=cccccc&fcHighlight=2e7db2&iconColorHighlight=4b8e0b&bgColorError=ffc73d&bgTextureError=02_glass.png&bgImgOpacityError=40&borderColorError=ffb73d&fcError=111111&iconColorError=a83300&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px
-*/
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Verdana, Arial, sans-serif; font-size: 1.1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #555555; background: #000000 url(images/ui-bg_loop_25_000000_21x21.png) 50% 50% repeat; color: #ffffff; }
-.ui-widget-content a { color: #ffffff; }
-.ui-widget-header { border: 1px solid #333333; background: #444444 url(images/ui-bg_highlight-soft_44_444444_1x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #444444; background: #222222 url(images/ui-bg_highlight-soft_35_222222_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #eeeeee; outline: none; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #eeeeee; text-decoration: none; outline: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #0b93d5; background: #003147 url(images/ui-bg_highlight-soft_33_003147_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; outline: none; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; outline: none; }
-.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #26b3f7; background: #0972a5 url(images/ui-bg_highlight-hard_20_0972a5_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; outline: none; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #ffffff; outline: none; text-decoration: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #cccccc; background: #eeeeee url(images/ui-bg_highlight-soft_80_eeeeee_1x100.png) 50% top repeat-x; color: #2e7db2; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #2e7db2; }
-.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #ffb73d; background: #ffc73d url(images/ui-bg_glass_40_ffc73d_1x400.png) 50% 50% repeat-x; color: #111111; }
-.ui-state-error a, .ui-widget-content .ui-state-error a { color: #111111; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #111111; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_cccccc_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_cccccc_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_cccccc_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_4b8e0b_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_a83300_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-tl { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; }
-.ui-corner-tr { -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; }
-.ui-corner-br { -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; }
-.ui-corner-top { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; }
-.ui-corner-right {  -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; }
-.ui-corner-left { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; }
-.ui-corner-all { -moz-border-radius: 6px; -webkit-border-radius: 6px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #5c5c5c url(images/ui-bg_flat_50_5c5c5c_40x100.png) 50% 50% repeat-x; opacity: .80;filter:Alpha(Opacity=80); }
-.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #cccccc url(images/ui-bg_flat_30_cccccc_40x100.png) 50% 50% repeat-x; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 8px; -webkit-border-radius: 8px; }/* Accordion
-----------------------------------*/
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
-.ui-accordion .ui-accordion-content-active { display: block; }/* Datepicker
-----------------------------------*/
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; }
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/* Dialog
-----------------------------------*/
-.ui-dialog { position: relative; padding: .2em; width: 300px; }
-.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/* Progressbar
-----------------------------------*/
-.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* Resizable
-----------------------------------*/
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Slider
-----------------------------------*/
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
-----------------------------------*/
-.ui-tabs { padding: .2em; zoom: 1; }
-.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; }
-.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }

site/webroot/css/themes/darkness/ui.all.css

@@ -1,406 +0,0 @@
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Segoe%20UI,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=333333&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=25&borderColorHeader=333333&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=000000&bgTextureContent=05_inset_soft.png&bgImgOpacityContent=25&borderColorContent=666666&fcContent=ffffff&iconColorContent=cccccc&bgColorDefault=555555&bgTextureDefault=02_glass.png&bgImgOpacityDefault=20&borderColorDefault=666666&fcDefault=eeeeee&iconColorDefault=cccccc&bgColorHover=0078a3&bgTextureHover=02_glass.png&bgImgOpacityHover=40&borderColorHover=59b4d4&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=f58400&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=30&borderColorActive=ffaf0f&fcActive=ffffff&iconColorActive=222222&bgColorHighlight=eeeeee&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=80&borderColorHighlight=cccccc&fcHighlight=2e7db2&iconColorHighlight=4b8e0b&bgColorError=ffc73d&bgTextureError=02_glass.png&bgImgOpacityError=40&borderColorError=ffb73d&fcError=111111&iconColorError=a83300&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px
-*/
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Segoe UI, Arial, sans-serif; font-size: 1.1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Segoe UI, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #666666; background: #000000 url(images/ui-bg_inset-soft_25_000000_1x100.png) 50% bottom repeat-x; color: #ffffff; }
-.ui-widget-content a { color: #ffffff; }
-.ui-widget-header { border: 1px solid #333333; background: #333333 url(images/ui-bg_gloss-wave_25_333333_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #666666; background: #555555 url(images/ui-bg_glass_20_555555_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eeeeee; outline: none; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #eeeeee; text-decoration: none; outline: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #59b4d4; background: #0078a3 url(images/ui-bg_glass_40_0078a3_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; outline: none; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; outline: none; }
-.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #ffaf0f; background: #f58400 url(images/ui-bg_inset-soft_30_f58400_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; outline: none; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #ffffff; outline: none; text-decoration: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #cccccc; background: #eeeeee url(images/ui-bg_highlight-soft_80_eeeeee_1x100.png) 50% top repeat-x; color: #2e7db2; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #2e7db2; }
-.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #ffb73d; background: #ffc73d url(images/ui-bg_glass_40_ffc73d_1x400.png) 50% 50% repeat-x; color: #111111; }
-.ui-state-error a, .ui-widget-content .ui-state-error a { color: #111111; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #111111; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_cccccc_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_cccccc_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_cccccc_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_4b8e0b_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_a83300_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-tl { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; }
-.ui-corner-tr { -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; }
-.ui-corner-br { -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; }
-.ui-corner-top { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; }
-.ui-corner-right {  -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; }
-.ui-corner-left { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; }
-.ui-corner-all { -moz-border-radius: 6px; -webkit-border-radius: 6px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #5c5c5c url(images/ui-bg_flat_50_5c5c5c_40x100.png) 50% 50% repeat-x; opacity: .80;filter:Alpha(Opacity=80); }
-.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #cccccc url(images/ui-bg_flat_30_cccccc_40x100.png) 50% 50% repeat-x; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 8px; -webkit-border-radius: 8px; }/* Accordion
-----------------------------------*/
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
-.ui-accordion .ui-accordion-content-active { display: block; }/* Datepicker
-----------------------------------*/
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; }
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/* Dialog
-----------------------------------*/
-.ui-dialog { position: relative; padding: .2em; width: 300px; }
-.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/* Progressbar
-----------------------------------*/
-.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* Resizable
-----------------------------------*/
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Slider
-----------------------------------*/
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
-----------------------------------*/
-.ui-tabs { padding: .2em; zoom: 1; }
-.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; }
-.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }

site/webroot/js/jquery.hoverIntent.js

@@ -1,136 +0,0 @@
-/**
-* hoverIntent is similar to jQuery's built-in "hover" function except that
-* instead of firing the onMouseOver event immediately, hoverIntent checks
-* to see if the user's mouse has slowed down (beneath the sensitivity
-* threshold) before firing the onMouseOver event.
-* 
-* hoverIntent r5 // 2007.03.27 // jQuery 1.1.2+
-* <http://cherne.net/brian/resources/jquery.hoverIntent.html>
-* 
-* hoverIntent is currently available for use in all personal or commercial 
-* projects under both MIT and GPL licenses. This means that you can choose 
-* the license that best suits your project, and use it accordingly.
-* 
-* // basic usage (just like .hover) receives onMouseOver and onMouseOut functions
-* $("ul li").hoverIntent( showNav , hideNav );
-* 
-* // advanced usage receives configuration object only
-* $("ul li").hoverIntent({
-*	sensitivity: 7, // number = sensitivity threshold (must be 1 or higher)
-*	interval: 100,   // number = milliseconds of polling interval
-*	over: showNav,  // function = onMouseOver callback (required)
-*	timeout: 0,   // number = milliseconds delay before onMouseOut function call
-*	out: hideNav    // function = onMouseOut callback (required)
-* });
-* 
-* @param  f  onMouseOver function || An object with configuration options
-* @param  g  onMouseOut function  || Nothing (use configuration options object)
-* @author    Brian Cherne <brian@cherne.net>
-*/
-(function($) {
-	$.fn.hoverIntent = function(f,g) {
-		// default configuration options
-		var cfg = {
-			sensitivity: 7,
-			interval: 100,
-			timeout: 0
-		};
-		// override configuration options with user supplied object
-		cfg = $.extend(cfg, g ? { over: f, out: g } : f );
-
-		// instantiate variables
-		// cX, cY = current X and Y position of mouse, updated by mousemove event
-		// pX, pY = previous X and Y position of mouse, set by mouseover and polling interval
-		var cX, cY, pX, pY;
-
-		// A private function for getting mouse position
-		var track = function(ev) {
-			cX = ev.pageX;
-			cY = ev.pageY;
-		};
-
-		// A private function for comparing current and previous mouse position
-		var compare = function(ev,ob) {
-			ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
-			// compare mouse positions to see if they've crossed the threshold
-			if ( ( Math.abs(pX-cX) + Math.abs(pY-cY) ) < cfg.sensitivity ) {
-				$(ob).unbind("mousemove",track);
-				// set hoverIntent state to true (so mouseOut can be called)
-				ob.hoverIntent_s = 1;
-				return cfg.over.apply(ob,[ev]);
-			} else {
-				// set previous coordinates for next time
-				pX = cX; pY = cY;
-				// use self-calling timeout, guarantees intervals are spaced out properly (avoids JavaScript timer bugs)
-				ob.hoverIntent_t = setTimeout( function(){compare(ev, ob);} , cfg.interval );
-			}
-		};
-
-		// A private function for delaying the mouseOut function
-		var delay = function(ev,ob) {
-			ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
-			ob.hoverIntent_s = 0;
-			return cfg.out.apply(ob,[ev]);
-		};
-
-		// A private function for handling mouse 'hovering'
-		var handleHover = function(e) {
-			// REVISIT <AP>: 20090829; Unknown why mouseenter/mouseleave are being used
-			var etype = e.type;
-			etype = etype.replace(/mouseenter/, "mouseover");
-			etype = etype.replace(/mouseleave/, "mouseout");
-
-			// next three lines copied from jQuery.hover, ignore children onMouseOver/onMouseOut
-			var p = (etype == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget;
-			while ( p && p != this ) { try { p = p.parentNode; } catch(e) { p = this; } }
-			if ( p == this ) { return false; }
-
-			// copy objects to be passed into t (required for event object to be passed in IE)
-			var ev = jQuery.extend({},e);
-			var ob = this;
-
-			// cancel hoverIntent timer if it exists
-			if (ob.hoverIntent_t) { ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); }
-
-			// else e.type == "onmouseover"
-			if (etype == "mouseover") {
-				// set "previous" X and Y position based on initial entry point
-				pX = ev.pageX; pY = ev.pageY;
-				// update "current" X and Y position based on mousemove
-				$(ob).bind("mousemove",track);
-				// start polling interval (self-calling timeout) to compare mouse coordinates over time
-				if (ob.hoverIntent_s != 1) { ob.hoverIntent_t = setTimeout( function(){compare(ev,ob);} , cfg.interval );}
-
-			// else e.type == "onmouseout"
-			} else {
-				// unbind expensive mousemove event
-				$(ob).unbind("mousemove",track);
-				// if hoverIntent state is true, then call the mouseOut function after the specified delay
-				if (ob.hoverIntent_s == 1) { ob.hoverIntent_t = setTimeout( function(){delay(ev,ob);} , cfg.timeout );}
-			}
-		};
-
-		// bind the function to the two event listeners
-		return this.mouseover(handleHover).mouseout(handleHover);
-	};
-})(jQuery);
-
-
-$.event.special.hoverintent = {
-    setup: function() {
-	$(this).hoverIntent({
-		over: jQuery.event.special.hoverintent.over,
-	        out:  jQuery.event.special.hoverintent.out
-	    });
-    },
-    teardown: function() {
-    },
-
-    over: function(ev) {
-	ev.type = 'hoverintent';
-	jQuery.event.handle.apply(this, arguments);
-    },
-
-    out: function(event) {
-    }
-};

site/webroot/js/pmgr.jquery.js

@@ -0,0 +1,57 @@
+/* ******************************************************************************
+ * hoverintent
+ *
+ * Works like mouseover, but instead of firing immediately when an object
+ * is mouseover'ed, it tries to determine when the user actually _intends_
+ * to have the pointer hover over the object.  In other words, it's a lot
+ * like mouseover with a delay before firing, and if the pointer moves
+ * before hoverintent can fire, it doesn't fire at all.
+ *
+ * Found from jQuery UI Ticket #3614
+ * http://dev.jqueryui.com/ticket/3614
+ */
+
+var cfg = ($.hoverintent = {
+	sensitivity: 7,
+	interval: 100
+});
+	
+$.event.special.hoverintent = {
+	setup: function() {
+		$(this).bind("mouseover", jQuery.event.special.hoverintent.handler);
+	},
+	teardown: function() {
+		$(this).unbind("mouseover", jQuery.event.special.hoverintent.handler);
+	},
+	handler: function(event) {
+		event.type = "hoverintent";
+		var self = this,
+			args = arguments,
+			target = $(event.target),
+			cX, cY, pX, pY;
+			
+
+		function track(event) {
+			cX = event.pageX;
+			cY = event.pageY;
+		};
+		pX = event.pageX;
+		pY = event.pageY;
+		function clear() {
+			target.unbind("mousemove", track).unbind("mouseout", arguments.callee);
+			clearTimeout(timeout);
+		}
+		function handler() {
+			if ( ( Math.abs(pX-cX) + Math.abs(pY-cY) ) < cfg.sensitivity ) {
+				clear();
+				jQuery.event.handle.apply(self, args);
+			} else {
+				pX = cX; pY = cY;
+				timeout = setTimeout(handler, cfg.interval);
+			}
+		}
+		var timeout = setTimeout(handler, cfg.interval);
+		target.mousemove(track).mouseout(clear);
+		return true;
+	}
+};