Merge in from pre_0.1 branch

git-svn-id: file:///svn-source/pmgr/trunk/site@847 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-09-15 02:38:28 +00:00
parent 7b3707ef89
commit cc12d5ff93
128 changed files with 4126 additions and 1330 deletions
--- a/controllers/maps_controller.php
+++ b/controllers/maps_controller.php
@@ -52,6 +52,7 @@ class MapsController extends AppController {
      $this->Session->setFlash(__('Invalid Item.', true));
      $this->redirect(array('action'=>'index'));
    }
+    $this->sideMenuEnable('SITE', $this->op_area);
    $this->set('info', $this->mapInfo($id, $requested_width));
    $this->set('title', "Site Map");
  }