Changeset 654

Timestamp:

07/15/08 15:38:15 (3 months ago)

Author:

aarkerio

Message:

Update

Location:

trunk/app

Files:

• controllers/news_controller.php (modified) (1 diff)
• models/discussion.php (modified) (1 diff)
• views/news/display.ctp (modified) (2 diffs)
• views/news/view.ctp (modified) (2 diffs)

trunk/app/controllers/news_controller.php

@@ -49 +49 @@
   $this->layout = 'portal';
 
-  $this->pageTitle = '::News';
+  $this->pageTitle = '::'.__('News', true);
 
   $this->News->User->unbindAll();

trunk/app/models/discussion.php

@@ -25 +25 @@
                             array('className'     => 'User',
                                   'conditions'    => null,
-                                  'fields'        => 'id, username',
+                                  'fields'        => 'id, username, avatar',
                                   'order'         => null,
                                   'limit'         => null,

trunk/app/views/news/display.ctp

@@ -15 +15 @@
                                                                             array('alt'=>$val['Theme']['theme'], 
                                                                                    'title'=>$val['Theme']['theme'], 
-                                                                                   'class'=>'themes')
+                                                                                   'class'=>'themes', 'id'=>'new'.$val['News']['id'])
                                                                            ), 
                                   '/news/category/'.$val['News']['theme_id'], null, null, false
                                                    )
-                                      )
+                       )
                     );  
   
@@ -28 +28 @@
      e($html->para(null,$html->link(__('Put your comment', true).' ('. count($val['Discussion']).')','/news/view/'.$val['News']['id'])));
   endif;
-?>
-  <br />
-    <span style="font-size:7pt;">Permalink:</span> <br />
-    <?php echo $html->link(
+
+  echo $html->para(null,   '<span style="font-size:7pt;">Permalink:</span> ' .$html->link(
                'http://'.$_SERVER['HTTP_HOST'].'/news/view/'.$val['News']['id'],
                            'http://'.$_SERVER['HTTP_HOST'].'/news/view/'.$val['News']['id']
-               ); 
-?>
-    <br /><br />
-    <b><?php __('Reference'); ?>:</b>
+                           )); 
+if ( strlen($val['News']['reference'])  > 10) :
     
-    <?php echo $html->link(
-                           $html->image('static/newwindow.gif', array("alt"=>"Open new window", "title"=>"Open new window")),
-                           $val['News']['reference'],
-                           array("onclick"=>"window.open(this.href, '_help', 'status,scrollbars,resizable,width=800,height=600,left=10,top=10,menubar,toolbar')"), 
-                           null,
-                           null,
-                           false);
-      
+   echo $html->para(null, __('Reference', true). ' ' .$html->link(
+                           $html->image('static/newwindow.gif', array('alt'=>'Open new window', 'title'=>'Open new window')),
+                           '#new'.$val['News']['id'],
+                           array("onclick"=>"window.open('".$val['News']['reference']."', '_help', 'status,scrollbars,resizable,width=800,height=600,left=10,top=10,menubar,toolbar')"), null, null, false));
+endif;    
+  
   echo $news->socialNets($val['News']['id'], $val['News']['title']); // Social nets buttons
       

trunk/app/views/news/view.ctp

@@ -17 +17 @@
  
  echo $data['News']['body']; 
-?>
     
-    <br />
-    <span style="font-size:7pt;">Permalink:</span> <br />
-    <?php echo $html->link(
+ echo $html->para(null,'<span style="font-size:7pt;">Permalink:</span><br /> '.$html->link(
                'http://'.$_SERVER['HTTP_HOST'].'/news/view/'.$data['News']['id'], 
                            'http://'.$_SERVER['HTTP_HOST'].'/news/view/'.$data['News']['id']
-               ); 
-?>
-    <br /><br />
-    <b>Reference:</b>
-    
-    <?php echo $html->link(
-                           $html->image('static/newwindow.gif', array("alt"=>"Open new window", "title"=>"Open new window")),
-                           $data['News']['reference'],
-                           array("onclick"=>"window.open(this.href, '_help', 'status,scrollbars,resizable,width=800,height=600,left=10,top=10,menubar,toolbar')"), 
-                           null,
-                           null,
-                           false);
+               )); 
+
+if ( strlen($data['News']['reference'])  > 10) :
+
+ echo $html->para(null, __('Reference', true) .': '. $html->link(
+                           $html->image('static/newwindow.gif',
+                                     array('alt'=>__('Open new window', true), 'title'=>__('Open new window', true))),
+                           '#',
+                           array("onclick"=>"window.open('".$data['News']['reference']."', '_help', 'status,scrollbars,resizable,width=800,height=600,left=10,top=10,menubar,toolbar')"), null, null, false));
+endif;
       
 echo $news->socialNets($data['News']['id'], $data['News']['title']); // Social nets buttons
@@ -47 +42 @@
       $bg = ($i%2 == 0) ? "#e2e2e2" : "#fff";
           
-      $tmp  = $html->para(null,$time->timeAgoInWords($v['created']) . ' <b>'. $v['User']['username']    . '</b> wrote:<br />', array('style'=>'font-size:8pt;font-family:Georgia;'));
+      $tmp  = $html->para(null, 
+              $html->link($html->image('avatars/'.$v['User']['avatar'], array('width'=>'20px','alt'=>$v['User']['username'],'title'=>$v['User']['username'])), '/users/about/'.$v['User']['username'], null, null, false) .' '.
+              $html->link($v['User']['username'], '/users/about/'.$v['User']['username']).'<br />'.
+              $html->image('static/time.png', array('alt'=>'Time')).' '.$time->timeAgoInWords($v['created']), array('style'=>'font-size:8pt;font-family:Georgia;'));
       $tmp .= $html->para(null, $v['comment']);
       echo $html->div('divblock', $tmp, array('style'=>'background-color:'.$bg));