Changeset 698 for trunk/app/views

Timestamp:

08/06/08 12:32:50 (4 months ago)

Author:

aarkerio

Message:

Validate arrayas

Location:

trunk/app/views

Files:

• catfaqs/admin_edit.ctp (modified) (2 diffs)
• catfaqs/admin_listing.ctp (modified) (2 diffs)
• catglossaries/admin_edit.ctp (modified) (2 diffs)
• catglossaries/admin_items.ctp (modified) (2 diffs)
• catglossaries/admin_listing.ctp (modified) (1 diff)
• glossaries/admin_add.ctp (deleted)
• glossaries/new.ctp (modified) (1 diff)
• lessons/admin_edit.ctp (modified) (1 diff)

trunk/app/views/catfaqs/admin_edit.ctp

@@ -1 +1 @@
 <?php 
- echo $html->addCrumb('Control Tools', '/admin/entries/start');  
+ echo $html->addCrumb('Control Panel', '/admin/entries/start');  
  echo $html->addCrumb('FAQs', '/admin/catfaqs/listing'); 
  echo $html->getCrumbs(' / '); 
@@ -8 +8 @@
 ?>
 <fieldset>
-  <legend>Edit Item</legend>
+  <legend><?php __('Edit item');?> </legend>
   <?php 
-    echo $form->input('Catfaq.title', array("size" => 30, "maxlength" => 90));
-     
-    echo $form->label('Catfaq.description', 'Description:');
+    echo $form->input('Catfaq.title', array('size'=>30,'maxlength'=> 90, 'label'=>__('Title', true)));
+    
+    echo $form->label('Catfaq.description', __('Description', true));
     echo $form->textarea('Catfaq.description', array("cols" => 40, "row" => 20));
   ?>
   <div style="clear:both"></div>
   <br />
-  <?php echo $form->end('Save'); ?>
+  <?php echo $form->end(__('Save', true)); ?>
 </fieldset>

trunk/app/views/catfaqs/admin_listing.ctp

@@ -1 @@
-<script type="text/javascript">
-   window.onload = timedMsg;
-</script>
 <?php 
-$session->flash(); 
-echo $html->addCrumb('Control Tools', '/admin/entries/start');
+echo $html->addCrumb('Control Panel', '/admin/entries/start');
 echo $html->addCrumb('FAQs', '/admin/catfaqs/listing'); 
 echo $html->getCrumbs(' / '); 
 
-echo $html->div('title_section', __('FAQ categories', true));
+echo $html->div('title_section', __('Categories', true));
 
 echo $ajax->div('loading', array('style'=>'display:none')). $html->image("static/loading.gif", array("alt"=>"Loading")).$ajax->divEnd('loading');
     
-echo  $html->para(null, $ajax->link($html->image('actions/new.png', array("alt"=>"Add new category", "title"=>"Add new category")),                   '/admin/catfaqs/add', 
+echo  $html->para(null, $ajax->link($html->image('actions/new.png',array('alt'=>__('Add new', true),'title'=>__('Add new', true))), '/admin/catfaqs/add', 
      array("update" => "updater","loading"=>"Element.show('loading');Element.hide('updater');", "complete"=>"Element.hide('loading');Effect.Appear('updater')"), 
                 null, false));
@@ -18 +14 @@
 echo $ajax->div('updater') . $ajax->divEnd('updater');
 
-//exit(print_r($data));
 foreach ($data as $val):
  $tmp  = $html->div('butonright', $gags->sendEdit($val['Catfaq']['id'], 'catfaqs'));

trunk/app/views/catglossaries/admin_edit.ctp

@@ -1 +1 @@
 <?php 
    echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
-   echo $html->addCrumb('Glossaries', '/admin/catglossaries/listing'); 
+   echo $html->addCrumb(__('Glossaries', true), '/admin/catglossaries/listing'); 
    echo $html->getCrumbs(' / '); 
 
@@ -8 +8 @@
 ?>
 <fieldset>
-  <legend>Edit Category</legend>
+  <legend><?php __('Edit category'); ?></legend>
   <?php
-    echo $form->input('Catglossary.title', array("size" => 30, "maxlength" => 90));
+    echo $form->input('Catglossary.title', array('size' => 30, 'maxlength' => 90, 'label'=>__('Title', true)));
      
-    echo $form->label('Catglossary.description', 'Description:' );
+    echo $form->label('Catglossary.description', __('Description', true));
     echo $form->textarea('Catglossary.description', array("cols" => 40, "row" => 20));
   
-    echo $form->label( 'Catglossary.status', 'Enabled:' );
+    echo $form->label( 'Catglossary.status', __('Published', true));
     echo $form->checkbox('Catglossary.status', array('status'=>1)); 
-?>
-   
+?>   
   <br />
-  <?php echo $form->end('Save'); ?>
+  <?php echo $form->end(__('Save', true)); ?>
 </fieldset>

trunk/app/views/catglossaries/admin_items.ctp

@@ -1 +1 @@
 <?php 
-  //die(debug($data)); 
-?> 
-<script type="text/javascript">
-   window.onload = timedMsg;
-</script>
-<?php 
-$session->flash();
-
-echo $html->addCrumb('Control Tools', '/admin/entries/start');
-echo $html->addCrumb('Glossaries', '/admin/catglossaries/listing'); 
+echo $html->addCrumb('Control Panel', '/admin/entries/start');
+echo $html->addCrumb(__('Glossaries', true), '/admin/catglossaries/listing'); 
 echo $html->getCrumbs(' / '); 
 
-echo $html->div('control-panel-title', $data['Catglossary']['title']);
+echo $html->div('title_section', $data['Catglossary']['title']);
 
  if ( count($data['Glossary']) < 1):
-    echo '<p><b>No items yet</b></p>';
+    echo '<p><b>'.__('No items yet', true).'</b></p>';
  endif;
  
- echo '<div id="loading" style="display: none;">';
-                  echo $html->image("static/loading.gif", array("alt"=>"Loading"));
- echo '</div>';
+ echo '<div id="loading" style="display: none;">'.$html->image("static/loading.gif", array("alt"=>"Loading")). '</div>';
     
- echo  $ajax->link($html->image('actions/new.png', array("alt"=>"Add new category", "title"=>"Add new category")), 
+ echo  $ajax->link($html->image('actions/new.png', array('alt'=>__('Add new', true), 'title'=>__('Add new', true))), 
           '/admin/glossaries/new/'.$data['Catglossary']['id'], 
       array("update" => "updater",
@@ -40 +30 @@
    echo '<p style="margin-left:15px;">'. $val['definition']  . '</p>';
     
-   echo $form->create('Glossary', array('action'=>'delete', 'onsubmit'=>'return confirm(\'Are you sure to delete this item?\')'));
+   echo $form->create('Glossary', array('action'=>'delete', 'onsubmit'=>"return confirm('".__('Are you sure to want to delete this?', true)."')"));
    echo $form->hidden('Glossary.id', array('value'=>$val['id']));
    echo $form->hidden('Glossary.catglossary_id', array('value'=>$data['Catglossary']['id'])); 
-   echo $form->end('Delete'); 
+   echo $form->end(__('Delete', true)); 
    
    echo '</div>';

trunk/app/views/catglossaries/admin_listing.ctp

@@ -3 +3 @@
  echo $html->getCrumbs(' / ');
 
- echo $html->div('title_section', __('Glossaries categories', true));
+ echo $html->div('title_section', __('Categories', true));
 
-echo $html->link($html->image('actions/new.png', array("alt"=>"Add new category", "title"=>"Add new category")), '/admin/catglossaries/add', null, false, false);
+echo $html->link($html->image('actions/new.png', array('alt'=>__('Add new', true), 'title'=>__('Add new', true))), '/admin/catglossaries/add', null, false, false);
 
 foreach ($data as $val):
-
    echo '<div style="padding:6px;margin:5px;border:1px dotted gray;">';
    echo $gags->sendEdit($val['Catglossary']['id'], 'catglossaries') . '<br />';
          
-   echo $html->link($val['Catglossary']['title'], '/admin/catglossaries/items/'.$val['Catglossary']['id'], array("class"=>"largelink")) . '<br />'; 
+   echo $html->link($val['Catglossary']['title'],'/admin/catglossaries/items/'.$val['Catglossary']['id'], array('class'=>'largelink', 'title'=>__('Click to add glossary in this category', true))) . '<br />'; 
    echo $val['Catglossary']['description']  . '<br />';
             
-   //echo count($val['Glossary'])  . ' <b>items</b><br />';
-   echo '<p style="font-size:7pt">Status: '. $gags->setStatus($val['Catglossary']['status']) . '</p>';
+   echo $html->para(null, 'Status: '. $html->link($gags->setStatus($val['Catglossary']['status']), '/admin/catglossaries/change/'.$val['Catglossary']['status'].'/'.$val['Catglossary']['id']), aa('style', 'font-size:7pt'));
    echo $gags->confirmDel($val['Catglossary']['id'], 'catglossaries');
    echo '</div>';

trunk/app/views/glossaries/new.ctp

@@ -4 +4 @@
 ?>
 <fieldset>
-  <legend>Add Item</legend>
+  <legend><?php __('New item'); ?></legend>
   <?php 
     echo $form->input('Glossary.item', array("size" => 30, "maxlength" => 90));
     echo $form->error('Glossary.item', 'A FAQ item is required.');
      
-    echo $form->label('Glossary.definition', 'Definition:' );
-    echo $form->textarea('Glossary.definition', array("cols" => 60, "rows" => 6));
+    echo $form->label('Glossary.definition', __('Definition', true) );
+    echo $form->textarea('Glossary.definition', array('cols' => 60, 'rows' => 6));
     echo $form->error('Glossary.definition', 'A category definition is required.');
+    echo $form->end(__('Save', true)); 
   ?>
-  <br /><br />
-  <div style="clear:both"></div>
-  <br /></fieldset>
-  <?php echo $form->end('Save'); ?>
+</fieldset>

trunk/app/views/lessons/admin_edit.ctp

@@ -17 +17 @@
   </td>
   <td>
-  <?php echo $html->link($html->image('admin/myimages.jpg', array("alt"=>"My Images", "title"=>"My Images")), '#', array("onclick"=>"javascript:window.open('/admin/images/listing/set', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, false) ?>
+  <?php 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) ?>
 </td>
 <td>