Changeset 445
- Timestamp:
- 05/02/08 13:22:37 (7 months ago)
- Location:
- trunk/app
- Files:
-
- 16 added
- 6 modified
-
config/sql/postgresql/participations.sql (modified) (1 diff)
-
controllers/vclassrooms_controller.php (modified) (2 diffs)
-
locale/spa/default.po (modified) (1 diff)
-
views/elements/acquaintances.ctp (modified) (1 diff)
-
views/elements/vclassrooms.ctp (modified) (1 diff)
-
views/layouts/hobbit.ctp (added)
-
views/vclassrooms/participation.ctp (added)
-
views/vclassrooms/show.ctp (modified) (3 diffs)
-
webroot/css/hobbit (added)
-
webroot/css/hobbit/hobbit.css (added)
-
webroot/img/hobbit (added)
-
webroot/img/hobbit/bg.jpg (added)
-
webroot/img/hobbit/bgcontainer.jpg (added)
-
webroot/img/hobbit/bgcontent.gif (added)
-
webroot/img/hobbit/bgfooter.gif (added)
-
webroot/img/hobbit/divider.gif (added)
-
webroot/img/hobbit/gfx.jpg (added)
-
webroot/img/hobbit/header.jpg (added)
-
webroot/img/hobbit/map.jpg (added)
-
webroot/img/hobbit/pattern.gif (added)
-
webroot/img/hobbit/quote.gif (added)
-
webroot/img/hobbit/stripes.gif (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/app/config/sql/postgresql/participations.sql
r444 r445 1 1 CREATE TABLE participations ( -- tests student results 2 id serial NOT NULL UNIQUE,2 id serial NOT NULL PRIMARY KEY, 3 3 user_id int NOT NULL REFERENCES users(id) ON DELETE CASCADE, 4 points smallint NOT NULL DEFAULT 1, 4 points smallint NOT NULL DEFAULT 0, 5 participation text NOT NULL, 5 6 forum_id int NOT NULL REFERENCES forums(id) ON DELETE CASCADE, 6 vclassroom_id int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE, 7 PRIMARY KEY (user_id, forum_id, vclassroom_id) 7 vclassroom_id int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE 8 8 ); 9 9 -- Test model tables ends -
trunk/app/controllers/vclassrooms_controller.php
r444 r445 20 20 public function beforeFilter() 21 21 { 22 $this->Auth->allow(array('show', 'jointoclass', 'display' ));22 $this->Auth->allow(array('show', 'jointoclass', 'display', 'participation')); 23 23 parent::beforeFilter(); 24 24 } … … 75 75 $this->Edublog->setSession($user_id); 76 76 } 77 } 78 79 public function participation() 80 { 81 $this->layout = 'ajax'; 82 83 if ( !empty($this->data['Participation'])) 84 { 85 $this->set('vclassroom_id', $this->data['Participation']['vclassroom_id']); 86 $this->render('participation', 'ajax'); 87 } 77 88 } 78 89 -
trunk/app/locale/spa/default.po
r440 r445 8 8 msgid "where_pin" 9 9 msgstr "Where is my PIN?" 10 11 msgid "part_advice" 12 msgstr "Es una buena costumbre mantener tu propio registro de participaciones, antes de ecribir aquÃ, escribe y guarda tu particación usando un editor de texto sencillo como Wordpad o Gedit, luego copia y pegala aquÃ. La participación debe ser texto plano sin formato, sin tablas ni imágenes." -
trunk/app/views/elements/acquaintances.ctp
r313 r445 1 <div class="temas">Friend's links</div>2 1 <?php 2 3 echo $html->div('temas', 'Useful links'); 4 3 5 foreach ($blog["Acquaintance"] as $val) 4 6 { -
trunk/app/views/elements/vclassrooms.ctp
r242 r445 1 <div class="temas">Classrooms</div>2 1 <?php 3 foreach ($blog["Vclassroom"] as $key => $val) 2 echo $html->div('temas','Groups'); 3 4 foreach ($blog['Vclassroom'] as $val) 4 5 { 5 6 echo $html->link($val['name'], '/vclassrooms/show/'.$val['user_id'].'/'. $val['id'], array("class"=>"petit")) . "<br />\n"; -
trunk/app/views/vclassrooms/show.ctp
r441 r445 1 1 <?php 2 2 //exit(debug($data)); 3 ?> 4 <h2>Classrooms</h2> 5 <div id="charging" style="display:none;"><?php echo $html->image('static/loading.gif', array("alt"=>"Loading")); ?></div> 6 <?php 7 echo '<h1>' . $data['Vclassroom']['name'] . '</h1>'; 3 echo $javascript->link('fckeditor/fckeditor'); 4 5 6 echo '<h1>' . $data['Vclassroom']['name'] . '</h1>'; 8 7 9 $auth = false;8 $auth = false; 10 9 11 if ( $session->check('vclassrooms') )12 {10 if ( $session->check('vclassrooms') ) 11 { 13 12 $auth = ( in_array($data['Vclassroom']['id'], $session->read('vclassrooms'))) ? true : false; // students belongs this vclass ? 14 }13 } 15 14 16 15 if ( $auth === true ) … … 60 59 } 61 60 } 61 echo $ajax->form(); 62 63 echo $form->hidden('Participation.vclassroom_id', array('value'=>$data['Vclassroom']['id'])); 64 echo $ajax->submit('Compose participation ', array("url" => "/vclassrooms/participation/", 65 "update"=>"setform", 66 "loading" => "Element.show('charging');Element.hide('setform')", 67 "complete" => "Element.hide('charging');Effect.Appear('setform')" 68 )); 69 echo '</form>'; 70 // empty ajax div 71 echo $ajax->div('setform') . $ajax->divEnd('setform'); 62 72 } 63 73 … … 83 93 } 84 94 ?> 95 <div id="charging" style="display:none;"><?php echo $html->image('static/loading.gif', array("alt"=>"Loading")); ?></div>
