Changeset 458

Timestamp:

06/09/10 11:51:53 (20 months ago)

Author:

aarkerio

Message:

Little improvements

Location:

trunk

Files:

• config/core.php (modified) (1 diff)
• controllers/downloads_controller.php (modified) (3 diffs)
• models/download.php (modified) (3 diffs)
• views/downloads/admin_edit.ctp (modified) (3 diffs)
• views/downloads/admin_listing.ctp (modified) (2 diffs)
• views/elements/themes_top.ctp (modified) (1 diff)
• views/entries/admin_edit.ctp (modified) (1 diff)
• views/layouts/portal.ctp (modified) (1 diff)
• webroot/css/styles.css (modified) (3 diffs)

trunk/config/core.php

@@ -141 +141 @@
  * Actual value depends on 'Security.level' setting.
  */
-  Configure::write('Session.timeout', '3600');
+  Configure::write('Session.timeout', '360000');
 
 /**

trunk/controllers/downloads_controller.php

@@ -94 +94 @@
  *  @return void
  */
- public function admin_edit($download_id = null)
+ public function admin_edit($download_id = Null)
  {
   $this->layout    = 'admin';   
@@ -100 +100 @@
 
   if (!empty($this->data['Download'])):
-    if ( !isset($this->data['Download']['id']) ):  // new download
-           $this->data['Download']['user_id'] = (int) $this->Auth->user('id');
-    endif;
-    $this->data['Download']['title']   = Sanitize::paranoid($this->data['Download']['title'], $this->para_allowed);
+      if ( !isset($this->data['Download']['id']) ):  // new download
+          $this->data['Download']['user_id'] = (int) $this->Auth->user('id');
+      endif;
+      #die(debug($this->data));
+      $this->data['Download']['title']   = Sanitize::paranoid($this->data['Download']['title'], $this->para_allowed);
           
-    if ($this->Download->save($this->data)):
-          if ($this->data['Download']['end'] == 0 && !isset($this->data['Download']['id'])):  // INSERT INTO
-                  $id = (int) $this->Download->getLastInsertID();
-                  $return = '/admin/downloads/edit/'.$id;    
-              elseif ($this->data['Download']['end'] == 0 && isset($this->data['Download']['id'])):  // UPDATE 
-                  $return = '/admin/downloads/edit/'.$this->data['Download']['id'];
+      if ($this->Download->save($this->data)):
+          if ($this->data['Download']['end'] == 0 && !isset($this->data['Download']['id'])):  # INSERT INTO
+              $id = (int) $this->Download->getLastInsertID();
+              $return = '/admin/downloads/edit/'.$id;    
+              elseif ($this->data['Download']['end'] == 0 && isset($this->data['Download']['id'])):  # UPDATE 
+              $return = '/admin/downloads/edit/'.$this->data['Download']['id'];
               elseif ($this->data['Download']['end'] == 1 ):
                   $return = '/admin/downloads/listing';
               endif;
-    $this->msgFlash(__('Data saved', True),$return);
-    endif;
+          $this->msgFlash(__('Data saved', True),$return);
+          return True;
+      else:
+          die(debug($this->Download->validationErrors));
+      endif;
   elseif($download_id != null && intval($download_id)):  
-        $this->data = $this->Download->read(null, $download_id); 
+      $this->data = $this->Download->read(null, $download_id); 
   endif;
  }
@@ -128 +132 @@
  public function admin_delete($download_id)
  {
-   if ( $this->Download->delete($download_id) ):
-       $this->msgFlash(__('Data removed', True),'/admin/downloads/listing');
-   endif;
+  if ( $this->Download->delete($download_id) ):
+      $msg = __('Data removed', True);
+  else:
+      $msg = __('Data NOT removed', True);
+  endif;
+  $this->msgFlash($msg,'/admin/downloads/listing');
  }
 }
-# ? >
+# ? > EOF

trunk/models/download.php

@@ -12 +12 @@
 class Download extends AppModel
 {
-    public $name      = 'Download';
+ public $name      = 'Download';
     
-    public $belongsTo  = array(
+ public $belongsTo  = array(
                             'Catdownload' =>
                                            array('className'  => 'Catdownload',
@@ -28 +28 @@
                        );
     
-    public $validate = array(
-                             'user_id' => array('rule'    => array('minLength', 4),
+ public $validate = array(
+                             'user_id' => array('rule'    => 'numeric',
                                              'message'    => 'Must be at least four characters long',
                                              'allowEmpty' => False,
@@ -45 +45 @@
 }
 
-# ? >
+# ? > EOF

trunk/views/downloads/admin_edit.ctp

@@ -1 +1 @@
 <?php 
-echo $this->Html->script('fckeditor/fckeditor'); 
+echo $this->Html->script('ckeditor/ckeditor');
+
 $this->Html->addCrumb('Control Tools', '/admin/entries/start'); 
 $this->Html->addCrumb('Downloads', '/admin/downloads/listing'); 
@@ -19 +20 @@
 <table>
 <tr>
-  <td><?php echo $this->Form->input('Download.title', array('size' => 40, 'maxlength' => 80)); ?></td>
-  <td>
-  <?php echo $this->Form->select('Download.catdownload_id', array('options'=>$catdownloads));   ?>
-  </td>
-    <td>
-     <?php echo $this->Form->input('Download.url', array('size' => 40, 'maxlength' => 200)); ?>
-  </td>
+  <td><?php echo $this->Form->input('Download.title', array('size' => 40, 'maxlength' => 80));   ?></td>
+  <td><?php echo $this->Form->input('Download.catdownload_id', array('options'=>$catdownloads)); ?></td>
+  <td><?php echo $this->Form->input('Download.url', array('size' => 40, 'maxlength' => 200));    ?></td>
 </tr>
 <tr>
 <td colspan="3">
  <?php 
-  echo $this->Form->input('Download.description', array('cols'=>80, 'rows'=>45)); 
+  echo $this->Form->input('Download.description', array('cols'=>80, 'rows'=>25, 'label'=>False)); 
   echo $ck->load('DownloadDescription', 'Karamelo');
   ?>
@@ -36 +33 @@
 </tr>
 <tr>
-<td>
- <?php echo $this->Form->input('Download.end', array('input'=>'checkbox', 'value' => '1')); ?>
-</td>
+<td> <?php echo $this->Form->input('Download.end', array('type'=>'checkbox', 'value' => '1')); ?></td>
 <td colspan="2">
   <?php echo $this->Form->end(__('Save', True)); ?>
 </fieldset>
 </td>
-
 </tr>
 </table>

trunk/views/downloads/admin_listing.ctp

@@ -1 +1 @@
 <?php 
+$this->set('title_for_layout', 'Downloads');
+
 echo $this->Html->div('title_section', 'Downloads');
     
@@ -13 +15 @@
         $val['Download']['title'],
         $gags->confirmDel($val['Download']['id'], 'downloads')
-        );
-       
+        );       
     echo $this->Html->tableCells($tr,  $gags->aRow, $gags->eRow);
 endforeach;

trunk/views/elements/themes_top.ctp

@@ -3 +3 @@
 if ($this->Session->read('Auth.User.username')): # User is logged in
     $list = array($this->Html->link('MyMONO', '/admin/entries/start') => array(
-                                                               $this->Html->link(__('New blog Entry', true), '/admin/entries/edit'),
-                                               $this->Html->link(__('Submit Quick', true), '/admin/quicks/listing'),
-                                   $this->Html->link(__('Submit New', true), '/admin/news/edit'),
-                                   $this->Html->link(__('Cosas pendientes', true), '/admin/todos/listing'),
-                                   $this->Html->link(__('Images', true), '/admin/images/listing'),
-                                   $this->Html->link(__('Shares', true), '/admin/shares/listing'),
-                                   $this->Html->link(__('Logout', true), '/users/logout')
+                                                               $this->Html->link(__('New blog Entry', True), '/admin/entries/edit'),
+                                               $this->Html->link(__('Submit Quick', True), '/admin/quicks/listing'),
+                                   $this->Html->link(__('Submit New', True), '/admin/news/edit'),
+                                   $this->Html->link(__('Pending stuff', True), '/admin/todos/listing'),
+                                   $this->Html->link(__('Images', True), '/admin/images/listing'),
+                                   $this->Html->link(__('Shares', True), '/admin/shares/listing'),
+                                   $this->Html->link(__('Logout', True), '/users/logout')
                                                                           ));
 else:

trunk/views/entries/admin_edit.ctp

@@ -46 +46 @@
 <?php 
       echo $this->Form->input('Entry.body', array('cols'=>90, 'rows'=>35, 'label'=>False));
-   echo $ck->load('EntryBody', 'Karamelo'); 
+      echo $ck->load('EntryBody', 'Karamelo');
 ?>
 </td>

trunk/views/layouts/portal.ctp

@@ -94 +94 @@
   echo $this->element('waydings').'<br />';
   echo $this->element('adsense');
-  echo $this->element('twitter');
-  #echo  $gags->tla_ads();   // text links ad
+  #echo $this->element('twitter'); # is somebody suing this ?
+  #echo  $gags->tla_ads();   # text links ad
   echo  $this->Html->div('menumain2', $this->Html->link(
                     $this->Html->image('static/banner_karamelo.jpg',array('alt'=>'e-Learning Solution', 'title'=>'e-Learning solution', 

trunk/webroot/css/styles.css

@@ -231 +231 @@
 }
 
+p { margin: 8px }
+
 #container {
     text-align:center;  /* IE sucks*/
@@ -246 +248 @@
   padding:0;
 }
-
 
 
@@ -2204 +2205 @@
 .divbody{padding:4px; }
 
-.divbody p{margin:12px 0;text-align:justify;}
-
-#quicks{
-/* background-color: #DDF1FF;*/
-}
-
- /* .quicks{   border:2px solid blue;}
-
+.divbody p {margin:12px 0;text-align:justify;padding:3px;}
+
+/* #quicks{
+ background-color: #DDF1FF;
+}*/
+
+/* .quicks{   border:2px solid blue;} */
+