hw4mdl-svn Mailing List for Wimba Moodle Integration (Page 6)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 141
          http://svn.sourceforge.net/hw4mdl/?rev=141&view=rev
Author:   hugues
Date:     2006-12-28 06:45:06 -0800 (Thu, 28 Dec 2006)

Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10528
- The intermediate page monitors the presence of the LC window and display a message when it is not displayed

Modified Paths:
--------------
    trunk/moodle/lang/en_utf8/liveclassroom.php
    trunk/moodle/mod/liveclassroom/view.php

Modified: trunk/moodle/lang/en_utf8/liveclassroom.php
===================================================================

--- trunk/moodle/lang/en_utf8/liveclassroom.php	2006-12-28 13:47:21 UTC (rev 140)
+++ trunk/moodle/lang/en_utf8/liveclassroom.php	2006-12-28 14:45:06 UTC (rev 141)
@@ -41,9 +41,7 @@
 $string['settinguniqueid'] = 'Unique Prefix ID';
 $string['configsettinguniqueid'] = 'A unique prefix id so that multiple moodle instances can share one Live Classroom Server without collision.';
 $string['lcversion'] = 'Live Classroom Version';
-$string['lcversionnumber'] = '4.3.1';
 $string['integrationversion'] = 'Integration Version';
-$string['integrationversionnumber'] = '1.0';
 $string['emptyAdminUsername'] = 'Admin user name is empty';
 $string['emptyAdminPassword'] = 'Admin user password is empty';
 
@@ -82,9 +80,9 @@
 $string['wizard.text2.3'] = 'to make sure that your computer is ready to use the Live Classroom';
 
 
+$string['lcpopupshouldappear'] = 'The Live Classroom should now appear.<br/> if it does not, please click <a href=\"javascript:startActivity ();\">this link</a> to open it. ';
 
 
-
 //First Time Use - not use yet
 $string['firstRoom'] = 'Main classroom';
 $string['secondRoom'] = 'Group 1';

Modified: trunk/moodle/mod/liveclassroom/view.php
===================================================================
--- trunk/moodle/mod/liveclassroom/view.php	2006-12-28 13:47:21 UTC (rev 140)
+++ trunk/moodle/mod/liveclassroom/view.php	2006-12-28 14:45:06 UTC (rev 141)
@@ -30,67 +30,83 @@
 
 /// This page prints a particular instance of the live classroom links
 
-    require_once("../../config.php");
-    require_once("lib.php");
+require_once("../../config.php");
+require_once("lib.php");
 
-	$id = optional_param('id', 0, PARAM_INT);
-	$a = optional_param('a', 0, PARAM_INT);// liveclassroom ID
+$id = optional_param('id', 0, PARAM_INT);
+$a = optional_param('a', 0, PARAM_INT);// liveclassroom ID
   
-    if ($id) {
-        if (! $cm = get_record("course_modules", "id", $id)) {
-            error("Course Module ID was incorrect 1	");
-        }
-    
-        if (! $course = get_record("course", "id", $cm->course)) {
-            error("Course is misconfigured");
-        }
-    
-        if (! $liveclassroom = get_record("liveclassroom", "id", $cm->instance)) {
-            error("Course module is incorrect1");
-        }
+if ($id) {
+  if (! $cm = get_record("course_modules", "id", $id)) {
+    error("Course Module ID was incorrect 1	");
+  }
+  if (! $course = get_record("course", "id", $cm->course)) {
+    error("Course is misconfigured");
+  }
+  if (! $liveclassroom = get_record("liveclassroom", "id", $cm->instance)) {
+    error("Course module is incorrect1");
+  }
+} else {
+  if (! $liveclassroom = get_record("liveclassroom", "id", $a)) {
+    error("Course module is incorrect2");
+  }
+  if (! $course = get_record("course", "id", $liveclassroom->course)) {
+    error("Course is misconfigured");
+  }
+  if (! $cm = get_coursemodule_from_instance("liveclassroom", $liveclassroom->id, $course->id)) {
+    error("Course Module ID was incorrect");
+  }
+}
 
-    } else {
-        if (! $liveclassroom = get_record("liveclassroom", "id", $a)) {
-     
-            error("Course module is incorrect2");
-        }
-        if (! $course = get_record("course", "id", $liveclassroom->course)) {
-            error("Course is misconfigured");
-        }
-        if (! $cm = get_coursemodule_from_instance("liveclassroom", $liveclassroom->id, $course->id)) {
-            error("Course Module ID was incorrect");
-        }
-    }
+require_login($course->id);    
 
-    require_login($course->id);    
-
    
 // Create the session for this user
-    if (!$usersession = liveclassroom_create_session ($course, isteacher($course->id, $USER->id))) {
-    	 error ("Cannot create session");
-		}
+if (!$usersession = liveclassroom_create_session ($course, isteacher($course->id, $USER->id))) {
+  error ("Cannot create session");
+}
 
 
-	$classid = $liveclassroom->type;
+$classid = $liveclassroom->type;
 
+/// Print the main part of the page
+if ($course->category) {
+  $navigation = "<A HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->";
+}
 
-/// Print the main part of the page
+$strlcs = get_string("modulenameplural", "liveclassroom");
+$strlc  = get_string("modulename", "liveclassroom");
+
+print_header("$course->shortname: $liveclassroom->name", "$course->fullname",
+             "$navigation <A HREF=index.php?id=$course->id>$strlcs</A> -> $liveclassroom->name", 
+             "", "", true, "",
+             navmenu($course, $cm));
+
 ?>
-<!--script type="text/javascript" src='<?PHP p($CFG->liveclassroom_servername)?>/js/launch-7892.js'></script-->
+
 <script type="text/javascript" src='<?PHP p($CFG->liveclassroom_servername)?>/js/launch.js'></script>
- 
+<script type="text/javascript">
 
- <script type="text/javascript">
- 
-   function startActivity(){
+function monitor (name, destination) {
+  if (win[name] == null) {
+    setTimeout(monitor(name, destination), 1000);
+  }
+  else { // window exists
+    location.href= destination;
+  }
+}
 
-   		startHorizon('<?php p($classid) ?>',null,null,null,null,'hzA=<?php p($usersession)?>');  	
-	  	location.href = "<?php echo $CFG->wwwroot;?>/course/view.php?id=<?php echo $course->id; ?>";
-   }
-   
- </script>
- 
- 
- <script> startActivity(); </script>
- 
- 
\ No newline at end of file
+function startActivity(){
+  startHorizon('<?php p($classid) ?>',null,null,null,null,'hzA=<?php p($usersession)?>');
+  setTimeout (monitor('horizonWin', "<?php echo "$CFG->wwwroot/course/view.php?id=$course->id" ?>"), 1000);
+}
+
+startActivity();
+</script>
+
+<?php echo get_string ('lcpopupshouldappear', 'liveclassroom');?>
+
+<?php
+/// Finish the page
+print_footer($course);
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr (9)	May (7)	Jun	Jul (3)	Aug (13)	Sep (20)	Oct (20)	Nov (9)	Dec (49)
2007	Jan (34)	Feb	Mar	Apr (2)	May (2)	Jun	Jul	Aug (6)	Sep	Oct	Nov	Dec
2008	Jan (39)	Feb (14)	Mar (8)	Apr	May	Jun	Jul	Aug	Sep (1)	Oct (3)	Nov (4)	Dec

hw4mdl-svn Mailing List for Wimba Moodle Integration (Page 6)

hw4mdl-svn — Wimba for Moodle Commits