Changeset 412

Timestamp:

04/18/08 20:25:00 (8 months ago)

Author:

aarkerio

Message:

Discussions fixed

Location:

trunk/app

Files:

• controllers/subjects_controller.php (modified) (6 diffs)
• controllers/users_controller.php (modified) (1 diff)
• views/entries/admin_listing.ctp (modified) (1 diff)
• views/subjects/admin_add.ctp (modified) (1 diff)
• views/subjects/admin_listing.ctp (modified) (1 diff)

trunk/app/controllers/subjects_controller.php

@@ -10 +10 @@
 class SubjectsController extends AppController
 {  
-   public $helpers       = array('Ajax');
+ public $helpers       = array('Ajax', 'Gags');
    
-   public $components    = array('Portal');
+ public $components    = array('Portal');
    
-   public function isAuthorized()
-   {
+ public function beforeFilter() 
+ {
+    $this->Auth->allow(array('display', 'view','show'));
+    parent::beforeFilter();
+ }
+
+ public function isAuthorized()
+ {
        if (isset($this->params[Configure::read('Routing.admin')]))
        {
@@ -24 +30 @@
        }
    return true;
-   }
+ }
                                                             
-   public function display()
-   {  
+ public function display()
+ {  
       $this->layout    = 'ajax';
       
@@ -42 +48 @@
       $this->render('qs', 'ajax');
       
-   }
+ }
    
-   public function view($code)
-   {  
+ public function view($code)
+ {  
       $this->layout    = 'portal';
      
@@ -55 +61 @@
       
       $this->set('Element', $this->Portal->statics()); // Charge Portal components aka Sidebars
-   }
+ }
    
-   public function show($subject_id)
-    {   
+ public function show($subject_id)
+ {   
         $this->pageTitle = 'Karamelo :: Subject';
         $this->layout    = 'default'; //$this->Blog->field;
@@ -70 +76 @@
         
         $this->set('data', $this->Subject->findAll($conditions, $fields, $order));
-        
-    }
+  }
    
-   /** ==== ADMIN METHODS ==== */
+  /** ==== ADMIN METHODS ==== */
    
-   public function admin_listing()
-   {
+  public function admin_listing()
+  {
       $this->layout    = 'admin';
       $this->pageTitle = 'Subjects';
@@ -82 +87 @@
       $conditions = null;
       $fields     = array("id", "title", "code");
-      $order      = "title DESC";
+      $order      = "title ASC";
       
       $this->set('data', $this->Subject->findAll($conditions, $fields, $order));

trunk/app/controllers/users_controller.php

@@ -22 +22 @@
     parent::beforeFilter();
  }
- 
+  
  public function isAuthorized() 
  {      

trunk/app/views/entries/admin_listing.ctp

@@ -2 +2 @@
    window.onload = timedMsg;
 </script>
-<?php $session->flash(); ?>
+<?php 
 
-<?php 
- echo $html->addCrumb('Control Tools', '/admin/entries/start');
- echo $html->getCrumbs(' / '); 
+ $session->flash(); 
+ 
+echo $html->addCrumb('Control Tools', '/admin/entries/start');
+echo $html->getCrumbs(' / '); 
+
+echo $html->div('title_section', 'Entries'); 
+
+echo $html>para($html->link($html->image('actions/new.png', array("alt"=>"Add entry", "title"=>"Add entry")), '/admin/entries/add', null, false, false) . $html->link($html->image('static/forum.gif', array("alt"=>"See comments", "title"=>"See comments")), '/admin/comments/listing', null, false, false));
+
 ?>
-
-<div class="title_section">Entries </div>
-
-<p>
-<?php 
-  echo $html->link($html->image('actions/new.png', array("alt"=>"Add entry", "title"=>"Add entry")), '/admin/entries/add', null, false, false);
-  
-  echo $html->link($html->image('static/forum.gif', array("alt"=>"See comments", "title"=>"See comments")), '/admin/comments/listing', null, false, false);
-
- ?>
-
-</p>
-
 
 <table class="tbadmin">

trunk/app/views/subjects/admin_add.ctp

@@ -1 @@
-<?php echo $javascript->link('myfunctions'); ?>
-
 <div class="spaced">
 
-<?php echo $html->formTag('/admin/subjects/add/','post'); ?>
+<?php echo $form->create('Subject'); ?>
 <fieldset>
   <legend>New Subject</legend>
-     
-     <p><?php echo $form->labelTag( 'Subject/code', 'Code' );?><br /> 
-     <?php echo $html->input('Subject/code', array("size" => 4, "maxlength" => 8)); ?>
-     <?php echo $html->tagErrorMsg('Subject/code', 'Code is required.'); ?>
-     </p>
-     
-     <p><?php echo $form->labelTag( 'Subject/title', 'Title' );?><br /> 
-     <?php echo $html->input('Subject/title', array("size" => 40, "maxlength" => 80)); ?>
-     <?php echo $html->tagErrorMsg('Subject/title', 'Title is required.'); ?>
-     </p>
-     
+   <?php 
+       echo $form->input('Subject.code', array("size" => 8, "maxlength" => 8));
+       echo $form->input('Subject.title', array("size" => 40, "maxlength" => 80)); 
+   ?>
   <br />
-  <?php echo $html->submit('Add') ?>
-</fieldset>
-</form>
+  <?php echo $form->end('Save'); ?></fieldset>
 </div>

trunk/app/views/subjects/admin_listing.ctp

@@ +1 @@
+<?php 
+ echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
+ echo $html->getCrumbs(' / ');
 
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
+ echo $html->div('title_section', 'Subjects');
 
-<div class="title_section">Subjects</div>
+ echo $html->para(null, $html->link($html->image('actions/new.png', array("alt"=>"Add subject", "title"=>"Add subject")), '/admin/subjects/add', null, false, false));
+
+?>
+
+<table class="tbadmin">
+<?php
+//die(print_r($data));
+
+$th = array ('Edit', 'Code', 'Title', 'Delete');
+echo $html->tableHeaders($th);  
+foreach ($data as $val) {
+       $tr = array (
+        $gags->sendEdit($val['Subject']['id'], 'Subject'),
+        $val['Subject']['code'],
+        $val['Subject']['title'],
+        $gags->confirmDel($val['Subject']['id'], 'Subject')
+        );
+       
+    echo $html->tableCells($tr, array("class"=>"altRow", "onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='altRow'"), 
+                                array('class'=>'evenRow',"onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='evenRow'")); 
+}
+?>
+</table>
 
 
-<p><?php echo $html->link($html->image('actions/new.png', array("alt"=>"Add subject", "title"=>"Add subject")), '/admin/subjects/add', null, false, false) ?></p>
-<div>
-<?php
-//var_dump($data);
-
-foreach ($data as $key=>$val) {
-        echo '<p><a href="/admin/subjects/edit/'.$val['Subject']['id'].'">Edit</a> ';
-          echo  $val['Subject']['code']     . " ";
-          echo  $val['Subject']['title']    . " ";
-        echo '<a href="/admin/subjects/delete/'.$val['Subject']['id'].'">Delete</a> </p>';
-    }
-?> 
-</div>