Changeset 803 for trunk/app

Timestamp:

10/09/08 22:07:55 (8 weeks ago)

Author:

aarkerio

Message:

Update fck edity

Location:

trunk/app

Files:

• config/sql/postgresql/wikis.sql (modified) (1 diff)
• controllers/ecourses_controller.php (modified) (1 diff)
• views/ecourses/admin_listing.ctp (modified) (2 diffs)
• views/helps/admin_edit.ctp (modified) (2 diffs)
• webroot/js/fckeditor/editor/plugins/youtube/readme.txt (added)
• webroot/js/fckeditor/editor/plugins/youtube/release-notes.txt (added)
• webroot/js/fckeditor/editor/plugins/youtube/youtube.html (added)
• webroot/js/fckeditor/editor/plugins/youtube/youtube.js (added)

trunk/app/config/sql/postgresql/wikis.sql

@@ -6 +6 @@
   status smallint NOT NULL DEFAULT 0,
   modified timestamp NOT NULL default now(),
-  user_id int NOT NULL REFERENCES users(id),
+  user_id int NOT NULL REFERENCES users(id) ON DELETE CASCADE,
   subject_id smallint NOT NULL REFERENCES subjects(id),
-  vclassroom_id int NOT NULL REFERENCES vclassrooms(id),
+  vclassroom_id int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE,
   ip varchar(15) NOT NULL,
   revision smallint NOT NULL,

trunk/app/controllers/ecourses_controller.php

@@ -26 +26 @@
  public function admin_listing($page=1)
  {
-        $this->layout = 'admin';
+   $this->layout = 'admin';
         
-        $conditions   =  array("user_id"=>$this->Auth->user('id'));
-        $fields       =  array('id', 'title', 'status', 'description');
-        $order        =  "Ecourse.id DESC";
-        $limit        =  10;
+   $conditions   =  array('user_id'=>$this->Auth->user('id'));
+   $fields       =  array('id', 'title', 'status', 'description');
+   $order        =  'Ecourse.title';
+   $limit        =  20;
         
-        $this->set('data', $this->Ecourse->findAll($conditions, $fields));
+   $this->set('data', $this->Ecourse->findAll($conditions, $fields, $order, $limit));
  }
 
  public function admin_vclassrooms($ecourse_id, $historic = null)
  {
-        $this->layout = 'admin';
+  $this->layout = 'admin';
         
-        $lmt        = 25; // limit news
+  $lmt        = 25; // limit news
         
-        $conditions   =  array("Ecourse.user_id"=>$this->Auth->user('id'), "Ecourse.id"=>$ecourse_id);
+  $conditions   =  array("Ecourse.user_id"=>$this->Auth->user('id'), "Ecourse.id"=>$ecourse_id);
         
-    if ( $historic === 'historic' ):
-          $this->Ecourse->filed(); //show filed classrooms
-          
-          $this->set('historic', true);
-    endif;
+  if ( $historic === 'historic' ):
+     $this->Ecourse->filed(); //show filed classrooms       
+     $this->set('historic', true);
+  endif;
         
-        $order        =  "Ecourse.id DESC";
+  $order        =  'Ecourse.title DESC';
         
-        $this->set('data', $this->Ecourse->find($conditions));
+   $this->set('data', $this->Ecourse->find($conditions));
   }
   

trunk/app/views/ecourses/admin_listing.ctp

@@ -10 +10 @@
 
 foreach ($data as $val):
-      $tmp  = $html->div('butonright', $gags->sendEdit($val['Ecourse']['id'], 'ecourses'));
-      $tmp .= $html->link($val['Ecourse']['title'], '/admin/ecourses/vclassrooms/'.$val['Ecourse']['id']);
-      $tmp .= $ajax->link($html->image("static/arrow_down.png", array('alt'=>__('View details', true), 'title'=>__('View details', true))), '/admin/ecourses/details/'.$val['Ecourse']['id'], array('update'  => 'qn'.$val['Ecourse']['id'],
+      $tmp  = $html->div(null,$gags->sendEdit($val['Ecourse']['id'], 'ecourses'), array('style'=>'width:100px;float:right;'));
+      $tmp .= $html->div(null, $gags->confirmDel($val['Ecourse']['id'], 'ecourses'), array('style'=>'width:100px;float:right;'));
+      $tmp .= $html->link($val['Ecourse']['title'], '/admin/ecourses/vclassrooms/'.$val['Ecourse']['id'], array('style'=>'font-size:14pt;text-decoration:none;font-weight:bold;'));
+      $tmp .= $ajax->link($html->image('static/arrow_down.png', array('alt'=>__('View eCourse details', true), 'title'=>__('View eCourse details', true))), '/admin/ecourses/details/'.$val['Ecourse']['id'], array('update'  => 'qn'.$val['Ecourse']['id'],
             "loading" =>"Element.show('loading');",
             "complete"=>"Element.hide('loading');Effect.Appear('qn".$val['Ecourse']['id']."')"),
@@ -18 +19 @@
              false
              );
-      $tmp .= $ajax->div('qn'.$val['Ecourse']['id']).$ajax->divEnd('qn'.$val['Ecourse']['id']);
-      $tmp .= $html->div('butonright', $gags->confirmDel($val['Ecourse']['id'], 'ecourses'));
+      $tmp .= $ajax->div('qn'.$val['Ecourse']['id'], array('style'=>'margin-top:15px')).$ajax->divEnd('qn'.$val['Ecourse']['id']);
       echo $html->div('grayblock', $tmp, aa('style', 'vertical-align:top;'));
 endforeach;

trunk/app/views/helps/admin_edit.ctp

@@ -1 +1 @@
 <?php 
-//echo $javascript->link('fckeditor/fckeditor'); 
+   echo $javascript->link('fckeditor/fckeditor'); 
  
    echo $html->addCrumb('Control Panel', '/admin/entries/start');
@@ -36 +36 @@
      echo $form->label('Help.help', 'Help:');
      echo $form->textarea('Help.help', array('cols'=>100, 'rows'=>25)); 
-     //echo $fck->load('HelpHelp', 'Karamelo', 700, 600); 
+     echo $fck->load('HelpHelp', 'Karamelo'); 
    ?> 
 </td></tr>