Changeset 243

Timestamp:

03/17/09 16:04:22 (3 years ago)

Author:

aarkerio

Message:

New files

Location:

trunk

Files:

• controllers/entries_controller.php (modified) (1 diff)
• controllers/images_controller.php (modified) (2 diffs)
• views/elements/admin_menu.ctp (modified) (1 diff)
• views/entries/admin_edit.ctp (modified) (1 diff)
• views/helpers/gags.php (modified) (2 diffs)

trunk/controllers/entries_controller.php

@@ -11 +11 @@
 class EntriesController extends AppController {
  
- public $helpers       = array('Fck', 'Gags', 'Cache');
+ public $helpers       = array('Fck', 'Gags');
  
  public $components    = array('Blog', 'RequestHandler');

trunk/controllers/images_controller.php

@@ -13 +13 @@
  public  $helpers     = array('Javascript');
  public  $components  = array('Adds');
+
  private $imagesPath  = '../webroot/img/imgusers/';
  private $thumbsPath  = '../webroot/img/imgusers/thumbs/';
@@ -25 +26 @@
  /**==ADMIN METHODS==**/    
  public function admin_listing($set = null)
- {   
-  if ($set == null):
+ {
+  $this->pageTitle = 'Your Images';
+  #die(debug($set));
+  if ($set == 'pop'):
+      $this->layout    = 'pop'; # small window
+      $this->paginate['limit']  = 10;
+      $this->set('set', true);    
+  else:
       $this->layout    = 'admin';
       $this->paginate['limit'] = 30;
       $this->set('set', null);
-  else:
-      $this->layout    = 'popup';
-      $this->paginate['limit']  = 10;
-      $this->set('set', true);
   endif;
-  $this->pageTitle = 'Your Images';
   $this->paginate['conditions']  = array('Image.user_id'=>$this->Auth->user('id'));
   $this->paginate['order']  = 'Image.id DESC'; 

trunk/views/elements/admin_menu.ctp

@@ -16 +16 @@
             $html->link(__('Quick News', true), '/admin/quicks/listing'),
             $html->link(__('wIwD', true), '/admin/waydings/listing'),
-                $html->link(__('Pages', true), '/admin/lessons/listing') => array(
+                $html->link(__('Pages', true), '/admin/pages/sections') => array(
                                                                            $html->link(__('New Page', true), '/admin/pages/edit')
                                                                           ),

trunk/views/entries/admin_edit.ctp

@@ -28 +28 @@
   ?>
   </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 $gags->setImages(); ?>
   </td>
 </tr>

trunk/views/helpers/gags.php

@@ -21 +21 @@
  }
 
-
  # the hidden animated gif in ajax stuff, fucking genious ha?
  public function imgLoad($divname='loading')
@@ -45 +44 @@
    public function setImages() {
       $img  = '<p style="text-align:right;width:150px;float:right">';
-      $img .= $this->Html->link($this->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, null,false);
+      $img .= $this->Html->link($this->Html->image('admin/myimages.jpg', array('alt'=>'My Images', "title"=>'My Images')), '#', 
+              array('onclick'=>"javascript:window.open('/admin/images/listing/pop/', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, null,false);
       $img .= '</p>';
    return $img;