search a place with nominatim

[syj.git] / application / controllers / ContactController.php

diff --git a/application/controllers/ContactController.php b/application/controllers/ContactController.php
index 03dd4a6b645436290fcf7fbc60c2dbb5c7d9edc6..3e82c7dc8bff5f86d37e92f0a0fb7d66f2437ccb 100644 (file)
--- a/application/controllers/ContactController.php
+++ b/application/controllers/ContactController.php
@@ -7,11 +7,10 @@ class ContactController extends Zend_Controller_Action
 
     public function init() {
         $this->view->headScript()->appendFile('js/prototype.js');
-        $this->view->headScript()->appendFile('js/forms.js');
-        $this->view->headScript()->appendFile('js/highlight.js');
+        $this->view->headScript()->appendFile('js/utils.js');
         $this->view->headScript()->appendFile('js/contact.js');
-        $this->view->headLink()->appendStylesheet('css/generic.css');
-        $this->view->headLink()->appendStylesheet('css/contact.css');
+        $this->view->headLink()->appendStylesheet('css/generic.css', 'all');
+        $this->view->headLink()->appendStylesheet('css/contact.css', 'all');
         $this->view->headTitle($this->view->translate("contact form"));
     }
 
@@ -85,7 +84,7 @@ class ContactController extends Zend_Controller_Action
         }
 
         if (empty($formData)) {
-            $user = $this->view->loggedUser();
+            $user = $this->_helper->SyjSession->user();
             if ($user) {
                 $form->contact_email->setValue($user->email)
                                     ->setAttrib('readonly', 'true');
@@ -120,7 +119,7 @@ class ContactController extends Zend_Controller_Action
 
     protected function _jsLocaleStrings() {
         $this->view->jslocales = array(
-            'notEmptyField' => __("Value is required and can't be empty"),
+            'notEmptyField' => __("Value is required"),
             'invalidMail' => __("Invalid email"));
     }
 }