Changeset 529

Timestamp:

05/20/08 12:57:16 (5 months ago)

Author:

aarkerio

Message:

Login box fixed

Location:

trunk/app

Files:

• controllers/discussions_controller.php (modified) (7 diffs)
• views/discussions/admin_listing.ctp (modified) (1 diff)
• views/elements/login_hide.ctp (modified) (2 diffs)
• views/layouts/portal.ctp (modified) (1 diff)
• webroot/js/myfunctions.js (modified) (4 diffs)

trunk/app/controllers/discussions_controller.php

@@ -12 +12 @@
 uses('sanitize');
 
-App::import('Model','User');
-
 class DiscussionsController extends AppController
 {
@@ -25 +23 @@
  {
     parent::beforeFilter();
-    $this->Auth->allow(array('captcha', 'add'));
+
+    if ( $this->Auth->user() ):
+         $this->Auth->allow(array('captcha', 'add'));
+    endif;
  }
 
@@ -70 +71 @@
      $this->Discussion->create();
          
-     if ( $this->Discussion->save($this->data['Discussion']) )  //save the comment
-     {
+     if ( $this->Discussion->save($this->data['Discussion']) ):  //save the comment
+
           $user_id  = $this->Discussion->News->field('user_id', array('News.id'=>$this->data['Discussion']['new_id']));
                 
@@ -77 +78 @@
                 
           $this->redirect('/news/view/'.$this->data['Discussion']['new_id'].'#cnews');
-     }
+     endif;
    }
  }
@@ -86 +87 @@
    $this->User = new User;
 
-   $this->User->unbindModel(array("hasMany"=>array('Entry', 'Lesson', 'Faq', 'Vclassroom', 'Acquaintance')));                
+   $this->User->unbindAll();                
                                                                               
    $val = $this->User->find(array('User.id'=>$user_id), array("User.name", "User.email"));
@@ -119 +120 @@
 
 /*****#### ADMIN METHODS  #####*****/
- public function admin_listing($limit=20)
+
+ public function admin_listing($paginate=0, $limit=20)
  {
    $this->layout    = 'admin';
@@ -127 +129 @@
    $conditions  = null;
 
-   $fields = array("Discussion.id", "News.title", "Discussion.id", "Discussion.comment", "Discussion.created", "Discussion.name", "Discussion.user_id");
+   $fields = array("Discussion.id", "News.title", "Discussion.id", "Discussion.comment", "Discussion.created", "Discussion.username", "Discussion.user_id");
    $order           = "Discussion.id DESC";
        
-   $this->set('data', $this->Discussion->findAll($conditions, $fields, $order, $limit, null, 2));
+   $this->set('data', $this->Discussion->findAll($conditions, $fields, $order, $limit));
  }
  

trunk/app/views/discussions/admin_listing.ctp

@@ -1 +1 @@
 <?php
-echo 'later';
+die(debug($data));
+echo $html->addCrumb('Control Tools', '/admin/news/start'); 
+echo $html->addCrumb('Comments', '/admin/comments/listing'); 
+echo $html->getCrumbs(' / '); 
+ 
+echo $html->div('title_section', 'Comments on News');
+
+foreach ($data as $val):
+   $tmp  = $html->link($val['Discussion']['title'], '/users/entry/'. $cU['User']['username'] . '/'.$val['Discussion']['id']) . '<br />';
+   $tmp .= $val['Comment']['created'].' <b>'.$val['Comment']['username'].' wrote:</b><br />';
+   $tmp .= $html->para(null, $val['Comment']['comment']);
+   $tmp .= $gags->confirmDel($val['Comment']['id'], 'Comment');
+   echo $html->div(null, $tmp);
+endforeach;
 ?>
 

trunk/app/views/elements/login_hide.ctp

@@ -1 +1 @@
 <!-- hide by default -->
-<div id="cover" style="display:none;" onclick="hide('cover', 'loginpopup')">
+<div id="cover" style="display:none;" onclick="ocultar()">
    
 </div>
 <div id="loginpopup" style="display:none">
-<div style="border-right: 2px solid #D3D3D3; vertical-align: top; padding-right:10px">
-<?php echo $html->link($html->image('close.gif', array('alt'=>'Close window', 'title'=>'Close window')),
+<div style="border:3px solid orange; vertical-align: top; padding:3px 10px 4px 4px">
+<?php 
+echo $html->div(null,$html->link($html->image('close.gif', array('alt'=>'Close window', 'title'=>'Close window')),
                '#',
-                       array("onclick"=>"javascript:hide('loginpopup', 'cover');"), 
-                       false, 
+                       array("onclick"=>"ocultar()"),
+               null, 
                        false
-                      );
+                      ), array('style'=>'width:150px;float:right;'));
+ 
+echo  $html->div(null, 'Login', array('style'=>'width:250px;float:left;'));
+echo  $html->div(null, '', array('style'=>'clear:both;'));
+echo  $form->create('User',array("action"=>"login","onsubmit"=>"return validateLogin()")); 
 ?>
-<h1>login</h1>
- <p>Already have an account and just want to login?</p>
-
-<?php echo  $form->create('User',array("action"=>"login","onsubmit"=>"return validateLogin()")); ?>
 <fieldset>
 <legend>Login</legend>
@@ -25 +26 @@
    echo $form->label('remember_me', 'Remember me:');
    echo  $form->checkbox("User.cokie", array("value" => 1));
-?>
-  <br />
- </fieldset>
- <?php 
-       echo $form->end('Login');
-       echo $html->para(null, $html->link('Join us!', '/users/register'));
-       echo $html->para(null, $html->link('forgot your password?', '/recovers/recover')); 
+
+   echo $form->end('Login');
+   echo '</fieldset>';
+
+   echo $html->div(null, $html->link('Join us!', '/users/register'));
+   echo $html->div(null, $html->link('forgot your password?', '/recovers/recover')); 
  ?>
 </div>

trunk/app/views/layouts/portal.ctp

@@ -14 +14 @@
     echo $html->charset('UTF-8');
     echo $javascript->link('prototype');
+    echo $javascript->link('scriptaculous.js?load=effects');
     echo $javascript->link('myfunctions');
-    echo $javascript->link('scriptaculous.js?load=effects');
  endif;
 echo $html->css("portal/portal");

trunk/app/webroot/js/myfunctions.js

@@ -3 +3 @@
 var logged = false;
 
-function init() {
+function init() 
+{
     //Check log
     if (!logged) 
     {   
-        createCookie("karamelo_first", "first", 999999)
+        createCookie("karamelo_first", "first", 999999);
         return;   
     }
@@ -27 +28 @@
 } 
 
-function validateVote(vote) {
+function validateVote(vote) 
+{
         
    valid = false;
 
    // Opera 5.05 Linux does not support for/in on this object
-   for ( var i = 0; i <  vote.length; i++ ) {
-      if ( vote[i].checked ) {
+   for ( var i = 0; i <  vote.length; i++ ) 
+   {
+      if ( vote[i].checked ) 
+      {
          valid = true;
          break;
       }
    }
-   if ( ! valid ) {
+
+   if ( ! valid ) 
+   {
       alert("You must choose one");
    }
@@ -116 +122 @@
     var name      = document.getElementById('UserName');
     var passwd    = document.getElementById('UserPasswd');
-    var email     = document.getElementById('UserEmail');
+ var email     = document.getElementById('UserEmail');
     
     if (username.value.length < 6) 
@@ -206 +212 @@
 }
 
-function hide () {for (i = 0; i < arguments.length; i++) {var e = $(arguments[i]); if (e) e.style.display = "none";}}
+function ocultar() 
+{
+     var Cover = document.getElementById('cover');
+     var Login = document.getElementById('loginpopup');
+     
+     Cover.style.display = "none";
+     Login.style.display = "none";          
+}
+
 function show () {for (i = 0; i < arguments.length; i++) {var e = $(arguments[i]); if (e) e.style.display = "";}}