Changeset 415

Timestamp:

04/19/08 15:07:11 (9 months ago)

Author:

aarkerio

Message:

Discussions fixed

Location:

trunk/app

Files:

• controllers/colleges_controller.php (modified) (2 diffs)
• views/colleges/admin_edit.ctp (modified) (1 diff)
• views/elements/login.ctp (modified) (1 diff)
• views/users/register.ctp (modified) (1 diff)
• views/vclassrooms/show.ctp (modified) (2 diffs)

trunk/app/controllers/colleges_controller.php

@@ -52 +52 @@
   /*** ======ADMIN METHODS === *****/
  public function admin_listing() 
- {        
-        $this->pageTitle = ' College Details';
-        
+ {      
         $this->layout = 'admin';
         
-        $conditions   = array("id"=>1);
-        $fields       = array("id", "name", "email", "urlbase", "description", "keywords");
-        $order        = "College.id DESC";
-        
-        $this->set('data', $this->College->find($conditions, $fields)); 
+        $conditions      = array("id"=>1);
+        $fields          = array("id", "name", "email", "urlbase", "description", "keywords");
+        $order           = "College.id DESC";
+        $data            = $this->College->find($conditions, $fields);
+        $this->pageTitle = $data['College']['title'];
+
+        $this->set('data', $data); 
  }
  
@@ -91 +91 @@
              else 
              {
-                                 $this->msgFlash('Your story has been saved!', '/admin/colleges/edit/'.$this->data["College"]["id"]);
+                                 $this->msgFlash('Data saved', '/admin/colleges/edit/'.$this->data["College"]["id"]);
              }
         }

trunk/app/views/colleges/admin_edit.ctp

@@ -1 @@
-<h2>Edit College</h2>
 <?php 
 
 echo $javascript->link('fckeditor/fckeditor');
 
-echo $html->formTag('/admin/colleges/edit/','post');
-echo $html->hidden('College/id');
-?>
-<div class="required"> 
-    <?php echo $form->labelTag('College/urlbase', 'Urlbase');?><br />
-    <?php echo $html->input('College/urlbase', array('size' => '60'));?>
-    <?php echo $html->tagErrorMsg('College/urlbase', 'Please enter the Urlbase.');?>
+echo $html->div('section_title', 'Edit College');
+
+echo $form->create('College');
+
+echo $form->hidden('College.id');
+
+echo $html->div('required', $form->input('College.urlbase', array('size' => 60, 'between'=>':<br />')));
+
+echo $html->div('required', $form->input('College.name', array('size' => 60, 'between'=>':<br />')));
+
+echo $html->div('required',  $form->textarea('College.description', array('cols' => 60, 'rows' => 3)). $fck->load('CollegeDescription', 'Karamelo')); 
+
+echo $html->div('optional', $form->input('College.email', array('size' => 60, 'between'=>':<br />')));
+
+echo $html->div('required', $form->input('College.keywords', array('size' => 60, 'between'=>':<br />')));
+
+
+echo $form->label('College.end', 'End:');
+echo $form->checkbox('College.end', array('value' => 1));
+?>  
+
+<div class="submit">
+    <?php echo $form->end('Save'); ?>
 </div>
-<div class="required"> 
-    <?php echo $form->labelTag('College/name', 'Name');?><br />
-    <?php echo $html->input('College/name', array('size' => '60'));?>
-    <?php echo $html->tagErrorMsg('College/name', 'Please enter the Name.');?>
-</div>
-<div class="required"> 
-    <?php echo $form->labelTag( 'College/description', 'Description' );?><br />
-    <?php echo $html->textarea('College/description', array('cols' => 60, 'rows' => 3));?>
-    <?php echo $fck->load('College/description', 'Karamelo'); ?>
-    <?php echo $html->tagErrorMsg('College/description', 'Please enter the Description.');?>
-</div>
-<div class="optional"> 
-    <?php echo $form->labelTag('College/email', 'Email');?><br />
-    <?php echo $html->input('College/email', array('size' => '60'));?>
-    <?php echo $html->tagErrorMsg('College/email', 'Please enter the Email.');?>
-</div>
-<div class="required"> 
-    <?php echo $form->labelTag('College/keywords', 'Keywords');?><br />
-    <?php echo $html->input('College/keywords', array('size' => '60'));?>
-    <?php echo $html->tagErrorMsg('College/keywords', 'Please enter the Keywords.');?>
-</div>
-<div>
-<?php echo $form->labelTag('College/end', 'End:');?><br />
-<?php echo $html->checkbox('College/end', null, array('value' => 1));?> </div> 
-<div class="submit">
-    <?php echo $html->submit('Save');?>
-</div>
-</form>
+</fieldset>

trunk/app/views/elements/login.ctp

@@ -1 +1 @@
 <div id="login"> 
-<?php echo  $form->create('User', array("action"=>"login", "onsubmit"=>"return validateLogin()")); ?>
+<?php echo  $form->create('User', array('action'=>'login', "onsubmit"=>"return validateLogin()")); ?>
 <fieldset>
 <legend> Login</legend>

trunk/app/views/users/register.ctp

@@ -33 +33 @@
      <?php echo $form->input('User.code', array("size" => 7, "maxlength" => 7)); ?>
      
-     <?php echo $form->label('User.pwd', 'Password: ') . $form->password('User.pwd', array("size" => 9, "maxlength" => 9)); ?>
+     <?php echo $form->label('User.pwd', 'Password: ') . $form->password('User.pwd', array('size' => 9, 'maxlength' => 9)); ?>
    <span class="small">At least 6 characters</span>
      <br /><br />

trunk/app/views/vclassrooms/show.ctp

@@ -1 +1 @@
 <?php
-// exit(debug($data));
+//exit(debug($data));
 ?>
 <h2>Classrooms</h2>
@@ -40 +40 @@
        }
      }
+
+     if ( count($data['Webquest']) > 0)
+     {
+       echo $html->div('titentry', 'Webquests');
+
+       foreach($data['Webquest'] as $wq)
+       {
+         echo $html->para(null, $html->link($wq['title'], '/webquests/view/'.$wq['id']));
+       }
+     }
   }