Changeset 737 for trunk

Timestamp:

08/25/08 16:39:15 (3 months ago)

Author:

aarkerio

Message:

Little bugs fixed

Location:

trunk/app

Files:

• controllers/ecourses_controller.php (modified) (5 diffs)
• models/ecourse.php (modified) (2 diffs)
• views/ecourses/admin_add.ctp (modified) (1 diff)
• views/ecourses/admin_edit.ctp (modified) (1 diff)
• views/images/admin_listing.ctp (modified) (4 diffs)
• views/quotes/admin_listing.ctp (modified) (1 diff)

trunk/app/controllers/ecourses_controller.php

@@ -73 +73 @@
              $this->msgFlash(__('Status modified', true), '/admin/ecourses/listing/');
     endif;
-  }
-  public function admin_add() 
-  {   
-    $this->layout    = 'admin'; 
+ }
+ public function admin_add() 
+ {   
+  $this->layout    = 'admin'; 
    
-    $this->set('subjects', Set::combine($this->Ecourse->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
+  $this->set('subjects', Set::combine($this->Ecourse->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
     
-    $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));
-    
-    if (!empty($this->data['Ecourse'])):
+  $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));
+   
+  if (!empty($this->data['Ecourse'])):
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->clean($this->data["Ecourse"]);
+        $this->Sanitize->clean($this->data['Ecourse']);
         
         $this->data['Ecourse']['user_id'] = $this->Auth->user('id');
@@ -91 +91 @@
         $this->Ecourse->create();
         
-        if ($this->Ecourse->save($this->data['Ecourse'])):
-                $this->msgFlash('Course saved', '/admin/ecourses/edit/'.$this->Ecourse->getLastInsertID());
+        if ($this->Ecourse->save($this->data)):
+                $this->msgFlash(__('Data saved', true), '/admin/ecourses/edit/'.$this->Ecourse->getLastInsertID());
     endif;
    endif;
@@ -106 +106 @@
     
     if ( empty($this->data['Ecourse']) ):
-        
        $this->data = $this->Ecourse->read(null, $ecourse_id);
-      
     else:
       
@@ -115 +113 @@
         $this->Sanitize->html($this->data['Ecourse']['description']);
         
-        if ($this->Ecourse->save($this->data['Ecourse'])):
-             $this->msgFlash('eCourse saved', '/admin/ecourses/edit/'.$this->data["Ecourse"]['id']);
+        if ($this->Ecourse->save($this->data)):
+             $this->msgFlash(__('Data saved', true), '/admin/ecourses/edit/'.$this->data["Ecourse"]['id']);
     endif;
     endif;
@@ -123 +121 @@
  public function admin_delete($id)
  {
-    if ( $this->Ecourse->del($id))
-    {
-        $this->msgFlash('Course deleted', '/admin/ecourses/listing');
-    }
+  if ( $this->Ecourse->del($id)):
+      $this->msgFlash(__('Data removed', true), '/admin/ecourses/listing');
+  endif;
  } 
 }

trunk/app/models/ecourse.php

@@ -41 +41 @@
                 'rule' => array('minLength', 4),
                 'required' => true,
-                'allowEmpty' => false,
+        'allowEmpty' => false,
                 'message' => 'Mimimum 4 characters long in title'
                 )
@@ -47 +47 @@
         'description' => array(
             'rule' => array('minLength', 20),
-            'allowEmpty' => false,
+        'allowEmpty' => false,
             'message' => 'Mimimum 8 characters long'
         ),

trunk/app/views/ecourses/admin_add.ctp

@@ -22 +22 @@
 <tr><td colspan="3">
  <?php 
-    echo $form->label('Ecourse.description', __('Description', true));
-    echo $form->textarea('Ecourse.description', array('cols'=>40, 'rows'=>4));
-    echo $fck->load('EcourseDescription', 'Karamelo');
+  echo $form->label('Ecourse.description', __('Description', true));
+  echo $form->error('Ecourse.description');
+  echo $form->textarea('Ecourse.description', array('cols'=>40, 'rows'=>4));
+  echo $fck->load('EcourseDescription', 'Karamelo');
  ?>
 </td></tr>
 <tr><td>
 <?php
- e($form->input('Ecourse.code', array("size" => 12, "maxlenght" => 12, 'title'=>' max. 12 characters. Example: ROM2121')));
+ e($form->input('Ecourse.code', array('size'=>12, 'maxlenght'=>12, 'title'=>'max. 12 characters. Example: ROM2121')));
 ?>
 </td><td colspan="2">
   <?php
      echo $form->label('Ecourse.status', __('Enabled', true));
-     echo $form->checkbox('Ecourse.status', array('value'=>1, 'title'=>'Enabled course')); 
-  ?></fieldset>
+     echo $form->checkbox('Ecourse.status', array('value'=>1, 'title'=>__('Enabled', true))); 
+  ?>
 </td></tr>
-
 <tr><td colspan="3">
-  <?php echo $form->end(__('Save', true)); ?>
+<?php echo $form->end(__('Save', true)); ?>
 </td></tr>
 </table>
-
+</fieldset>
 <script type="text/javascript">
 /* <![CDATA[ */

trunk/app/views/ecourses/admin_edit.ctp

@@ -45 +45 @@
   </td></tr>
   <tr><td colspan="3">
- <?php echo $form->end(__('Save', true)); ?>
- </fieldset>
-</td></tr>
+   <?php echo $form->end(__('Save', true)); ?>
+ </td></tr>
 </table>
+</fieldset>
 <script type="text/javascript">
 /* <![CDATA[ */

trunk/app/views/images/admin_listing.ctp

@@ -2 +2 @@
 //popup or full window ?
 if ( $set == null ):
-    echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
-    echo $html->addCrumb(__('Images', true), '#'); 
+    echo $html->addCrumb('Control Panel', '/admin/entries/start');
     echo $html->getCrumbs(' / ');
     echo $html->div('title_section', __('Images', true));
@@ -21 +20 @@
   <fieldset>
      <legend><?php echo __('Upload Image'); ?></legend>
-     
      <?php echo $form->label('Image.file', __('File', true));
            echo $form->file('Image.file'); 
-           echo $form->error('Image.file', 'File is required.');
+           echo $form->error('Image.file');
            echo $form->end(__('Upload', true)); 
       ?>
@@ -35 +33 @@
 $counter = 0; // five images in one row
 
-foreach ($data as $val) 
-{  
-   $counter++;
-   
-   $image_stats = getimagesize('img/imgusers/'.$val['Image']['file']);
-   
-   if ( $counter == 1 ): // open new row
+foreach ($data as $val):
+ $counter++;
+ $image_stats = getimagesize('img/imgusers/'.$val['Image']['file']);
+ if ( $counter == 1 ): // open new row
         echo "<tr>";
-   endif;
+ endif;
 ?>
 <td style="text-align:center;padding:3px;vertical-align:top;"><span style="font-size:8px;"><?php echo '/img/imgusers/'.$val['Image']['file']; ?></span><br /><br />
@@ -68 +63 @@
         $counter = 0; //reset counter
     endif;
-  }
+ endforeach;
     
  if ( $counter < 5 ):
        $colspan = (5 - $counter);
-       print '<td colspan="'.$colspan.'">&nbsp;</td></tr>';  // fill the row with column
+       print '<td colspan="'.$colspan.'">&nbsp;</td></tr>';  // fill the row with column(s)
       
   endif;

trunk/app/views/quotes/admin_listing.ctp

@@ -24 +24 @@
 <table style="width:100%">
 <?php
-$th = array ('Edit', 'Quote', 'Author', 'Delete');
+$th = array (__('Edit', true), __('Quote', true), __('Author', true), __('Delete', true));
+
 echo $html->tableHeaders($th);