Changeset 809 for trunk/app/views

Timestamp:

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

Author:

aarkerio

Message:

Little changes

Location:

trunk/app/views/newsletters

Files:

• admin_add.ctp (modified) (1 diff)
• admin_listing.ctp (modified) (3 diffs)
• display.ctp (modified) (1 diff)

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; 
 ?>