Changeset 451

Timestamp:

05/25/10 14:54:24 (21 months ago)

Author:

aarkerio

Message:

Update Google markers

Location:

trunk

Files:

• config/core.php (modified) (1 diff)
• controllers/markers_controller.php (modified) (4 diffs)
• models/marker.php (modified) (3 diffs)
• views/layouts/gmap.ctp (modified) (3 diffs)
• views/layouts/portal.ctp (modified) (1 diff)
• views/markers/add.ctp (deleted)
• views/markers/admin_edit.ctp (modified) (1 diff)
• views/markers/admin_index.ctp (modified) (2 diffs)
• views/markers/edit.ctp (deleted)

trunk/config/core.php

@@ -141 +141 @@
  * Actual value depends on 'Security.level' setting.
  */
-  Configure::write('Session.timeout', '1200000');
+  Configure::write('Session.timeout', '3600');
 
 /**

trunk/controllers/markers_controller.php

@@ -1 +1 @@
 <?php
+/**
+ *  Centauro Intranet Portal
+ *  GPLv3
+ *  @copyright Copyright 2006-2010, Chipotle Software, Inc. (http://www.chipotle-software.com)
+ *  @version 0.8
+ *  @package links
+ *  @license http://www.gnu.org/licenses/gpl-3.0.html
+ */
+#file: controllers/markers_controller.php
+
 class MarkersController extends AppController {
 
  public $name = 'Markers';
 
- public function index() 
+ public function display() 
  {
-   $this->Marker->recursive = 0;
-   $this->set('markers', $this->paginate());
+  $this->layout = Null;
+  $this->set('data', $this->Marker->find('all'));
  }
 
- public function display() 
+ public function view() 
  {
-   $this->set('data', $this->Marker->find('all'));
+  $this->layout = 'gmap';
  }
-
- public function view($id = null) 
- {
-   if ( !$id ):
-           $this->Session->setFlash(sprintf(__('Invalid %s', true), 'marker'));
-       $this->redirect(array('action' => 'index'));
-   endif;
-   $this->set('marker', $this->Marker->read(null, $id));
- }
-
- public function add() 
- {
-  if (!empty($this->data)):
-      if ($this->Marker->save($this->data)):
-                  $this->Session->setFlash(sprintf(__('The %s has been saved', true), 'marker'));
-                  $this->redirect(array('action' => 'index'));
-          else:
-              $this->Session->setFlash(sprintf(__('The %s could not be saved. Please, try again.', true), 'marker'));
-      endif;
-  endif;
- }
-
- public function edit($id = null) 
- {
-                if (!$id && empty($this->data)) {
-                        $this->Session->setFlash(sprintf(__('Invalid %s', true), 'marker'));
-                        $this->redirect(array('action' => 'index'));
-                }
-                if (!empty($this->data)) {
-                        if ($this->Marker->save($this->data)) {
-                                $this->Session->setFlash(sprintf(__('The %s has been saved', true), 'marker'));
-                                $this->redirect(array('action' => 'index'));
-                        } else {
-                                $this->Session->setFlash(sprintf(__('The %s could not be saved. Please, try again.', true), 'marker'));
-                        }
-                }
-                if (empty($this->data)) {
-                        $this->data = $this->Marker->read(null, $id);
-                }
-        }
 
 /** == ADMIN METHODS == */
@@ -62 +32 @@
   $this->set('markers', $this->paginate());
  }
-
 
  public function admin_edit($marker_id = null) 
@@ -74 +43 @@
       if ($this->Marker->save($this->data)):
           if ($this->data['Marker']['end'] == 0 && !isset($this->data['Marker']['id'])):  # INSERT INTO
-              $id = $this->Marker->getLastInsertID();
-              $return = '/admin/markers/edit/'.$id;    
+              $marker_id = $this->Marker->getLastInsertID();
+              $return = '/admin/markers/edit/'.$marker_id;    
               elseif ($this->data['Marker']['end'] == 0 && isset($this->data['Marker']['id'])):  # UPDATE 
               $return = '/admin/markers/edit/'.$this->data['Marker']['id'];
@@ -90 +59 @@
  }
 
- public function admin_delete($id = null) 
+ public function admin_delete($marker_id = null) 
  {
-  if (!$id):
-      $this->Session->setFlash(sprintf(__('Invalid id for %s', true), 'marker'));
+  if (!$marker_id):
+      $this->Session->setFlash(sprintf(__('Invalid id for %s', True), 'marker'));
           $this->redirect(array('action'=>'index'));
   else:      
-         if ($this->Marker->delete($id)):
-             $this->Session->setFlash(sprintf(__('%s deleted', true), 'Marker'));
+         if ($this->Marker->delete($marker_id)):
+             $this->Session->setFlash(sprintf(__('%s deleted', True), 'Marker'));
                  $this->redirect(array('action'=>'index'));
          else:
-                 $this->Session->setFlash(sprintf(__('%s was not deleted', true), 'Marker'));
+                 $this->Session->setFlash(sprintf(__('%s was not deleted', True), 'Marker'));
                  $this->redirect(array('action' => 'index'));
      endif;

trunk/models/marker.php

@@ -1 +1 @@
 <?php
+/**
+ *  Centauro Intranet Portal
+ *  GPLv3
+ *  @copyright Copyright 2006-2010, Chipotle Software, Inc. (http://www.chipotle-software.com)
+ *  @version 0.8
+ *  @package links
+ *  @license http://www.gnu.org/licenses/gpl-3.0.html
+ */
+#file: models/marker.php
+
 class Marker extends AppModel {
   public $name = 'Marker';
   public $displayField = 'name';
-  public$validate = array(
-                'id' => array(
-                        'numeric' => array(
-                                'rule' => array('numeric'),
+  public $validate = array(
+                'name' => array('rule'       => array('minLength', 4),
                                 //'message' => 'Your custom message here',
                                 //'allowEmpty' => false,
@@ -13 +21 @@
                                 //'on' => 'create', // Limit validation to 'create' or 'update' operations
                         ),
-                        'notempty' => array(
-                                'rule' => array('notempty'),
+                'address' => array('rule'       => array('minLength', 4),
                                 //'message' => 'Your custom message here',
                                 //'allowEmpty' => false,
@@ -21 +28 @@
                                 //'on' => 'create', // Limit validation to 'create' or 'update' operations
                         ),
-                ),
-                'name' => array(
-                        'alphanumeric' => array(
-                                'rule' => array('alphanumeric'),
-                                //'message' => 'Your custom message here',
-                                //'allowEmpty' => false,
-                                //'required' => false,
-                                //'last' => false, // Stop validation after this rule
-                                //'on' => 'create', // Limit validation to 'create' or 'update' operations
-                        ),
-                ),
-                'address' => array(
-                        'alphanumeric' => array(
-                                'rule' => array('alphanumeric'),
-                                //'message' => 'Your custom message here',
-                                //'allowEmpty' => false,
-                                //'required' => false,
-                                //'last' => false, // Stop validation after this rule
-                                //'on' => 'create', // Limit validation to 'create' or 'update' operations
-                        ),
-                ),
                 'lat' => array(
                         'numeric' => array(

trunk/views/layouts/gmap.ctp

@@ -3 +3 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-  <title>Google Maps AJAX + MySQL/PHP Example</title>
-    <script src="http://maps.google.com/maps?file=api&v=2&key=ABQIAAAAjPKkDYTVDZGDWlW2yrngQRS683khtCNerCX0A8OGSN-Hv50GHRRSNxYQrB8Gx4ciUuqyy6DNkow08g"
+<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+<title>Google Maps</title>
+<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=true"></script>
+
+ <script src="http://maps.google.com/maps?file=api&v=2&key=ABQIAAAAjPKkDYTVDZGDWlW2yrngQRS683khtCNerCX0A8OGSN-Hv50GHRRSNxYQrB8Gx4ciUuqyy6DNkow08g"
             type="text/javascript"></script>
 
 <script type="text/javascript">
-  //<![CDATA[
+ //<![CDATA[
+
+  function initialize() {
+     var latlng = new google.maps.LatLng(19.43430, -99.13264);
+     var myOptions = {
+     zoom: 8,
+     center: latlng,
+     mapTypeId: google.maps.MapTypeId.ROADMAP
+     };
+     var map = new google.maps.Map(document.getElementById("map"), myOptions);
+ }
 
 var iconBlue = new GIcon(); 
@@ -36 +49 @@
         map.addControl(new GSmallMapControl());
         map.addControl(new GMapTypeControl());
-        map.setCenter(new GLatLng(47.614495, -122.341861), 13);
+        map.setCenter(new GLatLng(19.43430, -99.13264), 10);
        
-        GDownloadUrl("phpsqlajax_genxml.php", function(data) {
+        GDownloadUrl("/markers/display", function(data) {
                 var xml = GXml.parse(data);
                 var markers = xml.documentElement.getElementsByTagName("marker");
@@ -65 +78 @@
 </script>
 </head>
-
-<body onload="load()" onunload="GUnload()">
-    <div id="map" style="width: 500px; height: 300px"></div>
+<body onload="initialize()" onunload="GUnload()">
+    <div>Mononeurona::My Places::Google maps API</div>
+    <div id="map" style="width: 900px; height: 800px;margin:auto;"></div>
  </body>
 </html>

trunk/views/layouts/portal.ctp

@@ -7 +7 @@
 <head>
 <title>Despabilando la.. :: <?php echo $title_for_layout; ?> </title>
-<meta name="keywords" content="education, school, elearning" />
+<meta name="google-site-verification" content="5PeM5GACl_SgMW-cBD6lCelwSwRtGOg_Gx8vBqhi6z0" />
+<meta name="keywords" content="linux, openbsd, programming, cakephp, Django, ruby, python" />
 <link rel="shortcut icon" href="/img/static/favicon.ico" />
-<meta name="description" content="Educational Portal" />
+<meta name="description" content="Hacktivismo Portal" />
 <?php
 if ( isset($this->Js) ):

trunk/views/markers/admin_edit.ctp

@@ -20 +20 @@
                 echo $this->Form->input('lat');
                 echo $this->Form->input('lng');
-        $types = array(1=>'Bar', 2=>'Restaurante'); 
+        $types = array('Bar'=>'Bar', 'Restaurante'=>'Restaurante', 'Antro'=>'Antro', 'Congal'=>'Congal');
         echo $this->Form->input('type', array('options'=>$types));
         echo $this->Form->input('end', array('type'=>'checkbox', 'value'=>'1'));

trunk/views/markers/admin_index.ctp

@@ -1 +1 @@
 <div class="actions">
         <h3><?php __('Actions'); ?></h3>
-        <ul>
-                <li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Marker', true)), array('action' => 'edit')); ?></li>
-        </ul>
+<?php 
+ echo $this->Html->link(sprintf(__('New %s', true), __('Marker', true)), array('action' => 'edit')); 
+ echo $this->Html->link('View all markers', array('action' => 'view'));
+?>
 </div>
 <div class="markers index">
@@ -33 +34 @@
                 <td><?php echo $marker['Marker']['type']; ?>&nbsp;</td>
                 <td class="actions">
-                        <?php echo $this->Html->link(__('View', true), array('action' => 'view', $marker['Marker']['id'])); ?>
-                        <?php echo $this->Html->link(__('Edit', true), array('action' => 'edit', $marker['Marker']['id'])); ?>
-                        <?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $marker['Marker']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $marker['Marker']['id'])); ?>
+                        <?php echo $this->Html->link(__('Edit', True), array('action' => 'edit', $marker['Marker']['id'])); ?>
+                        <?php echo $this->Html->link(__('Delete', True), array('action' => 'delete', $marker['Marker']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $marker['Marker']['id'])); ?>
                 </td>
         </tr>