Changeset 809 for trunk

Timestamp:

10/11/08 22:19:40 (7 weeks ago)

Author:

aarkerio

Message:

Little changes

Location:

trunk/app

Files:

• app_controller.php (modified) (3 diffs)
• config/core.php (modified) (3 diffs)
• controllers/news_controller.php (modified) (1 diff)
• controllers/newsletters_controller.php (modified) (1 diff)
• locale/spa/LC_MESSAGES/default.po (modified) (2 diffs)
• views/newsletters/admin_add.ctp (modified) (1 diff)
• views/newsletters/admin_listing.ctp (modified) (3 diffs)
• views/newsletters/display.ctp (modified) (1 diff)

trunk/app/app_controller.php

@@ -16 +16 @@
  public $components = array('Auth', 'Cookie', 'Session'); // set Security component later
  
- public $helpers    = array('Html', 'Form', 'Session');
+ public $helpers    = array('Html', 'Form', 'Session'); // 'Cache'
  
  public function beforeFilter()
  {
+   //$this->cacheAction = true;
+    
    //set locale (es or en by now)
    $this->__setLocale();
@@ -43 +45 @@
    endif;
  
-   return true;
+   return false;
  }
 
@@ -66 +68 @@
         $this->Session->write('lang',$lang);
      endif; */
-     $lang = 'en';
+     $lang = 'es';
      $this->L10n->get($lang);
      Configure::write('Config.language', $lang);

trunk/app/config/core.php

@@ -56 +56 @@
  *
  */
-    //Configure::write('Cache.check', true);
+//   Configure::write('Cache.check', true);
 /**
  * Defines the default error type when using the log() function. Used for
@@ -199 +199 @@
  *                  );
  */
- Cache::config('default', array('engine' => 'File'));
+  Cache::config('default', array('engine' => 'File'));
+
  
 /* Cache::config('default', array('engine' => 'Xcache', //[required]
@@ -205 +206 @@
                       'probability'=> 100, //[optional]
                       'user' => 'aarkerio', //user from xcache.admin.user settings
-                      'password' => 'kunst99' //plaintext password (xcache.admin.pass)
+                      'password' => 'dfdgdf' //plaintext password (xcache.admin.pass)
                  )
          ); */

trunk/app/controllers/news_controller.php

@@ -15 +15 @@
 
  public $name = 'News';
- 
- public $helpers          = array('Ajax', 'Fck', 'News', 'Time', 'Gags');
-  
+ public $helpers          = array('Ajax', 'Fck', 'News', 'Time', 'Gags');  
  public $components       = array('Portal');
-
  public $paginate = array('limit' => 8, 'page' => 1, 'order' => array('News.id' => 'DESC'));
   

trunk/app/controllers/newsletters_controller.php

@@ -12 +12 @@
 class NewslettersController extends AppController{
 
-  public $helpers          = array('Ajax', 'Fck', 'Gags');
+  public $name       = 'Newsletters';
+  public $helpers    = array('Ajax', 'Fck', 'Gags');
+  public $components = array('Portal', 'Email');
   
-  public $components       = array('Portal', 'Email');
-  
-  public function beforeFiler()
+  public function beforeFilter()
   {
-    parent::beforeFilter();   
-    $this->Auth->allow(array('subscribe', 'display', 'view'));
+    parent::beforeFilter();
+    $this->Auth->allow(array('view', 'display', 'subscribe'));
   }
  
   public function subscribe()
   {
-         $this->layout = 'portal';
-         $this->Portal->statics(); // Charge Portal components aka Sidebars
+    $this->pageTitle = __('Newsletters', true);
+    $this->layout    = 'portal';
+    $this->Portal->statics(); // Charge Portal components aka Sidebars
   }
 
-  public function display($page=1)
+  public function display()
   {  
-     $this->layout = 'portal';
+    $this->pageTitle = __('Newsletters', true);
+    $this->layout = 'portal';
+    $conditions   = array('Newsletter.status'=>1);
+    $fields       = array('Newsletter.id', 'Newsletter.title', 'Newsletter.body', 'Newsletter.created', 'Newsletter.user_id');
+    $order        = 'Newsletter.id DESC';
+    $limit        = 20;
      
-     $conditions   = array("Newsletter.status"=>1);
-     $fields       = array("Newsletter.id", "Newsletter.title", "Newsletter.body", "Newsletter.created", "Newsletter.user_id");
-     $order        = "Newsletter.id DESC";
-     $limit        = 20;
-     
-     $this->set('data', $this->Newsletter->findAll($conditions, $fields, $order, $limit));
-     
-     $this->Portal->statics(); // Using Portal component
+    $this->set('data', $this->Newsletter->findAll($conditions, $fields, $order, $limit)); 
+    $this->Portal->statics(); // Using Portal component
   }
       
   public function view($id)
   {
-       $conditions = array("estado"=>1, "id"=>$id);
-       $fields     = array("id", "title", "body", "fecha", "referencia", "subject_id", "iduser");
-       $order      = "id DESC";
-       $limit      = 10;
-        
-       $this->pageTitle = 'Noticias';
-       $this->set('data', $this->Newsletter->findAll($conditions, $fields));
-        
-       $this->set('Element', $this->Portal->statics()); // Charge Portal components aka Sidebars
+   $this->pageTitle = __('Newsletter', true);
+   $conditions = array('status'=>1, 'id'=>$id);
+   $fields     = array('id', 'title', 'body', 'created');
+   $this->set('data', $this->Newsletter->find($conditions, $fields));     
+   $this->Portal->statics(); // Charge Portal components aka Sidebars
   }
 

trunk/app/locale/spa/LC_MESSAGES/default.po

@@ -4 +4 @@
 msgid  "Yes"
 msgstr "Si"
+
+msgid  "No published newsletters yet"
+msgstr "Aún no se han publicado boletines"
+
+msgid  "Subscribe to newsletter"
+msgstr "Suscríbase al boletín"
 
 msgid  "Search Results"
@@ -788 +794 @@
 msgstr "Subir"
 
+msgid  "Sent"
+msgstr "Enviado"
+
+msgid  "New newsletter"
+msgstr "Nuevo boletín"
+
 msgid  "Teacher tools"
 msgstr "Herramientas pedagógicas"

trunk/app/views/newsletters/admin_add.ctp

@@ -1 +1 @@
 <?php 
-    echo $javascript->link('myfunctions');
     echo $javascript->link('fckeditor/fckeditor'); 
 
-    echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
-    echo $html->addCrumb('Entries', '/admin/newsletters/listing'); 
-    echo $html->getCrumbs(' / '); 
+    echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
+    echo $html->addCrumb(__('Newsletters', true), '/admin/newsletters/listing'); 
+    echo $html->getCrumbs('/'); 
 
     echo $form->create('Newsletter'); 
 ?>
-
 <fieldset>
-<legend>New newsletter</legend>
+<legend><?php __('New newsletter'); ?></legend>
 
 <table style="margin:0 auto 0 auto;">
-<tr>
-   <td>
-    <?php
-      echo $form->input('Newsletter.title', array("size" => 50, "maxlength" => 50));
-    ?>
+<tr><td>
+    <?php  echo $form->input('Newsletter.title', array('size'=>50, 'maxlength' => 50, 'label'=>__('Title', true))); ?>
   </td>
-   <td>
+  <td>
     <?php 
-        echo $html->link($html->image('admin/myimages.jpg', array('alt'=>'My Images', 'title'=>'My Images')), 
+        echo $html->link($html->image('admin/myimages.jpg', array('alt'=>__('My Images', true), 'title'=>__('My Images', true))), 
                          '#', 
-                         array("onclick"=>"javascript:window.open('/admin/images/listing/set', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, false); ?></p>
+                         array("onclick"=>"javascript:window.open('/admin/images/listing/set', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, false); ?>
   </td>
-  </tr>
-  <tr><td colspan="2">
-  <?php 
-    echo $form->label('Newsletter.Body', 'Text:');
-    echo $form->textarea('Newsletter.body', array('cols'=>60, 'rows'=>17)); 
-    echo $fck->load('NewsletterBody', 'Karamelo'); 
-  ?>
-  </td>
+</tr>
+<tr><td colspan="2">
+<?php 
+  echo $form->textarea('Newsletter.body', array('cols'=>60, 'rows'=>17)); 
+  echo $fck->load('NewsletterBody', 'Karamelo'); 
+?>
+ </td>
 </tr> 
 <tr>
-  <td>
-       <?php
-            echo $form->label('Newsletter.status', 'Published:');
-            echo $form->checkbox('Newsletter.status'); 
-        ?>
-  </td>
-   <td>
-       <?php 
-            echo $form->label('Newsletter.end', 'Finish edition:' );
-            echo $form->checkbox('Newsletter.end'); 
-       ?>
-   </td>
-  </tr>
-  <tr><td colspan="2"></fieldset>
-  <?php echo $form->end('Save'); ?>
+ <td>
+  <?php
+   echo $form->label('Newsletter.status', __('Published', true));
+   echo $form->checkbox('Newsletter.status'); 
+  ?>
+</td>
+<td>
+ <?php 
+   echo $form->label('Newsletter.end', __('Finish edition', true) );
+   echo $form->checkbox('Newsletter.end'); 
+ ?>
+ </td>
+</tr>
+<tr><td colspan="2">
+  <?php echo $form->end(__('Save', true)); ?>
+</fieldset>
 </td></tr>
 </table>

trunk/app/views/newsletters/admin_listing.ctp

@@ -1 @@
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
+<?php 
+ echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
+ echo $html->getCrumbs(' / '); 
 
-<?php echo $html->getCrumbs(' / '); ?>
+ echo $html->div('title_section', __('Newsletters', true));
 
-<div class="title_section">Newsletters</div>
-
-<p>
-<?php 
-  echo $html->link($html->image('actions/new.png', array("alt"=>"Add entry", "title"=>"Add entry")), '/admin/newsletters/add', null, false, false);
+ echo $html->link($html->image('actions/new.png', array('alt'=>__('Add new', true), 'title'=>__('Add new', true))), '/admin/newsletters/add', null, false, false);
 ?>
-</p>
 <table class="tbadmin">
 <?php
-$th = array ('Edit', 'Title', 'Status', 'Delivered', 'Send', 'Delete');
+$th = array(__('Edit', true), __('Title', true), 'Status', __('Delivered', true), __('Sent', true), __('Delete', true));
 echo $html->tableHeaders($th);  
-foreach ($data as $val) {
-       $delivered = ($val['Newsletter']['delivered'] == 0) ? 'No' : 'Yes';
+foreach ($data as $val):
+       $delivered = ($val['Newsletter']['delivered'] == 0) ? 'No' : __('Yes', true);
        $tr = array (
         $gags->sendEdit($val['Newsletter']['id'], 'newsletters'),
@@ -21 +18 @@
         $gags->setStatus($val['Newsletter']['status']),
         $delivered,
-        $html->link($html->image('admin/send.gif', array("alt"=>"Send", "title"=>"Send")),
+        $html->link($html->image('admin/send.gif', array('alt'=>__('Send', true), 'title'=>__('Send', true))),
                     '/admin/newsletters/send/'.$val['Newsletter']['id'], null, null, false),
         $gags->confirmDel($val['Newsletter']['id'], 'newsletters')
@@ -28 +25 @@
     echo $html->tableCells($tr, array("class"=>"altRow", "onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='altRow'"), 
                                 array('class'=>'evenRow',"onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='evenRow'")); 
-}
+endforeach;
 ?>
 </table>
-
 <?php 
 //echo $pagination;

trunk/app/views/newsletters/display.ctp

@@ -1 +1 @@
 <?php
 
-echo $html->div('title_section', 'Newsletters');
+echo $html->div('title_portal', __('Newsletters', true));
 
-if ( count($data) == 0):
-    echo $html->div('notice', 'Newsletter not yet done');
+if ( count($data) === 0):
+    echo $html->para('notice', __('No published newsletters yet', true));
 endif;
 //die(var_dump($data));
 
- foreach ($data as $val):
+foreach ($data as $val):
       $tmp  = $html->div('news_title', $val['Newsletter']['title']);
       $tmp .= $html->div('news_date',  $val['Newsletter']['created']);
       $tmp .= $html->div('news_body',  $val['Newsletter']['body']);
-
       echo $html->div('wrapnew', $tmp);
  endforeach;
 
  if ( $session->check('Auth.User') ):
-    echo $html->para(null, $html->link('Subscribe to newsletter', '/newsletters/subscribe'));
+    echo $html->para(null, $html->link(__('Subscribe to newsletter', true), '/newsletters/subscribe'));
  endif; 
 ?>