Changeset 395

Timestamp:

04/14/08 10:20:01 (9 months ago)

Author:

aarkerio

Message:

Fixed test controller

Location:

trunk/app

Files:

• config/sql/karamelo_postgres.sql (modified) (2 diffs)
• views/ecourses/admin_vclassrooms.ctp (modified) (1 diff)
• views/elements/admin_menu.ctp (modified) (1 diff)
• views/entries/admin_start.ctp (modified) (1 diff)
• views/forums/admin_add.ctp (modified) (2 diffs)
• views/vclassrooms/admin_listing.ctp (modified) (1 diff)

trunk/app/config/sql/karamelo_postgres.sql

@@ -318 +318 @@
     "created" timestamp(0) with time zone DEFAULT now() NOT NULL,
     "status" smallint DEFAULT 0 NOT NULL,
-    "user_id" integer NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-    "ecourse_id" integer NOT NULL REFERENCES ecourses(id) ON DELETE CASCADE,
-    "secret" varchar(6),   -- secreto code to allow students register by themselves
-    "access" smallint NOT NULL DEFAULT 0
+    "user_id" int NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    "ecourse_id" int NOT NULL REFERENCES ecourses(id) ON DELETE CASCADE,
+    "secret" varchar(6),   -- secret code to allow students register by themselves
+    "access" smallint NOT NULL DEFAULT 0 -- public / only with code
 );
 
@@ -569 +569 @@
 CREATE TABLE "tests_vclassrooms" (
  "id" serial PRIMARY KEY,
- "test_id" int NOT NULL REFERENCES tests(id),
- "vclassroom_id" int NOT NULL REFERENCES vclassrooms(id),
+ "test_id" int NOT NULL REFERENCES tests(id) ON DELETE CASCADE,
+ "vclassroom_id" int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE,
   UNIQUE  ("test_id", "vclassroom_id")
 );

trunk/app/views/ecourses/admin_vclassrooms.ctp

@@ -6 +6 @@
 echo $html->getCrumbs(' / '); 
 
-$str =  'Virtual clasrooms  on ' . $data['Ecourse']['title'] . ' e-Course';
+$str =  'Classrooms  on ' . $data['Ecourse']['title'];
 
 if ( isset( $historic ) )

trunk/app/views/elements/admin_menu.ctp

@@ -8 +8 @@
          $html->link('eCourses', '/admin/ecourses/listing') => array(
                                                                  $html->link('Add eCourses', '/admin/ecourses/add'),
-                                                                         $html->link('Classrooms', '/admin/vclassrooms/listing')
+                                                                         $html->link('Classrooms', '/admin/vclassrooms/listing'),
+                                                                         $html->link('Forums', '/admin/catforums/listing')
                                                              ),
              $html->link('Webquests', '/admin/webquests/listing'),

trunk/app/views/entries/admin_start.ctp

@@ -49 +49 @@
      <?php echo $html->link($html->image('static/forums.png', array("title"=>"Forums", "alt"=>"Forums")), '/admin/catforums/listing', null, null, false); ?>
   </span>
-  <a href="/admin/caforums/listing" title="Phorums" class="main-item-caption">Forums</a>
+  <a href="/admin/catforums/listing" title="Phorums" class="main-item-caption">Forums</a>
 </div>
 

trunk/app/views/forums/admin_add.ctp

@@ -6 +6 @@
 echo $html->div('title_section', 'Add New Forum');
 
-if ( $vclassrooms == null)
-{
+if ( $vclassrooms == null):
     echo $html->para(null, $html->link('You need to have at last one classroom enabled to add new forums', '/admin/ecourses/listing'));
-}
-else
-{
+else:
+
   echo $form->create('Forum');
   echo $form->hidden('Forum.catforum_id', array('value'=>$catforum_id));
@@ -18 +16 @@
    <legend><?php __('New Forum'); ?></legend>
 <?php 
-  echo $form->label('Forum.vclassroom_id',  'Class:');
+  echo $form->label('Forum.vclassroom_id', 'Class:');
   echo $form->select('Forum.vclassroom_id', $vclassrooms, null, null, false);
   echo $form->input('Forum.title', array("size" => 40, "maxlength" => 60)); 
   echo $form->error('Forum.title', 'A forum title is required.'); 
+ 
+  echo $html->div('required', $form->label('Forum.description','Description:').$form->textarea('Forum.description', array('rows'=>10,'cols'=>50)));
+
+echo $form->label('Forum.status', 'Activate forum:') . $form->checkbox('Forum.status', array("value"=>1)); 
+
+echo '</fieldset>';
+
+echo $form->end('Save'); 
+
+endif;
 ?>
-  <p>
-    <?php 
-        echo $form->label('Forum.description', 'Description:' ) . '<br />';
-        echo $form->textarea('Forum.description', array("rows" => 10, "cols" => 50));
-        echo $form->error('Forum.description', 'A phorum description is required.');
-     ?>
-  </p>
-  <br />
-     <?php echo $form->label('Forum.status', 'Activate forum:') . $form->checkbox('Forum.status', array("value"=>1)); ?><br />
-  <p><br /></fieldset>
-  <?php echo $form->end('Save'); 
-}
-?></p>

trunk/app/views/vclassrooms/admin_listing.ctp

@@ -3 +3 @@
   echo $html->getCrumbs(' / '); 
   echo $html->div('title_section', 'Classrooms');
-  echo $html->link($html->image('actions/new.png', array("alt"=>"Add classroom", "title"=>"Add classroom")), '/admin/vclassrooms/add', null, null, false); 
+
+  echo $html->link($html->image('actions/new.png', array("alt"=>"Add classroom", "title"=>"Add classroom")), '/admin/ecourses/listing', null, null, false); 
 ?>