Changeset 431
- Timestamp:
- 04/25/08 18:43:32 (9 months ago)
- Location:
- trunk/app
- Files:
-
- 2 added
- 9 modified
-
config/sql/helps_postgres.sql (modified) (1 diff)
-
config/sql/karamelo_postgres.sql (modified) (1 diff)
-
controllers/podcasts_controller.php (modified) (3 diffs)
-
controllers/tests_controller.php (modified) (2 diffs)
-
views/elements/menu_b.ctp (modified) (1 diff)
-
views/entries/rss.ctp (modified) (1 diff)
-
views/layouts/rubyx.ctp (modified) (6 diffs)
-
views/podcasts/recent.ctp (added)
-
views/users/portfolio.ctp (modified) (1 diff)
-
views/webquests/admin_start.ctp (modified) (1 diff)
-
webroot/img/static/cwclogo.jpg (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/app/config/sql/helps_postgres.sql
r190 r431 23 23 INSERT INTO helps VALUES (9, '/admin/ecourses/listing', '<h1>eCourses</h1> 24 24 <p>Just as they sound, eCourses are courses that are offered online. These courses, which are often hosted over the internet, enable internet users to get an education or familiarize themselves with something new, often right from the comfort of their own homes. Although eCourses have similar goals, to educate internet users, those goals are accomplished in different ways. There are some individuals who are considered experts in their field, such as the field from working from home. Many experts create eCourses and distribute them online for other internet users to benefit from.</p>', 'en'); 25 25 26 INSERT INTO helps VALUES (8, '/admin/webquests/edit', '<h1>Webquest Sections</h1> 26 <p>The Process block in a WebQuest where the teacher suggests the steps that learners should go through in completing the task. It may include strategies for dividing the task into subtasks, descriptions of roles to be played or perpectives to be taken by each learner. The instructor can also use this place to provide learning advice and interpersonal process advice, such as how to conduct a brainstorming session.</p> 27 <p>The Process description should be relatively short and clear. For example, Week 1 of Cheryl Rondestvedt''s <a href="http://edweb.sdsu.edu/triton/PollSol/Week1.html">Ocean Pollution/Solution</a>unit involves students doing a lot of activities, but the steps are clearly specified. Note that in this case, the resources needed are embedded within the steps rather than being separately liste.</p> 28 Links:<br /> 29 <p> </p> 30 <ul> 31 <li><a href="http://education.uregina.ca/iteachered/modules/preservice/module8.html">Designing Webquests</a></li> 32 <li><a href="http://webquest.org/index.php">Webquest Home</a></li> 33 </ul>', 'en'); 27 <h1>What is a Webquest?</h1> 28 <p>A webquest is an assignment which asks students to use the World Wide Web to learn about and/or synthesize their knowledge a specific topic. A ÒtrueÓ webquest, as originally designed by Bernie Dodge and Tom March, requires synthesis of the new knowledge by accomplishing a Òtask,Ó often to solve a hypothetical problem or address a real-world issue. Simpler web activities designed for students to investigate and collect new knowledge from web-based sources can also be a more engaging and effective replacement for read-the-chapter-and-complete-the-review-questions. This tutorial will walk you through the basics to create a simple or more elaborate activity. </p> 29 30 <p>The assignment can be given on paper, certainly the simplest and most portable option. For an example, click here to print out a simple "on paper" webquest on Laura Ingalls Wilder. (You\'ll need Adobe\'s Acrobat Reader, which is available from the TeachersFirst Toolbox.</p> 31 32 <p>A webquest assignment can also be given on the web itself by sending students to a web page which serves as the "home base" for the studentÕs information search. For an example, click here to see an "on the web" webquest bsed on Harper Lee\'s book To Kill A Mockingbird.</p> 33 34 <p>You can also present a webquest using some other multi-media software such as Hyperstudio or Powerpoint.</p> 35 <p>The quality of your webquest depends on the ideas and thought that go into in more than on flashy presentation technologies. ItÕs easy to create a mediocre webquest, and it\'s far more difficult to create quest that really works well.</p> 36 <h1>Why Bother?</h1> 37 <p>Why should you take the time to create a webquest? The best reason is that, like any carefully planned lesson, a good webquest makes learning interesting for your students. Beyond that, however, several other factors make webquests a powerful learning tool. 38 39 <p>First, a good webquest puts the power of the web behind your topic. You can show students - or let them discover for themselves, not just tell them. Web sites can take your students anywhere in the world.</p> 40 41 <p>Webquests are a way to let students work at their own pace, either individually or in teams.A webquest lets students explore selected areas in more depth, but within limits that you have selected. This makes webquests ideal for classes which combine students with different ability levels.Webquests offer a different, more dynamic approach to teaching the value of research. 42 Webquests can also increase the "comfort level" of students using the Internet for learning activities. While your students are probably already computer literate, a properly designed webquest can help students become creative researchers rather than simply "surfing" from one site to another.</p>', 'en'); 43 34 44 INSERT INTO helps VALUES (11, '/admin/lessons/listing', '<h1>Lessons</h1> 35 45 <br /> -
trunk/app/config/sql/karamelo_postgres.sql
r429 r431 590 590 test_id int NOT NULL REFERENCES tests(id) ON DELETE CASCADE, 591 591 vclassroom_id int NOT NULL REFERENCES vclassrooms(id) ON DELETE CASCADE, 592 percentage decimal NOT NULL, 592 593 PRIMARY KEY (user_id, test_id, vclassroom_id) 593 594 ); -
trunk/app/controllers/podcasts_controller.php
r361 r431 33 33 return false; // go away !! 34 34 } 35 36 public function display( )37 { 38 $this-> Portal->statics();39 40 $this-> layout = 'portal';41 35 36 public function display($user_id) 37 { 38 $this->layout = $this->Edublog->layout($user_id); 39 40 $this->Edublog->blog($user_id); 41 42 42 $this->pageTitle = 'Podcasts'; 43 43 44 $conditions = array("Podcast.status"=>1 );44 $conditions = array("Podcast.status"=>1, "Podcast.user_id"=>$user_id); 45 45 46 46 $fields = array('Podcast.id','Podcast.title', 'Podcast.description','Podcast.created','Podcast.filename', 'Podcast.length','Podcast.duration', 'User.username'); … … 52 52 $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit)); 53 53 } 54 54 55 public function recent() 56 { 57 $this->Portal->statics(); 58 59 $this->layout = 'portal'; 60 61 $this->pageTitle = 'Podcasts'; 62 63 $conditions = array("Podcast.status"=>1); 64 65 $fields = array('Podcast.id','Podcast.title', 'Podcast.description','Podcast.created','Podcast.filename', 'Podcast.length','Podcast.duration', 'User.username'); 66 67 $order = 'Podcast.id DESC'; 68 69 $limit = 20; 70 71 $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit)); 72 } 73 74 55 75 public function rss($username) 56 76 { … … 79 99 $this->layout = $this->Edublog->layout($user_id); 80 100 81 $this-> set('blog', $this->Edublog->blog($user_id));101 $this->Edublog->blog($user_id); 82 102 83 103 $this->pageTitle = 'Podcast'; -
trunk/app/controllers/tests_controller.php
r429 r431 69 69 $already = $this->Test->Result->field('Result.id', array("Result.user_id"=>$this->Auth->user('id'), "Result.test_id"=>$test_id)); 70 70 71 if ($already != null)72 {71 if ($already != null) 72 { 73 73 $username = $this->Test->User->field('User.username', array("User.id"=>$user_id)); 74 $this->flash('You already have answered this test', '/users/portfolio/'.$username); 75 exit(); 76 } 74 $this->flash('You already have answered this test', '/users/portfolio/'.$username); 75 } 77 76 78 77 if ( $this->Auth->user() && $this->Auth->user('group_id') == 3) 79 78 { 80 $student_id = (int) $this->Auth->user('id');81 $this->Edublog->setSession($student_id); //check if user belongs to class79 $student_id = (int) $this->Auth->user('id'); 80 $this->Edublog->setSession($student_id); //check if user belongs to class 82 81 } 83 82 … … 146 145 $this->data['Result']['vclassroom_id'] = $this->data['Test']['vclassroom_id']; 147 146 147 $maxpoints = (int) $this->data['Test']['maxpoints']; 148 $this->data['Result']['percentage'] = number_format( ( ($points / $maxpoints)*100), 2, '.', ''); 148 149 $this->Test->Result->create(); 149 150 150 151 if ($this->Test->Result->save($this->data['Result']) ) 151 152 { 152 $this->data['Test']['results'] = $points; 153 $maxpoints = (int) $this->data['Test']['maxpoints']; 154 $this->data['Test']['percentage'] = number_format( ( ($points / $maxpoints)*100), 2, '.', ''); 153 $this->data['Test']['results'] = $points; 154 $this->data['Test']['percentage'] = $this->data['Result']['percentage']; 155 155 $this->set('data', $this->data['Test']); 156 156 } -
trunk/app/views/elements/menu_b.ctp
r350 r431 4 4 <ul> 5 5 <li><?php echo $html->link('Edublogs', '/users/bloggers/', array('title'=>'eduBlogs')); ?> </li> 6 <li><?php echo $html->link('Podcasts', '/podcasts/ display', array('title'=>'Download and hear')); ?> </li>6 <li><?php echo $html->link('Podcasts', '/podcasts/recent', array('title'=>'Download and hear')); ?> </li> 7 7 <li><?php echo $html->link('Directory', '/users/directory/', array('title'=>'Staff')); ?> </li> 8 8 <li><?php echo $html->link('Newsletter', '/newsletters/display/', array('title'=>'Keep in touch')); ?> </li> -
trunk/app/views/entries/rss.ctp
r258 r431 16 16 <item> 17 17 <title><?php echo $v["Entry"]['title']; ?></title> 18 <link> <?php echo $_SERVER['SERVER_NAME'] ?>/users/entry/<?php echo $v["User"]['username']; ?>/<?php echo $v["Entry"]['id'] ?></link>18 <link>http://<?php echo $_SERVER['SERVER_NAME'] ?>/users/entry/<?php echo $v["User"]['username']; ?>/<?php echo $v["Entry"]['id'] ?></link> 19 19 <comments><?php echo $_SERVER['SERVER_NAME'] ?>/users/entry/<?php echo $v["User"]['username']; ?>/<?php echo $v["Entry"]['id'] ?></comments> 20 20 <description><![CDATA['<?php echo $body ?>']]></description> -
trunk/app/views/layouts/rubyx.ctp
r342 r431 18 18 <meta name="robots" content="all,follow" /> 19 19 <meta name="author" content="All: ... [Nazev webu - www.url.cz]; e-mail: info@url.cz" /> 20 <meta name="copyright" content="Design/Code: Vit Dlouhy [Nuvio - www.nuvio.cz]; e-mail: vit.dlouhy@nuvio.cz" /> 20 <meta name="copyright" content="Design/Code: Vit Dlouhy [Nuvio - www.nuvio.cz]; e-mail: vit.dlouhy@nuvio.cz" /> 21 <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php echo '/entries/rss/'.$blog['User']['username']; ?>" /> 21 22 22 23 <title> <?php echo $title_for_layout?> </title> … … 41 42 <h1 id="logo"> 42 43 <?php 43 echo $html->link($blog[ "User"]["name_blog"], '/blog/'.$blog["User"]["username"],44 array("title"=>$blog[ "User"]["name_blog"]));44 echo $html->link($blog['User']['name_blog'], '/blog/'.$blog['User']['username'], 45 array("title"=>$blog['User']['name_blog'])); 45 46 ?> 46 47 </h1> 47 <div id="quote"><?php echo $blog[ "User"]["quote"]; ?></div>48 <div id="quote"><?php echo $blog['User']['quote']; ?></div> 48 49 <hr class="noscreen" /> 49 50 <!-- Search --> … … 51 52 <?php 52 53 echo $form->create("Entry", array("action"=>"search", "onsubmit"=>"return chkSearch()")); 53 echo $form->hidden('Entry.user_id', array("value"=>$blog["User"]["id"]));54 echo '<fieldset><legend>Search</legend>';55 echo $form->label('Entry.terms', 'Find:', array("class"=>"noscreen"));56 echo '<span id="search-input-out">';57 echo $form->input('Entry.terms', array("size"=>"30", "id"=>"search-input-out"));58 echo '</span>';59 //echo $html->submit('ok', array("type"=>"image", 'src'=>"/css/rubyx/img/search_submit.gif"));60 echo '<input type="image" src="/css/rubyx/img/search_submit.gif" id="search-submit" value="OK" />';61 ?>54 echo $form->hidden('Entry.user_id', array("value"=>$blog['User']['id'])); 55 echo '<fieldset><legend>Search</legend>'; 56 echo $form->label('Entry.terms', 'Find:', array("class"=>"noscreen")); 57 echo '<span id="search-input-out">'; 58 echo $form->input('Entry.terms', array("size"=>"30", "id"=>"search-input-out")); 59 echo '</span>'; 60 //echo $html->submit('ok', array("type"=>"image", 'src'=>"/css/rubyx/img/search_submit.gif")); 61 echo '<input type="image" src="/css/rubyx/img/search_submit.gif" id="search-submit" value="OK" />'; 62 ?> 62 63 </fieldset> 63 64 </form> … … 73 74 $url = substr($_SERVER['argv'][0], 4, 10); 74 75 echo ($url == 'users/blog') ? '<li id="active">' : '<li>'; ?> 75 <a href="/users/blog/<?php echo $blog[ "User"]["username"] ?>">eduBlog<span class="tab-l"></span><span class="tab-r"></span></a></li>76 <a href="/users/blog/<?php echo $blog['User']['username'] ?>">eduBlog<span class="tab-l"></span><span class="tab-r"></span></a></li> 76 77 77 78 <?php echo ($url == 'users/port') ? '<li id="active">' : '<li>'; ?> 78 <a href="/users/portfolio/<?php echo $blog[ "User"]["username"] ?>">Portfolio<span class="tab-l"></span><span class="tab-r"></span></a></li>79 <a href="/users/portfolio/<?php echo $blog['User']['username'] ?>">Portfolio<span class="tab-l"></span><span class="tab-r"></span></a></li> 79 80 80 81 <?php echo ($url == 'users/abou') ? '<li id="active">' : '<li>'; ?> 81 <a href="/users/about/<?php echo $blog[ "User"]["username"] ?>">About Me<span class="tab-l"></span><span class="tab-r"></span></a></li>82 <a href="/users/about/<?php echo $blog['User']['username'] ?>">About Me<span class="tab-l"></span><span class="tab-r"></span></a></li> 82 83 83 84 <?php echo ($url == 'messages/c') ? '<li id="active">' : '<li>'; ?> 84 <a href="/messages/message/<?php echo $blog[ "User"]["username"] ?>">Contact<span class="tab-l"></span><span class="tab-r"></span></a></li>85 <a href="/messages/message/<?php echo $blog['User']['username'] ?>">Contact<span class="tab-l"></span><span class="tab-r"></span></a></li> 85 86 86 87 </ul> … … 97 98 <p id="rss"><strong>RSS:</strong> 98 99 <?php 99 echo $html->link('Blog', '/entries/rss/'.$blog[ "User"]["username"]) . '/';100 echo $html->link('Podcast', '/podcasts/rss/'.$blog[ "User"]["username"]);100 echo $html->link('Blog', '/entries/rss/'.$blog['User']['username']) . '/'; 101 echo $html->link('Podcast', '/podcasts/rss/'.$blog['User']['username']); 101 102 ?> 102 103 </p> … … 112 113 <div id="col" class="noprint"> 113 114 <div id="col-in"> 114 <div class="temas"><?php echo $blog["User"]["username"] ?> profile</div> 115 <p><?php echo "<p>".$blog["User"]["cv"] ?> </p> 116 <p style="text-align:center"> 117 <?php echo $html->image('avatars/'.$blog["User"]["avatar"], array("alt"=>$blog["User"]["username"], "title"=>$blog["User"]["username"])) ?> 118 </p> 119 120 121 <?php 115 <?php 116 echo $html->div('temas', $blog['User']['username'] . ' profile'); 117 echo $html->para(null, $blog['User']['cv']); 118 echo $html->para(null,$html->image('avatars/'.$blog['User']['avatar'], array("alt"=>$blog['User']['username'], "title"=>$blog['User']['username'])), array('style'=>'text-align:center')); 119 120 echo $html->div('temas', 'College'); 121 echo $html->para(null,$html->link( 122 $html->image('static/cwclogo.jpg', array('alt'=>'Conrad', 'title'=>'Conrad College')), '/', null,null, false), 123 array('style'=>'text-align:center')); 124 125 122 126 if ( $blog["Lesson"] != null) 123 127 { -
trunk/app/views/users/portfolio.ctp
r397 r431 24 24 25 25 <div class="portfolio" id="podcast" onmouseover="changecolor(this.id, 'yellow');" onMouseOut="changecolor(this.id, '#ffcc00');"> 26 <?php echo $html->link($html->image('ipod.png', array("title"=>"Podcast", "alt"=>"Podcast")), '/podcasts/display/' .$blog["User"]["username"] .'/'. $blog["User"]["id"], null, null, false); ?><br />26 <?php echo $html->link($html->image('ipod.png', array("title"=>"Podcast", "alt"=>"Podcast")), '/podcasts/display/' . $blog["User"]["id"], null, null, false); ?><br /> 27 27 Podcast 28 28 </div> -
trunk/app/views/webquests/admin_start.ctp
r340 r431 4 4 <?php 5 5 echo $form->input('Webquest.title', array("size" => 40, "maxlength" => 150)); 6 echo $form->error('Webquest.title', 'A title is required.'); 6 7 echo $form->label('Webquest.value','Points:'); 8 echo $form->select('Webquest.value', array(1=>1, 2=>2, 3=>3,4=>4,5=>5,6=>6,7=>7,8=>8,9=>9,10=>10), 10, null, false); 7 9 ?> 8 10 <div style="clear:both"></div>
