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!
+

site/app_controller.php

@@ -221,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',
@@ -230,7 +233,6 @@ 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',
@@ -294,7 +296,7 @@ class AppController extends Controller {
 	$this->sideMenuEnable($area_name, $this->dev_area, false);
       if (empty($this->params['admin']))
 	$this->sideMenuEnable($area_name, $this->admin_area, false);
-    }
+  }
   }
 
 
@@ -331,17 +333,17 @@ 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)
@@ -406,20 +408,19 @@ class AppController extends Controller {
     $this->autoLayout = false;
     $this->autoRender = false;
     Configure::write('debug', '0');
-    $script = $_SERVER['DOCUMENT_ROOT'] . '/pmgr/build.cmd';
+    $script = preg_replace("%/webroot/index\.php$%",
+			   "/../build.cmd",
+			   $_SERVER['SCRIPT_FILENAME']);
     echo "<P>" . date('r') . "\n";
-    //echo "<P>Script: $script" . "\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>Handle: $handle; " . gettype($handle) . "\n";
+    echo "<P>\n";
-    echo "<P><PRE>\n";
     while (($read = fread($handle, 2096))) {
-      echo $read;
+      echo str_replace("\n", "<BR>\n", htmlspecialchars($read));
     }
-    echo "</PRE>\n";
     pclose($handle);
   }
 
@@ -1085,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";

site/config/database.php

@@ -7,7 +7,7 @@ class DATABASE_CONFIG {
 		'host' => 'localhost',
 		'login' => 'pmgr',
 		'password' => 'pmgruser',
-		'database' => 'property_manager',
+		'database' => 'pmgr_sand',
 		'prefix' => 'pmgr_',
 	);
 

site/views/layouts/default.ctp

@@ -61,9 +61,9 @@
 		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 $html->css('themes/base/ui.all') . "\n";
-		//echo $html->css('themes/smoothness/ui.all') . "\n";
+		echo $html->css('themes/smoothness/ui.all') . "\n";
 		//echo $html->css('themes/dotluv/ui.all') . "\n";
-		echo $html->css('themes/start/ui.all') . "\n";
+		//echo $html->css('themes/start/ui.all') . "\n";
 		echo $javascript->link('jquery.form') . "\n";
 		echo $javascript->link('pmgr.jquery') . "\n";
 		echo $javascript->link('pmgr') . "\n";