Changeset 808 for trunk

Timestamp:

10/10/08 21:32:44 (8 weeks ago)

Author:

aarkerio

Message:

Little changes

Location:

trunk/app

Files:

• config/sql/postgresql/ts_index.sql (modified) (1 diff)
• controllers/users_controller.php (modified) (1 diff)
• views/elements/login.ctp (modified) (2 diffs)
• views/elements/login_hide.ctp (modified) (1 diff)
• views/elements/search.ctp (modified) (2 diffs)
• webroot/css/portal/portal.css (modified) (3 diffs)

trunk/app/config/sql/postgresql/ts_index.sql

@@ -1 +1 @@
 CREATE TEXT SEARCH DICTIONARY karamelo_es (
-    template = snowball,
-    language = spanish,
+    template  = snowball,
+    language  = spanish,
     stopwords = spanish
 );
 
 CREATE TEXT SEARCH CONFIGURATION public.karamelo_es ( COPY = pg_catalog.spanish ); 
+
+CREATE TEXT SEARCH DICTIONARY karamelo_en (
+    template  = snowball,
+    language  = english,
+    stopwords = english
+);
+
+CREATE TEXT SEARCH CONFIGURATION public.karamelo_en ( COPY = pg_catalog.english ); 
+
 
 CREATE INDEX pgnews_idx ON news USING gin(to_tsvector('karamelo_es', body));

trunk/app/controllers/users_controller.php

@@ -215 +215 @@
  public function login()
  {
-     if ($this->Auth->user()):
-           if (!empty($this->data)):
+   if ($this->Auth->user()):
+       if (!empty($this->data)):
                 if (empty($this->data['User']['remember_me'])):
                     $this->Cookie->del('User');

trunk/app/views/elements/login.ctp

@@ -4 +4 @@
 <legend><?php __('Login'); ?></legend>
   <?php 
-   echo  $form->input('User.email', array('size' => 15, 'maxlength'=> 45, 'between'=>'<br />')) . '<br />';
+   echo  $form->input('User.email', array('size' => 13, 'maxlength'=> 45, 'between'=>'<br />')) . '<br />';
    echo  $form->label('User.pwd', 'Password: ').'<br />';
    echo  $form->password('User.pwd', array('id' => 'user_pwd', 'size' => 9, 'maxlength' => 9)) . '<br />';
@@ -14 +14 @@
 
  <?php 
-   echo $html->para(null, $html->link(__('Join us!', true), '/users/register')); 
-   echo $html->para(null, $html->link(__('Forgot your password?', true), '/recovers/recover')); 
+   echo $html->div(null, $html->link(__('Join us!', true), '/users/register')); 
+   echo $html->div(null, $html->link(__('Forgot your password?', true), '/recovers/recover')); 
  ?>
  </div>

trunk/app/views/elements/login_hide.ctp

@@ -22 +22 @@
    echo  $form->input('User.email', array('size' => 30, 'maxlength'=>50, 'between' => ': <br />')) . "<br />";   
 
-   echo $form->input('pwd', array('between'=>'<br />', 'type' => 'password', 'label'=>'Password:', 'size' => 9, 'maxlength'=> 9));
+   echo $form->input('User.pwd', array('between'=>'<br />', 'type' => 'password', 'label'=>'Password:', 'size' => 9, 'maxlength'=> 9));
 
    echo $form->label('remember_me', __('Remember me', true));
-   echo $form->checkbox('User.cookie');
+   echo $form->checkbox('User.remember_me');
 
    echo $form->end(__('Login', true));

trunk/app/views/elements/search.ctp

@@ -23 +23 @@
 //]]>
 </script>
+<div style="margin:0 0 22px 0;padding:0;"
 <?php 
     echo $form->create('Entry', array('action'=>'search', 'onsubmit'=>"return chkSearch()"));
@@ -30 +31 @@
    echo $form->end('Search');
  ?>
+</div>

trunk/app/webroot/css/portal/portal.css

@@ -86 +86 @@
 .bg1 { background: url(/css/portal/img/img04.gif) no-repeat left bottom; }
 .bg2 { background: url(/css/portal/img/img05.gif) no-repeat left bottom; }
-.bg3 { background: url(/css/portal/img/img06.gif) no-repeat left bottom; }
+.bg3 { background: url(/css/portal/img/img06.gif) no-repeat left bottom; padding:0;margin:0;}
 .bg4 { background: url(/css/portal/img/img08.gif) no-repeat left bottom; }
 .bg5 { background: url(/css/portal/img/img09.gif) no-repeat left bottom; }
@@ -136 +136 @@
 .outbutton{ text-align:center;margin:25px 0; }
 /*Login boxes*/
+#login{ padding:0;margin:15px 0 25px 0;}
 #cover { 
       position: absolute;
@@ -146 +147 @@
       filter: alpha(opacity=70);
       z-index: 5;
-}         
-         
+}
 #loginpopup { 
       position: absolute;