Changeset 604

Timestamp:

06/13/08 11:17:49 (4 months ago)

Author:

aarkerio

Message:

CSS dixed

Location:

trunk/app

Files:

• controllers/messages_controller.php (modified) (2 diffs)
• views/layouts/portal.ctp (modified) (1 diff)
• views/messages/admin_display.ctp (modified) (3 diffs)
• views/news/display.ctp (modified) (1 diff)
• views/news/view.ctp (modified) (1 diff)
• webroot/css/portal/portal.css (modified) (1 diff)

trunk/app/controllers/messages_controller.php

@@ -431 +431 @@
  public function admin_display($message_id)
  {
-      $this->pageTitle = 'Message';
+      $this->pageTitle = 'View Message';
       
       $this->layout    = 'admin';
@@ -437 +437 @@
       $conditions      = array("Message.id"=>$message_id, "Message.user_id"=>$this->Auth->user('id'));
       
-      $fields          = array("Message.id", "Message.user_id", "Message.title", "Message.created", "Message.body", "Message.sender_id", "Message.status", "User.username");
+      $fields          = array("Message.id", "Message.user_id", "Message.title", "Message.created", "Message.body", "Message.sender", "Message.status", "User.username");
       
       $data            = $this->Message->find($conditions, $fields);
       
-      if ( $data['Message']["status"] == 0 )  // change from new to readed
-      {
-         $this->change($data['Message']["id"], 1);
-      }
+      if ( $data['Message']['status'] == 0 ):  // change from new to readed
+         $this->Message->change($data['Message']['id'], 1);
+      endif;
       
       //var_dump($data);

trunk/app/views/layouts/portal.ctp

@@ -19 +19 @@
 ?>
 <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="/news/rss/" />
-<link rel="shortcut icon" href="/img/static/favicon.ico" />
+<link rel="shortcut icon" href="/favicon.ico" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 </head>

trunk/app/views/messages/admin_display.ctp

@@ -4 +4 @@
  echo $html->addCrumb('Messages', '/admin/messages/listing'); 
  echo $html->getCrumbs(' / '); 
+ echo $html->para(null, $html->link($html->image('admin/compose_on.gif', array("alt"=>'Add new page','title'=>"Add new page")), '/admin/messages/add', null, false, false));
 ?>
-
-<p><?php echo $html->link($html->image('admin/compose_on.gif', array("alt"=>"Add new page", "title"=>"Add new page")), '/admin/messages/add', null, false, false) ?></p>
 
 <div id="charging" style="display:none;"><?php echo $html->image('static/loading.gif', array("alt"=>"Loading")); ?></div>
 
 <div style="border:1px dotted gray;padding:5px;margin:0 auto 0 auto;">
-<h1>Message </h1>
+<h1><?php __('Message'); ?></h1>
 <?php
 //exit(print_r($data));
@@ -23 +22 @@
 echo '<input type="button" value="Reply" onclick="hU()" />';
 
-echo $ajax->div("delbutton", array("style"=>"text-align:right"));
+echo $ajax->div('delbutton', array('style'=>'text-align:right'));
    echo $gags->confirmDel($data['Message']['id'], 'messages');
 echo $ajax->divEnd("delbutton");
@@ -33 +32 @@
 <?php
   echo $ajax->form(); 
-  echo $html->hidden('Message/username',   array("value"=>$othAuth->user('username')));
-  echo $html->hidden('Message/sender_id',  array("value"=>$othAuth->user('id')));
-  echo $html->hidden('Message/message_id', array("value"=> $data["Message"]["id"]));
-  echo $html->hidden('Message/user_id',    array("value"=> $data["Message"]["sender_id"]));     // the change was made on admin_display.thtml
+  echo $form->hidden('Message.username',   array('value'=>$session->read('Auth.User.username')));
+  echo $form->hidden('Message.sender_id',  array('value'=>$session->read('Auth.User.id')));
+  echo $form->hidden('Message.message_id', array('value'=> $data['Message']['id']));
+  echo $form->hidden('Message.user_id',    array('value'=> $data['Message']['sender']));     // the change was made on admin_display.thtml
 ?>
 <fieldset>
 <legend>Reply</legend>
   <?php 
-  echo $othAuth->user('username') . "  writes: <br />";
-  echo $form->labelTag( 'Message/title', 'Asunto:' ) . "<br />";
-  echo $html->input('Message/title', array("size" => 35, "maxlength" => 50, "value"=> 'Re: ' . $data["Message"]["title"])) . "<br />";
-  echo $html->tagErrorMsg('Message/title', 'Asunto is required.'); 
+  echo $session->read('Auth.User.username') . __('write', true) .': <br />';
+  echo $form->label('Message.title', 'Asunto:' ) . "<br />";
+  echo $form->input('Message.title', array("size" => 35, "maxlength" => 50, "value"=> 'Re: ' . $data["Message"]["title"])) . "<br />";
+  echo $form->error('Message.title', 'Asunto is required.'); 
   ?>  
 </p>
   <br />
-  <?php echo $form->labelTag('Message/body', 'Message:' );?><br />
-  <?php echo $html->textarea('Message/body', array("cols"=>50, "rows"=>10, "value"=>$data["User"]["username"] . ' wrote: ' . $data["Message"]["body"])); ?>
-  <?php echo $fck->load('Message/body', 'Basic', 600, 160); ?> 
-  <?php echo $html->tagErrorMsg('Message/body', 'Message is required.'); ?>
+  <?php echo $form->label('Message.body', 'Message:' );?><br />
+  <?php echo $form->textarea('Message.body', array("cols"=>50, "rows"=>10, "value"=>$data["User"]["username"] . ' wrote: ' . $data["Message"]["body"])); ?>
+  <?php echo $fck->load('Message.body', 'Basic', 600, 160); ?> 
+  <?php echo $form->error('Message.body', 'Message is required.'); ?>
   <br />
   </p>

trunk/app/views/news/display.ctp

@@ -9 +9 @@
  
   echo $html->div('news_title', $html->link($val['News']['title'], '/news/view/'. $val['News']['id']));  
-  echo $html->div('news_date',  $val['News']['created']);
-  echo $html->div('news_body',
+  echo $html->div('redaccion', __('from_dep', true).'<i> '.$val['Theme']['theme'].'</i>, posted by '.$html->link($val['User']['username'], '/users/about/'.$val['User']['username']).' on '. $val['News']['created']); 
+  echo $html->div('bodynew',
                             $html->div('img_new', $html->link(
                                                           $html->image('themes/'.$val['Theme']['img'], 

trunk/app/views/news/view.ctp

@@ -3 +3 @@
 echo $html->div('titnew', $data['News']['title']);
 
-echo $html->div('redaccion', __('from_dep', true).'<i> '.$data['Theme']['theme'].'</i>, posted by '.$html->link($data['User']['username'], '/users/blogger/'.$data['User']['username']).' on '. $data['News']['created']); 
+echo $html->div('redaccion', __('from_dep', true).'<i> '.$data['Theme']['theme'].'</i>, posted by '.$html->link($data['User']['username'], '/users/about/'.$data['User']['username']).' on '. $data['News']['created']); 
 ?>
 

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

@@ -318 +318 @@
   padding:3px;
   margin:2px;
+  font-size:8pt;
  }
+
+.wrapnew p { 
+  font-size:8pt;
+ }
+
+.bodynew { 
+  font-size:8pt;
+}
            
  .titnew {