hw4mdl-svn Mailing List for Wimba Moodle Integration (Page 4)
Brought to you by:
jhlinder,
trollinger
Menu
▾
▴
hw4mdl-svn — Wimba for Moodle Commits
You can subscribe to this list here.
| 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
|
|
From: <hu...@us...> - 2007-05-11 15:16:39
|
Revision: 192
http://svn.sourceforge.net/hw4mdl/?rev=192&view=rev
Author: hugues
Date: 2007-05-11 08:16:38 -0700 (Fri, 11 May 2007)
Log Message:
-----------
Tagging LC+VT Integration 1.0.1
Added Paths:
-----------
tags/LC+VT_1_0_1/
Copied: tags/LC+VT_1_0_1 (from rev 191, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-05-11 14:51:35
|
Revision: 191
http://svn.sourceforge.net/hw4mdl/?rev=191&view=rev
Author: hugues
Date: 2007-05-11 07:51:33 -0700 (Fri, 11 May 2007)
Log Message:
-----------
Fixing profile problem with students not able to access the Voice Tools
Modified Paths:
--------------
trunk/moodle/mod/voicetools/lib/common/WimbaCommons.php
trunk/moodle/mod/voicetools/lib/vt/WimbaVoicetools.php
Modified: trunk/moodle/mod/voicetools/lib/common/WimbaCommons.php
===================================================================
--- trunk/moodle/mod/voicetools/lib/common/WimbaCommons.php 2007-04-19 11:47:58 UTC (rev 190)
+++ trunk/moodle/mod/voicetools/lib/common/WimbaCommons.php 2007-05-11 14:51:33 UTC (rev 191)
@@ -101,12 +101,12 @@
if (($role!="" && $role=="Instructor") || ($role=="" && $this->hparams["role"]=="Instructor")) {
- $this->currentVtUserRigths->setProfile ('moodle.'.$product.'.instructor');
+ $this->currentVtUserRigths->setProfile ('angel.'.$product.'.instructor');
}
else {
- $this->currentVtUserRigths->setProfile ( 'moodle.'.$product.'.student');
+ $this->currentVtUserRigths->setProfile ( 'angel.'.$product.'.student');
}
}
@@ -118,9 +118,10 @@
return $this->currentVtUserRigths;
}
- function setVtUserRigths($product,$role){
- $this->currentVtUserRigths->setProfile ( 'moodle.'.$product.$role);
-
+ function setVtUserRigths($product,$role){
+ $this->currentVtUserRigths->setProfile ( 'angel.'.$product.'.'.$role);
+ if($product=="presentation")
+ this->currentVtUserRigths->add("reply_message");
}
}
@@ -150,21 +151,21 @@
} else{
- if(isstudent($courseId)) { //Student
- $role='Student';
- }
- else if (isadmin() || isteacher($courseId, $USER->id)) { // Admin, Teacher
- $role='Instructor';
- }
-
- if(strstr($CFG->release,"1.7")) { // 1.7.* version
- if (iscreator()) { // Course Creator
- $role='Instructor';
- }
- else if (!isteacheredit($courseId)) { // Non-editing Teacher
- $role='Student';
- }
+ if(isstudent($courseId)) { //Student
+ $role='Student';
}
+ else if (isadmin() || isteacher($courseId, $USER->id)) { // Admin, Teacher
+ $role='Instructor';
+ }
+
+ if(strstr($CFG->release,"1.7")) { // 1.7.* version
+ if (iscreator()) { // Course Creator
+ $role='Instructor';
+ }
+ else if (!isteacheredit($courseId)) { // Non-editing Teacher
+ $role='Student';
+ }
+ }
}
Modified: trunk/moodle/mod/voicetools/lib/vt/WimbaVoicetools.php
===================================================================
--- trunk/moodle/mod/voicetools/lib/vt/WimbaVoicetools.php 2007-04-19 11:47:58 UTC (rev 190)
+++ trunk/moodle/mod/voicetools/lib/vt/WimbaVoicetools.php 2007-05-11 14:51:33 UTC (rev 191)
@@ -621,6 +621,10 @@
{
$this->hparams["profile"]= $profile;
}
+ function add($param)
+ {
+ $this->hparams["add"]= $param;
+ }
function getParameters()
{
return $this->parameters;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-04-19 11:48:01
|
Revision: 190
http://svn.sourceforge.net/hw4mdl/?rev=190&view=rev
Author: hugues
Date: 2007-04-19 04:47:58 -0700 (Thu, 19 Apr 2007)
Log Message:
-----------
Updating README's and INSTALL's
Modified Paths:
--------------
trunk/moodle/INSTALL.txt
trunk/moodle/README.txt
Removed Paths:
-------------
trunk/moodle/mod/liveclassroom/README.txt
trunk/moodle/mod/voicetools/README.txt
Modified: trunk/moodle/INSTALL.txt
===================================================================
--- trunk/moodle/INSTALL.txt 2007-04-13 13:26:54 UTC (rev 189)
+++ trunk/moodle/INSTALL.txt 2007-04-19 11:47:58 UTC (rev 190)
@@ -1,32 +1,5 @@
-This is the Installation file for the Horizon Wimba 4 Moodle Modules and blocks.
+The Wimba Modules Installation and Configuration Guide is available within a bundled, downloadable package from Wimba.
-Activity Modules:
------------------
+These Modules require that a Wimba Live Classroom and/or Voice Tools server is in place to integrate with Moodle.
-Installation of the Moodle Activity Module can be performed in two steps:
- 1) Installing the Module files
- 2) Configuring the Module
-
-
-To Install the files, pick up the folder named after the module you want to
-install (e.g. one of liveclassroom, voicetools or pronto), and copy this folder
-over to the directory <MOODLE>/mod of you Moodle installation.
-
-Then, for each language you have available in you Moodle installation, pick
-the appropriate lang file in the lang folder of this package. The default lang
-file that should be installed is located in lang/en_utf8.
-
-Et Voila! You're done with files.
-
-
-To configure the Module, login to Moodle as an administratior and navigate
-to the "Configuration" section. Moodle will discover automatically that you
-installed a new Activity Module and will initialize the Database accordingly.
-At the time of this writting, the HW4Mdl modules only support MySQL and
-PostgreSQL.
-
-Once the tables are created succefully, navogate to the settings page of the
-Appropriate activity module and fill the form according to the information
-provided by your PSM.
-
-
+For more information, please visit http://www.wimba.com or contact sa...@wi...
\ No newline at end of file
Modified: trunk/moodle/README.txt
===================================================================
--- trunk/moodle/README.txt 2007-04-13 13:26:54 UTC (rev 189)
+++ trunk/moodle/README.txt 2007-04-19 11:47:58 UTC (rev 190)
@@ -1 +1,18 @@
-Horizon Wimba Moodle Integration aims at providing to the Moodle community integrations of the products developed by Horizon Wimba into Moodle. At this time, we plan to have quickly support for Live Classroom and Voice Tools Activity Modules.
\ No newline at end of file
+Wimba Modules enable institutions to easily enhance their Moodle courses by allowing seamless access to complementary applications. Wimba Modules allow instructors and students to access up to five tools from within the Moodle environment:
+
+ * Live Classroom: a live virtual classroom supporting multi-way audio, video, application sharing, polling and content display
+ * Voice Board: a threaded, voice-based discussion board that can also be used for one to one vocal exercises
+ * Voice Presentation: a presentation consisting of web content alongside voice messages
+ * Voice Recorder: a recorded message that a user can play back anytime, usually accompanying content within a web page (available only via the Wimba Voice Recorder Block)
+ * Wimba Podcaster: a tool that allows for the creation and subscription of podcasts
+
+Wimba Modules include the following features:
+
+ * Single Sign On: students and instructors seamlessly access Wimba Live Classroom and Voice Tools within Moodle. They do not need to log in again or type a URL.
+ * Integrated creation and management of Wimba tools: Instructors can easily create and manage Wimba tools using the Moodle interface. There is no need to access and learn a new administration interface.
+ * Consistent look and feel and navigation: Wimba tools look like, and can be used as, any other Moodle tool. Consequently, there is almost no learning curve to use it.
+
+
+These Modules require that a Wimba Live Classroom and/or Voice Tools server is in place to integrate with Moodle.
+
+For more information, please visit http://www.wimba.com or contact sa...@wi...
Deleted: trunk/moodle/mod/liveclassroom/README.txt
===================================================================
--- trunk/moodle/mod/liveclassroom/README.txt 2007-04-13 13:26:54 UTC (rev 189)
+++ trunk/moodle/mod/liveclassroom/README.txt 2007-04-19 11:47:58 UTC (rev 190)
@@ -1,59 +0,0 @@
-TODO: updqte this README file to make it hw4mdl specific.
-
-USING THE NEW MODULE TEMPLATE
------------------------------
-
-1. Unzip the archive and read this file ;-)
-
-2. Change the name of the directory to your new module name.
- This name should be a single english word, if possible,
- all lowercase and with only a-z characters. eg widget
-
-3. Edit all the files in this directory and change all the
- instances of NEWMODULE to your new module name (eg widget).
-
-4. Edit db/mysql.sql and put in the SQL database definitions
- for your module. The names of any table definitions you create
- there should use the prefix 'prefix_' instead of 'mdl_'
- (or whatever you've configured your moodle installation to use
- as a table prefix) (optional)
-
-5. Edit db/mysql.php and change all the instances of NEWMODULE
- to your new module name. (optional)
-
-6. Do the same for db/postgres7.sql and db/postgres7.php as you
- did for db/mysql.sql and db/mysql.php (optional)
-
-7. Create one or more language files for your module in
- lang/LANG/NEWMODULE.php where LANG is the language or
- languages you are creating the module for use with. (usually
- this will be 'en') Use one of the language files for another
- module as a template for the file.
-
-8. Visit the admin page and your module should be noticed and
- registered as a new entry in the table "modules".
-
-Now you can start adding code to the .php and .html files in
-this directory to make it do what you want!
-
-Note about database changes:
-
- Every time you update the database schema in the db directory,
- remember to
-
- - edit version.php with a higher version number
- - edit db/mysql.php with an execute_sql() call that
- upgrades the databases to the new format (see core
- modules for examples)
-
- and then visit the admin page to actually upgrade your databases.
-
-
-If you have problems, questions, suggestions etc then visit
-the "Activity modules" developers forum in the online
-course called "Using Moodle" at http:/* moodle.org */
-
-Or email me: ma...@mo...
-
-Cheers!
-Martin Dougiamas
Deleted: trunk/moodle/mod/voicetools/README.txt
===================================================================
--- trunk/moodle/mod/voicetools/README.txt 2007-04-13 13:26:54 UTC (rev 189)
+++ trunk/moodle/mod/voicetools/README.txt 2007-04-19 11:47:58 UTC (rev 190)
@@ -1,57 +0,0 @@
-USING THE NEW MODULE TEMPLATE
------------------------------
-
-1. Unzip the archive and read this file ;-)
-
-2. Change the name of the directory to your new module name.
- This name should be a single english word, if possible,
- all lowercase and with only a-z characters. eg widget
-
-3. Edit all the files in this directory and change all the
- instances of NEWMODULE to your new module name (eg widget).
-
-4. Edit db/mysql.sql and put in the SQL database definitions
- for your module. The names of any table definitions you create
- there should use the prefix 'prefix_' instead of 'mdl_'
- (or whatever you've configured your moodle installation to use
- as a table prefix) (optional)
-
-5. Edit db/mysql.php and change all the instances of NEWMODULE
- to your new module name. (optional)
-
-6. Do the same for db/postgres7.sql and db/postgres7.php as you
- did for db/mysql.sql and db/mysql.php (optional)
-
-7. Create one or more language files for your module in
- lang/LANG/NEWMODULE.php where LANG is the language or
- languages you are creating the module for use with. (usually
- this will be 'en') Use one of the language files for another
- module as a template for the file.
-
-8. Visit the admin page and your module should be noticed and
- registered as a new entry in the table "modules".
-
-Now you can start adding code to the .php and .html files in
-this directory to make it do what you want!
-
-Note about database changes:
-
- Every time you update the database schema in the db directory,
- remember to
-
- - edit version.php with a higher version number
- - edit db/mysql.php with an execute_sql() call that
- upgrades the databases to the new format (see core
- modules for examples)
-
- and then visit the admin page to actually upgrade your databases.
-
-
-If you have problems, questions, suggestions etc then visit
-the "Activity modules" developers forum in the online
-course called "Using Moodle" at http:/* moodle.org */
-
-Or email me: ma...@mo...
-
-Cheers!
-Martin Dougiamas
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-04-13 13:26:55
|
Revision: 189
http://svn.sourceforge.net/hw4mdl/?rev=189&view=rev
Author: hugues
Date: 2007-04-13 06:26:54 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
Tagging version 1.0
Added Paths:
-----------
tags/LC+VT_1.0/
Copied: tags/LC+VT_1.0 (from rev 188, trunk/moodle)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-17 20:56:39
|
Revision: 187
http://svn.sourceforge.net/hw4mdl/?rev=187&view=rev
Author: hugues
Date: 2007-01-17 12:56:35 -0800 (Wed, 17 Jan 2007)
Log Message:
-----------
Updating the package script with new version umber and removing the exit()
Modified Paths:
--------------
trunk/moodle/bin/package.sh
Modified: trunk/moodle/bin/package.sh
===================================================================
--- trunk/moodle/bin/package.sh 2007-01-17 10:28:17 UTC (rev 186)
+++ trunk/moodle/bin/package.sh 2007-01-17 20:56:35 UTC (rev 187)
@@ -5,7 +5,7 @@
SVN_URL_BASE=https://svn.sourceforge.net/svnroot/hw4mdl
-VERSION=1.0
+VERSION=1.0-SNAPSHOT
REPO_VERSION=`svn -q -r HEAD log ${SVN_URL_BASE} | awk '(NR==2) { print $1;}'`
if [ -n "$DEV" ]; then
@@ -24,8 +24,6 @@
SVN_URL_TRUNK=${SVN_URL_BASE}/trunk
SVN_URL_TAG=${SVN_URL_BASE}/tags/${SVN_TAG_PARAM}
-
-
if [ -n "$DEV" ]; then
SVN_URL=${SVN_URL_TRUNK}
else
@@ -36,8 +34,6 @@
echo "Using SVN url: "${SVN_URL}
fi
-exit -1;
-
BASEDIR=`pwd`
SVN_EXPORT_DIR=${BASEDIR}/export
BUILD_DIR=${BASEDIR}/build
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-17 10:28:18
|
Revision: 186
http://svn.sourceforge.net/hw4mdl/?rev=186&view=rev
Author: hugues
Date: 2007-01-17 02:28:17 -0800 (Wed, 17 Jan 2007)
Log Message:
-----------
forgot to remove the debug code, not important
Modified Paths:
--------------
tags/liveclassroom_0.9/moodle/bin/package.sh
Modified: tags/liveclassroom_0.9/moodle/bin/package.sh
===================================================================
--- tags/liveclassroom_0.9/moodle/bin/package.sh 2007-01-17 10:24:54 UTC (rev 185)
+++ tags/liveclassroom_0.9/moodle/bin/package.sh 2007-01-17 10:28:17 UTC (rev 186)
@@ -36,8 +36,6 @@
echo "Using SVN url: "${SVN_URL}
fi
-exit -1;
-
BASEDIR=`pwd`
SVN_EXPORT_DIR=${BASEDIR}/export
BUILD_DIR=${BASEDIR}/build
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-17 10:24:58
|
Revision: 185
http://svn.sourceforge.net/hw4mdl/?rev=185&view=rev
Author: hugues
Date: 2007-01-17 02:24:54 -0800 (Wed, 17 Jan 2007)
Log Message:
-----------
Tagging HW Module version 0.9
Added Paths:
-----------
tags/liveclassroom_0.9/
Copied: tags/liveclassroom_0.9 (from rev 183, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-17 10:03:15
|
Revision: 184
http://svn.sourceforge.net/hw4mdl/?rev=184&view=rev
Author: hugues
Date: 2007-01-17 02:03:09 -0800 (Wed, 17 Jan 2007)
Log Message:
-----------
Preparing for next release: 1.0
Modified Paths:
--------------
trunk/moodle/bin/package.sh
Modified: trunk/moodle/bin/package.sh
===================================================================
--- trunk/moodle/bin/package.sh 2007-01-17 10:01:27 UTC (rev 183)
+++ trunk/moodle/bin/package.sh 2007-01-17 10:03:09 UTC (rev 184)
@@ -1,11 +1,11 @@
#!/bin/bash
DEBUG=1
-#DEV=1
+DEV=1
SVN_URL_BASE=https://svn.sourceforge.net/svnroot/hw4mdl
-VERSION=0.9
+VERSION=1.0
REPO_VERSION=`svn -q -r HEAD log ${SVN_URL_BASE} | awk '(NR==2) { print $1;}'`
if [ -n "$DEV" ]; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-17 10:01:31
|
Revision: 183
http://svn.sourceforge.net/hw4mdl/?rev=183&view=rev
Author: hugues
Date: 2007-01-17 02:01:27 -0800 (Wed, 17 Jan 2007)
Log Message:
-----------
Preparing tag liveclassroom 0.9
Modified Paths:
--------------
trunk/moodle/bin/package.sh
Modified: trunk/moodle/bin/package.sh
===================================================================
--- trunk/moodle/bin/package.sh 2007-01-16 20:33:35 UTC (rev 182)
+++ trunk/moodle/bin/package.sh 2007-01-17 10:01:27 UTC (rev 183)
@@ -1,30 +1,42 @@
#!/bin/bash
DEBUG=1
+#DEV=1
-
SVN_URL_BASE=https://svn.sourceforge.net/svnroot/hw4mdl
-SVN_URL_TRUNK=${SVN_URL_BASE}/trunk
-SVN_URL_TAG=${SVN_URL_BASE}/tags/${SVN_TAG_PARAM}
-VERSION=0.9-SNAPSHOT_`svn -q -r HEAD log ${SVN_URL_BASE} | awk '(NR==2) { print $1;}'`
+VERSION=0.9
+REPO_VERSION=`svn -q -r HEAD log ${SVN_URL_BASE} | awk '(NR==2) { print $1;}'`
+if [ -n "$DEV" ]; then
+ VERSION=$VERSION_$REPO_VERSION
+fi
+
+PACKAGE=WimbaMoodle-${VERSION}
+
TARGET=liveclassroom
#TARGET=liveclassroom, voicetool, pronto
-
-PACKAGE=WimbaMoodle-${VERSION}
-
SVN_USER_PARAM=
SVN_PASS_PARAM=
SVN_TAG_PARAM=${TARGET}_${VERSION}
+SVN_URL_TRUNK=${SVN_URL_BASE}/trunk
+SVN_URL_TAG=${SVN_URL_BASE}/tags/${SVN_TAG_PARAM}
+
+
+if [ -n "$DEV" ]; then
+ SVN_URL=${SVN_URL_TRUNK}
+else
+ SVN_URL=${SVN_URL_TAG}
+fi
+
if [ -n "$DEBUG" ]; then
- echo "Using SVN_TRUNK"
+ echo "Using SVN url: "${SVN_URL}
fi
-SVN_URL=${SVN_URL_TRUNK}
+exit -1;
BASEDIR=`pwd`
SVN_EXPORT_DIR=${BASEDIR}/export
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-01-16 20:33:36
|
Revision: 182
http://svn.sourceforge.net/hw4mdl/?rev=182&view=rev
Author: tomroro
Date: 2007-01-16 12:33:35 -0800 (Tue, 16 Jan 2007)
Log Message:
-----------
fix the bug 10765
Problen with the focus with ie.
I updated the function called when you click on search field
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/js/hwCommons.js
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-16 18:55:23 UTC (rev 181)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-16 20:33:35 UTC (rev 182)
@@ -520,11 +520,13 @@
}
+
function initSearch(search){
currentProduct="";
+ document.getElementById(currentId).style.backgroundColor="white";
currentId="";
currentNid=""
- manageXml(search,"all");
+ manageXml("","toolBar",false);
document.getElementById("search").focus();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-16 18:55:26
|
Revision: 181
http://svn.sourceforge.net/hw4mdl/?rev=181&view=rev
Author: hugues
Date: 2007-01-16 10:55:23 -0800 (Tue, 16 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10766
- Fixed the Javascript error
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/view.php
Modified: trunk/moodle/mod/liveclassroom/view.php
===================================================================
--- trunk/moodle/mod/liveclassroom/view.php 2007-01-11 21:55:02 UTC (rev 180)
+++ trunk/moodle/mod/liveclassroom/view.php 2007-01-16 18:55:23 UTC (rev 181)
@@ -87,18 +87,18 @@
<script type="text/javascript" src='<?PHP p($CFG->liveclassroom_servername)?>/js/launch.js'></script>
<script type="text/javascript">
-function monitor (name, destination) {
- if (win[name] == null) {
- setTimeout(monitor(name, destination), 1000);
+function monitor () {
+ if (win['horizonWin'] == null) {
+ setTimeout("monitor()", 1000);
}
else { // window exists
- location.href= destination;
+ location.href='<?php p("$CFG->wwwroot/course/view.php?id=$course->id")?>';
}
}
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);
+ setTimeout ("monitor()", 1000);
}
startActivity();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-11 21:55:17
|
Revision: 180
http://svn.sourceforge.net/hw4mdl/?rev=180&view=rev
Author: hugues
Date: 2007-01-11 13:55:02 -0800 (Thu, 11 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10738
- Fixed some variable name typos
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/api.php
trunk/moodle/mod/liveclassroom/lib.php
Modified: trunk/moodle/mod/liveclassroom/api.php
===================================================================
--- trunk/moodle/mod/liveclassroom/api.php 2007-01-11 15:25:54 UTC (rev 179)
+++ trunk/moodle/mod/liveclassroom/api.php 2007-01-11 21:55:02 UTC (rev 180)
@@ -417,7 +417,6 @@
$data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_DELETE_ROLE, "&target=$roomid&user_id=$userid&role_id=$role");
-
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
@@ -909,27 +908,25 @@
function liveclassroom_api_get_student_user_id ($courseid){
global $CFG;
- $course = get_record("course", "id", $courseid);
+ $course = get_record("course", "id", $courseid);
+ if (empty($course)) {
+ error(_FUNCTION_." empty course");
+ }
$enc_coursename = str_replace(" ", "_", $course->shortname);
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_USER, "&filter00=last_name&filter00value=$enc_coursename&filter01=first_name&filter01value=Student");
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_LIST_USER, "&filter01=last_name&filter01value=$enc_coursename&filter02=first_name&filter02value=Student");
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
- if ( $respcode != 100) {
- return false;
- }
+ if ( $respcode != 100) {
+ return false;
+ }
$line = explode("\n",$data);
-// $tok = split("100 OK",$data);
- // $tok1 = split($LIVECLASSROOM_API_RECORD_SEPERATOR,$tok[1]);
-// $result = liveclassroom_parse_line($tok1[0],"user_id=");
$result = liveclassroom_parse_line($line[1],"user_id=");
- //Remove le " " at the end of the line
- //$response = substr($result,0,-1);
return $result;
@@ -946,7 +943,7 @@
function liveclassroom_api_room_is_preview ($roomid){
global $CFG;
- $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, "&filter00=class_id&filter00value=$roomid&filter01=preview&filter01value=0");
+ $data = liveclassroom_api_send_query(LIVECLASSROOM_API_FUNCTION_GET_ROOM_LIST, "&filter01=class_id&filter01value=$roomid&filter02=preview&filter02value=0");
preg_match("(\d*)", $data, $matches);
$respcode = $matches[0];
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2007-01-11 15:25:54 UTC (rev 179)
+++ trunk/moodle/mod/liveclassroom/lib.php 2007-01-11 21:55:02 UTC (rev 180)
@@ -307,11 +307,9 @@
$userid = LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.
($isteacher?LIVECLASSROOM_TEACHER_SUFFIX:LIVECLASSROOM_STUDENT_SUFFIX);
-
$nickname = fullname($USER);
-
return liveclassroom_api_get_session ($userid, $nickname);
}
@@ -320,42 +318,54 @@
* Updates the parameters of a room
*
*/
-function liveclassroom_update_room ($course_id, $roomname, $instructor_led, $attributes) {
+function liveclassroom_update_room ($courseid, $roomname, $instructor_led, $attributes) {
- $student_id = liveclassroom_api_get_student_user_id ($courseid) ;
+ $roomid = $attributes['roomId_Field'];
+ unset($attributes['roomId_Field']);
+ $studentid = liveclassroom_api_get_student_user_id ($courseid) ;
+
//set media_type and media_format according to the appropriate values according to the media_type attribute
$attributes = liveclassroom_check_media($attributes);
$attributes = liveclassroom_check_chat($attributes);
- //print_r($list_attributes);
//Test if the type of room has been changed
if($_SESSION['led']!=$attributes['led']) { // Type changed
- if($list_attributes['led']=='instructor'){
- liveclassroom_api_remove_user_role ($_GET['id'], $student_id, 'Instructor') ;
- liveclassroom_api_add_user_role ($_GET['id'], $student_id, 'Student');
+ if($attributes['led']=='instructor'){
+
+ if (! liveclassroom_api_remove_user_role ($roomid, $studentid, 'Instructor')) {
+ return false;
+ }
+
+ if (! liveclassroom_api_add_user_role ($roomid, $studentid, 'Student')) {
+ return false;
+ }
}
else {
- liveclassroom_api_remove_user_role ($_GET['id'], $student_id , 'Student') ;
- liveclassroom_api_add_user_role ($_GET['id'], $student_id, 'Instructor');
+
+ if (!liveclassroom_api_remove_user_role ($roomid, $studentid , 'Student')) {
+ return false;
+ }
+ if (!liveclassroom_api_add_user_role ($roomid, $studentid, 'Instructor')) {
+ return false;
+ }
}
}
unset($attributes['led']);
unset($attributes['link']);
- unset($attributes['roomId_Field']);
//print_r($list_attributes);
- if(!liveclassroom_api_modify_room($_GET['id'],$attributes)) {
+ if(!liveclassroom_api_modify_room($roomid, $attributes)) {
return false;
}
//Guest enabled?
if ($attributes['guests']==1) {
- if (! liveclassroom_api_add_user_role ($_GET['id'], 'Guest' , 'Student')) {
+ if (! liveclassroom_api_add_user_role ($roomid, 'Guest' , 'Student')) {
return false;
}
}
else if ($attributes['guest']==0) {
- if (! liveclassroom_api_remove_user_role ($_GET['id'], 'Guest' , 'Student')) {
+ if (! liveclassroom_api_remove_user_role ($roomid, 'Guest' , 'Student')) {
return false;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-11 15:25:58
|
Revision: 179
http://svn.sourceforge.net/hw4mdl/?rev=179&view=rev
Author: hugues
Date: 2007-01-11 07:25:54 -0800 (Thu, 11 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10616
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10547
- Added a function that handles the chat business logics
- Update the fields to reflect the names in the javascript (it was reverted in a previous commit after I fixed it.)
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/js/hwCommons.js
trunk/moodle/mod/liveclassroom/lib.php
trunk/moodle/mod/liveclassroom/manageRoomAction.php
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-10 21:13:21 UTC (rev 178)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-11 15:25:54 UTC (rev 179)
@@ -878,7 +878,7 @@
$linepart->append_child($align);
$parameters=array("type" => "radio", "value" => "1",
"id" => "privatechatenable",
- "name" => "privateChatEnable") ;
+ "name" => "privateChatEnabled") ;
if($action=='update'){
if($room_info['privatechatenable']==1) {
$parameters['checked']=true;
@@ -916,7 +916,7 @@
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
$parameters=array("type" => "radio", "value" => "0",
- "id" => "privatedisabled", "name" => "privateChatEnable") ;
+ "id" => "privatedisabled", "name" => "privateChatEnabled") ;
if($action=='update'){
if($room_info['privatechatenable']==0) {
$parameters['checked']=true;
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-10 21:13:21 UTC (rev 178)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-11 15:25:54 UTC (rev 179)
@@ -19,7 +19,6 @@
function doChangeChat() {
var radio = document.forms[0].privateChatEnabled;
-
for (i=0; i<radio.length; i++) {
radio[i].disabled = !document.forms[0].chatenable.checked;
}
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2007-01-10 21:13:21 UTC (rev 178)
+++ trunk/moodle/mod/liveclassroom/lib.php 2007-01-11 15:25:54 UTC (rev 179)
@@ -326,6 +326,7 @@
//set media_type and media_format according to the appropriate values according to the media_type attribute
$attributes = liveclassroom_check_media($attributes);
+ $attributes = liveclassroom_check_chat($attributes);
//print_r($list_attributes);
//Test if the type of room has been changed
@@ -341,6 +342,7 @@
}
unset($attributes['led']);
unset($attributes['link']);
+ unset($attributes['roomId_Field']);
//print_r($list_attributes);
if(!liveclassroom_api_modify_room($_GET['id'],$attributes)) {
@@ -378,6 +380,7 @@
//set media_type and media_format according to the appropriate values according to the media_type attribute
$attributes = liveclassroom_check_media($attributes);
+ $attributes = liveclassroom_check_chat($attributes);
if (! liveclassroom_api_create_class ($roomid, $roomname, $instructor_led, $attributes)) {
@@ -399,8 +402,37 @@
return true;
}
+/**
+ * Business rules for text chat
+ *
+ */
+function liveclassroom_check_chat($attributes) {
+ if ($attributes['led']=='instructor') {
+ if (!isset($attributes['chatenable']) || $attributes['chatenable'] == 0) {
+ $attributes['chatenable'] = '0';
+ $attributes['privatechatenable'] = '0';
+ //unset($attributes['privateChatEnabled']);
+
+ return $attributes;
+ }
+
+ $attributes['privatechatenable'] = $attributes['privateChatEnabled'];
+ unset($attributes['privateChatEnabled']);
+
+ return $attributes;
+ }
+ else {
+ $attributes['chatenable'] = '1';
+ $attributes['privatechatenable'] = '1';
+ unset($attributes['privateChatEnabled']);
+ return $attributes;
+ }
+}
+
+
+
function liveclassroom_adjust_roles ($roomid, $enc_coursename, $instructor_led) {
$teacherid = LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.LIVECLASSROOM_TEACHER_SUFFIX;
Modified: trunk/moodle/mod/liveclassroom/manageRoomAction.php
===================================================================
--- trunk/moodle/mod/liveclassroom/manageRoomAction.php 2007-01-10 21:13:21 UTC (rev 178)
+++ trunk/moodle/mod/liveclassroom/manageRoomAction.php 2007-01-11 15:25:54 UTC (rev 179)
@@ -64,7 +64,6 @@
if($_GET['action']=='createRoom') {
if($list_attributes['led']=='instructor'){
$bool = true;
- if (!isset($list_attributes['chatenable'])) $list_attributes['chatenable']="0";
if (!isset($list_attributes['student_wb_liveapp'])) $list_attributes['student_wb_liveapp']="0";
if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']="0";
if (!isset($list_attributes['hms_simulcast_restricted'])) $list_attributes['hms_simulcast_restricted']=1;
@@ -90,7 +89,6 @@
$instructor_led = ($list_attributes['led']=='instructor');
if($instructor_led){
- if (!isset($list_attributes['chatenable'])) $list_attributes['chatenable']="0";
if (!isset($list_attributes['student_wb_liveapp'])) $list_attributes['student_wb_liveapp']="0";
if (!isset($list_attributes['hms_two_way_enabled'])) $list_attributes['hms_two_way_enabled']="0";
if (!isset($list_attributes['hms_simulcast_restricted'])) $list_attributes['hms_simulcast_restricted']=1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-01-10 21:13:22
|
Revision: 178
http://svn.sourceforge.net/hw4mdl/?rev=178&view=rev
Author: tomroro
Date: 2007-01-10 13:13:21 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
I forget to update the javascript function which manage the display of the tab
->fixed bug#10706
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/js/manageXml.js
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 17:01:35 UTC (rev 177)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 21:13:21 UTC (rev 178)
@@ -834,14 +834,15 @@
}
+
function DisplayTab(panelInformations){
var display="";
var context=new String(panelInformations[0].getElements("contextDisplay")[0].getText());
-
+
if(context.indexOf("all")!=-1 || context.indexOf(typeSelect)!=-1)
- display +="<td onclick='onTab("+panelInformations[0].getElements("position")[0].getText()+")' onmouseover='onOver("+panelInformations[0].getElements("position")[0].getText()+")' onmouseout='onOut("+panelInformations[0].getElements("position")[0].getText()+")'id='tab"+panelInformations[0].getElements("position")[0].getText()+"' class='"+panelInformations[0].getElements("styleEnabled")[0].getText()+"' ";
+ display +="<td onclick='onTab("+panelInformations[0].getElements("position")[0].getText()+")' id='tab"+panelInformations[0].getElements("position")[0].getText()+"' class='"+panelInformations[0].getElements("styleEnabled")[0].getText()+"' ";
else
display +="<td class='"+panelInformations[0].getElements("styleDisabled")[0].getText()+"' ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-10 17:01:40
|
Revision: 177
http://svn.sourceforge.net/hw4mdl/?rev=177&view=rev
Author: hugues
Date: 2007-01-10 09:01:35 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10077
Included the help files in the package
Modified Paths:
--------------
trunk/moodle/bin/package.sh
Modified: trunk/moodle/bin/package.sh
===================================================================
--- trunk/moodle/bin/package.sh 2007-01-10 15:36:59 UTC (rev 176)
+++ trunk/moodle/bin/package.sh 2007-01-10 17:01:35 UTC (rev 177)
@@ -93,6 +93,8 @@
LANG_EXPORT_DIR="${SVN_EXPORT_DIR}/moodle/lang"
LANG_BUILD_DIR="${BUILD_DIR}/${package}/lang"
+
+ # Copy the appropriate lang file
for afile in `find ${LANG_EXPORT_DIR} -name "${target}.php"` ; do
src=`dirname ${afile}`
dst=${src/#${LANG_EXPORT_DIR}/${LANG_BUILD_DIR}}
@@ -100,6 +102,16 @@
cp -r ${afile} ${dst}
done
+ # Copy the appropriate help files
+ for afile in `find ${LANG_EXPORT_DIR/help} -name "${target}"` ; do
+ src=`dirname ${afile}`
+ dst=${src/#${LANG_EXPORT_DIR}/${LANG_BUILD_DIR}}
+ mkdir -p ${dst}
+ cp -r ${afile} ${dst}
+ done
+
+
+
cp \
${SVN_EXPORT_DIR}/moodle/README.txt\
${SVN_EXPORT_DIR}/moodle/LICENSE.txt\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-10 15:37:06
|
Revision: 176
http://svn.sourceforge.net/hw4mdl/?rev=176&view=rev
Author: hugues
Date: 2007-01-10 07:36:59 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
Fixing the revision number
Modified Paths:
--------------
trunk/moodle/bin/package.sh
Modified: trunk/moodle/bin/package.sh
===================================================================
--- trunk/moodle/bin/package.sh 2007-01-10 11:28:38 UTC (rev 175)
+++ trunk/moodle/bin/package.sh 2007-01-10 15:36:59 UTC (rev 176)
@@ -7,7 +7,7 @@
SVN_URL_TRUNK=${SVN_URL_BASE}/trunk
SVN_URL_TAG=${SVN_URL_BASE}/tags/${SVN_TAG_PARAM}
-VERSION=0.9-SNAPSHOT_rev`svn info ${SVN_URL_BASE} | awk '/Revision/ { print $2;}'`
+VERSION=0.9-SNAPSHOT_`svn -q -r HEAD log ${SVN_URL_BASE} | awk '(NR==2) { print $1;}'`
TARGET=liveclassroom
#TARGET=liveclassroom, voicetool, pronto
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-10 11:28:44
|
Revision: 175
http://svn.sourceforge.net/hw4mdl/?rev=175&view=rev
Author: hugues
Date: 2007-01-10 03:28:38 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10578
- Looks a bit better. The dotted line is not really nicely aligned though. Cannot do more than this today.
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/css/StyleSheet.css
trunk/moodle/mod/liveclassroom/js/manageXml.js
Modified: trunk/moodle/mod/liveclassroom/css/StyleSheet.css
===================================================================
--- trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-10 10:21:32 UTC (rev 174)
+++ trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-10 11:28:38 UTC (rev 175)
@@ -294,22 +294,22 @@
cursor:default;
}
-.archive td{
-
- font-family:Verdana;
- color:#666666;
- font-style:italic;
- font-size:11px;
-border-bottom:solid 1px #F3F3F3;
+.archive td{
+ padding-left: 5px;
+ font-family:Verdana;
+ color:#666666;
+ font-style:italic;
+ font-size:11px;
+ border-bottom:solid 1px #F3F3F3;
}
.room td{
padding-left:5px ;
- font-family:Verdana;
- color:Black;
- font-size:10;
- border-bottom:solid 1px #F3F3F3;
- cursor:default;
+ font-family:Verdana;
+ color:Black;
+ font-size:10;
+ border-bottom:solid 1px #F3F3F3;
+ cursor:default;
}
.archive label{
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 10:21:32 UTC (rev 174)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 11:28:38 UTC (rev 175)
@@ -731,7 +731,7 @@
if(archive!=""){
- var display="<tr><td colspan=5 style='padding:0px 0px 0px 0px'><div id='"+roomId+"hide' class='hide' >";
+ var display="<tr><td colspan=\"5\" style='padding:0px 0px 0px 0px'><div id='"+roomId+"hide' class='hide' >";
display += " <table width=100% cellspacing=0 cellpadding=1 border=0>";
for(var i=0; i< archive.length; i++)
{
@@ -739,10 +739,10 @@
display += "<tr id="+archive[i].getElements("id")[0].getText()+" height=16px Onclick=\"OneClick('"+archive[i].getElements("id")[0].getText()+"','"+LC_PRODUCT+"')\" Ondblclick=\"javascript:startHorizon('"+archive[i].getElements("id")[0].getText()+"', null, null, null, null, 'hzA="+session["authToken"]+"')\" class='archive'>"
- display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.jpg\" border=\"0\" /></td>";
- display += "<td style=\"padding-left:7px;\" width=16px align=\"left\"><img src=\"pictures/items/listitem-subitem.jpg\" border=\"0\" /></td>";
+ display += "<td width=\"16px\" align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.jpg\" border=\"0\" /></td>";
+ display += "<td class=\"subitem\" width=\"16px\" align=\"right\"><img src=\"pictures/items/listitem-subitem.jpg\" border=\"0\" /></td>";
display += "<td width='300px'><label onmousemove='javascript:ShowToolTip(event,\""+archive[i].getElements("nameDisplay")[0].getText()+"\",\""+archive[i].getElements("preview")[0].getText()+"\")' onmouseout='javascript:HideToolTip()'>"+archive[i].getElements("nameDisplay")[0].getText()+"</label></td>";
- display += "<td class='shiftAvailability' align=right><img src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".jpg\"/></td>";
+ display += "<td class='shiftAvailability' align=right><img src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".jpg\"/></td>";
display += "</tr>";
}else{
closeArchive++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-10 10:21:34
|
Revision: 174
http://svn.sourceforge.net/hw4mdl/?rev=174&view=rev
Author: hugues
Date: 2007-01-10 02:21:32 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10632
- Fixed the targetting options to remove the "back" button.
- The report information will appear in the very same window.
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/reports.php
Modified: trunk/moodle/mod/liveclassroom/reports.php
===================================================================
--- trunk/moodle/mod/liveclassroom/reports.php 2007-01-10 07:59:32 UTC (rev 173)
+++ trunk/moodle/mod/liveclassroom/reports.php 2007-01-10 10:21:32 UTC (rev 174)
@@ -57,7 +57,7 @@
<tr>
<td colspan=2>
- <a class="underline inline external" target="frameReport" href="<?php echo $CFG->liveclassroom_servername;?>/admin/class/results.epl?class_id=<?php echo $roomId; ?>&hzA=<?php echo $token; ?>" title="Poll Results">Poll Results</a>
+ <a style="text-decoration:underline;" href="<?php echo $CFG->liveclassroom_servername;?>/admin/class/results.epl?class_id=<?php echo $roomId; ?>&hzA=<?php echo $token; ?>" title="Poll Results">Poll Results</a>
<div class="helptext">
View the results from all advanced polls that have been conducted in this room or archive.
@@ -68,7 +68,7 @@
<tr>
<td colspan=2>
<br />
- <a class="underline inline external" target="frameReport" href="<?php p($CFG->liveclassroom_servername)?>/admin/server/tracking.pl?mode=detailed&popup=1&channel=<?php echo $roomId; ?>&hzA=<?php echo $token; ?>" title="Tracking">Tracking</a>
+ <a style="text-decoration:underline;" href="<?php p($CFG->liveclassroom_servername)?>/admin/server/tracking.pl?mode=detailed&popup=1&channel=<?php echo $roomId; ?>&hzA=<?php echo $token; ?>" title="Tracking">Tracking</a>
<div class="helptext">
View statistics on who has entered this room or archive, when they arrived, and the duration of their stay
@@ -79,7 +79,7 @@
<tr>
<td colspan=2>
<br />
- <a class="underline" target="frameReport" href="<?php p($CFG->liveclassroom_servername)?>/admin/class/chatlog.epl?class_id=<?php echo $roomId; ?>&hzA=<?php echo $token; ?>" title="Chat Logs">Chat Logs</a>
+ <a style="text-decoration:underline;" href="<?php p($CFG->liveclassroom_servername)?>/admin/class/chatlog.epl?class_id=<?php echo $roomId; ?>&hzA=<?php echo $token; ?>" title="Chat Logs">Chat Logs</a>
<div class="helptext">
View chat logs recorded during this archive
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-10 07:59:38
|
Revision: 173
http://svn.sourceforge.net/hw4mdl/?rev=173&view=rev
Author: hugues
Date: 2007-01-09 23:59:32 -0800 (Tue, 09 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10077
- Added help files (as oposed to documentation on docs.moodle.org) to the lang folder
Modified Paths:
--------------
trunk/moodle/lang/fr/liveclassroom.php
trunk/moodle/lang/fr_utf8/liveclassroom.php
trunk/moodle/mod/voicetool/mod.html
Added Paths:
-----------
trunk/moodle/lang/en/help/
trunk/moodle/lang/en/help/liveclassroom/
trunk/moodle/lang/en/help/liveclassroom/mods.html
trunk/moodle/lang/en_utf8/help/
trunk/moodle/lang/en_utf8/help/liveclassroom/
trunk/moodle/lang/en_utf8/help/liveclassroom/mods.html
trunk/moodle/lang/fr/help/
trunk/moodle/lang/fr/help/liveclassroom/
trunk/moodle/lang/fr/help/liveclassroom/mods.html
trunk/moodle/lang/fr_utf8/help/
trunk/moodle/lang/fr_utf8/help/liveclassroom/
trunk/moodle/lang/fr_utf8/help/liveclassroom/mods.html
Added: trunk/moodle/lang/en/help/liveclassroom/mods.html
===================================================================
--- trunk/moodle/lang/en/help/liveclassroom/mods.html (rev 0)
+++ trunk/moodle/lang/en/help/liveclassroom/mods.html 2007-01-10 07:59:32 UTC (rev 173)
@@ -0,0 +1,14 @@
+<p><img alt="" src="<?php echo $CFG->wwwroot?>/mod/liveclassroom/icon.gif" /> <b>Live Classroom</b></p>
+<div class="indent">
+<p>
+ Live Classroom allows students and instructors to meet synchronously online,
+ using multi-way Voice over IP audio, application sharing, and content display,
+ enabling instructors to add vitally important elements of interaction that
+ simply cannot be provided in a text-based course. Sessions within Live
+ Classroom may be recorded for future review.
+</p>
+<p>
+ Two types of Live Classrooms are available: Lecture rooms are instructor-led,
+ while Discussion rooms provide shared presentation rights to both students and
+ instructors, designed for student collaboration in the absence of an instructor.
+</div>
Property changes on: trunk/moodle/lang/en/help/liveclassroom/mods.html
___________________________________________________________________
Name: svn:mime-type
+ text/html
Name: svn:keywords
+ Date Revision Author Id
Name: svn:eol-style
+ native
Added: trunk/moodle/lang/en_utf8/help/liveclassroom/mods.html
===================================================================
--- trunk/moodle/lang/en_utf8/help/liveclassroom/mods.html (rev 0)
+++ trunk/moodle/lang/en_utf8/help/liveclassroom/mods.html 2007-01-10 07:59:32 UTC (rev 173)
@@ -0,0 +1,14 @@
+<p><img alt="" src="<?php echo $CFG->wwwroot?>/mod/liveclassroom/icon.gif" /> <b>Live Classroom</b></p>
+<div class="indent">
+<p>
+ Live Classroom allows students and instructors to meet synchronously online,
+ using multi-way Voice over IP audio, application sharing, and content display,
+ enabling instructors to add vitally important elements of interaction that
+ simply cannot be provided in a text-based course. Sessions within Live
+ Classroom may be recorded for future review.
+</p>
+<p>
+ Two types of Live Classrooms are available: Lecture rooms are instructor-led,
+ while Discussion rooms provide shared presentation rights to both students and
+ instructors, designed for student collaboration in the absence of an instructor.
+</div>
Property changes on: trunk/moodle/lang/en_utf8/help/liveclassroom/mods.html
___________________________________________________________________
Name: svn:mime-type
+ text/html
Name: svn:keywords
+ Date Revision Author Id
Name: svn:eol-style
+ native
Added: trunk/moodle/lang/fr/help/liveclassroom/mods.html
===================================================================
--- trunk/moodle/lang/fr/help/liveclassroom/mods.html (rev 0)
+++ trunk/moodle/lang/fr/help/liveclassroom/mods.html 2007-01-10 07:59:32 UTC (rev 173)
@@ -0,0 +1,15 @@
+<p><img alt="" src="<?php echo $CFG->wwwroot?>/mod/liveclassroom/icon.gif" /> <b>Live Classroom</b></p>
+<div class="indent">
+<p>
+ Live Classroom permet aux \x8Etudiants et aux instructeurs de se rencontrer en
+ ligne en utilisant la voix sur IP, le partage d'application, et l'afichage de
+ contenu. Ceci permets aux instructeur d'ajouter d'importants \x8El\x8Ements
+ d'interaction qui ne peuvent \x90tre apport\x8Es par le contenu textuel. Les sessions
+ de Live Classroom peuvent \x90tre enregistr\x8Ees pour un visionnage futur.
+</p>
+<p>
+ Deux types de Live Classrooms sont disponibles: les Salles de Classe sont
+ dirig\x8Ees par l'instructeur, tandis que les Salles de Discussion donnent les
+ m\x90mes droits aux instructeurs et aux \x8Etudiants, permettant la collaboration
+ entre \x8Etudiants en l'absence d'un instructeur.
+</div>
Property changes on: trunk/moodle/lang/fr/help/liveclassroom/mods.html
___________________________________________________________________
Name: svn:mime-type
+ text/html
Name: svn:keywords
+ Date Revision Author Id
Name: svn:eol-style
+ native
Modified: trunk/moodle/lang/fr/liveclassroom.php
===================================================================
--- trunk/moodle/lang/fr/liveclassroom.php 2007-01-10 00:24:15 UTC (rev 172)
+++ trunk/moodle/lang/fr/liveclassroom.php 2007-01-10 07:59:32 UTC (rev 173)
@@ -56,7 +56,7 @@
//Add activity form
$string['name'] = 'Nom';
$string['liveclassroomtype'] = 'Live Classroom Associée';
-$string['topicformat'] = 'Sujet de l\activité';
+$string['topicformat'] = 'Sujet de l\'activité';
$string['weeksformat'] = 'Semaine de l\'activité';
$string['requiredfields'] = 'Champs nécessaires';
$string['topicdisplay'] = 'Sujet';
Added: trunk/moodle/lang/fr_utf8/help/liveclassroom/mods.html
===================================================================
--- trunk/moodle/lang/fr_utf8/help/liveclassroom/mods.html (rev 0)
+++ trunk/moodle/lang/fr_utf8/help/liveclassroom/mods.html 2007-01-10 07:59:32 UTC (rev 173)
@@ -0,0 +1,15 @@
+<p><img alt="" src="<?php echo $CFG->wwwroot?>/mod/liveclassroom/icon.gif" /> <b>Live Classroom</b></p>
+<div class="indent">
+<p>
+ Live Classroom permet aux \x8Etudiants et aux instructeurs de se rencontrer en
+ ligne en utilisant la voix sur IP, le partage d'application, et l'afichage de
+ contenu. Ceci permets aux instructeur d'ajouter d'importants \x8El\x8Ements
+ d'interaction qui ne peuvent \x90tre apport\x8Es par le contenu textuel. Les sessions
+ de Live Classroom peuvent \x90tre enregistr\x8Ees pour un visionnage futur.
+</p>
+<p>
+ Deux types de Live Classrooms sont disponibles: les Salles de Classe sont
+ dirig\x8Ees par l'instructeur, tandis que les Salles de Discussion donnent les
+ m\x90mes droits aux instructeurs et aux \x8Etudiants, permettant la collaboration
+ entre \x8Etudiants en l'absence d'un instructeur.
+</div>
Property changes on: trunk/moodle/lang/fr_utf8/help/liveclassroom/mods.html
___________________________________________________________________
Name: svn:mime-type
+ text/html
Name: svn:keywords
+ Date Revision Author Id
Name: svn:eol-style
+ native
Modified: trunk/moodle/lang/fr_utf8/liveclassroom.php
===================================================================
--- trunk/moodle/lang/fr_utf8/liveclassroom.php 2007-01-10 00:24:15 UTC (rev 172)
+++ trunk/moodle/lang/fr_utf8/liveclassroom.php 2007-01-10 07:59:32 UTC (rev 173)
@@ -56,7 +56,7 @@
//Add activity form
$string['name'] = 'Nom';
$string['liveclassroomtype'] = 'Live Classroom Associée';
-$string['topicformat'] = 'Sujet de l\activité';
+$string['topicformat'] = 'Sujet de l\'activité';
$string['weeksformat'] = 'Semaine de l\'activité';
$string['requiredfields'] = 'Champs nécessaires';
$string['topicdisplay'] = 'Sujet';
Modified: trunk/moodle/mod/voicetool/mod.html
===================================================================
--- trunk/moodle/mod/voicetool/mod.html 2007-01-10 00:24:15 UTC (rev 172)
+++ trunk/moodle/mod/voicetool/mod.html 2007-01-10 07:59:32 UTC (rev 173)
@@ -7,7 +7,7 @@
require_once('api.php');
require_once($CFG->dirroot.'/calendar/lib.php');
- require_once($CFG->dirroot.'/mod/voicetools/lib.php');
+ require_once($CFG->dirroot.'/mod/voicetool/lib.php');
$id = optional_param('id', 0, PARAM_INT);
require_once("../config.php");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-01-10 00:24:16
|
Revision: 172
http://svn.sourceforge.net/hw4mdl/?rev=172&view=rev
Author: tomroro
Date: 2007-01-09 16:24:15 -0800 (Tue, 09 Jan 2007)
Log Message:
-----------
fix the bug#10637
problem with the variable used to determinate the current tab, this variable was not initialize when it was necessary(call to the settings).
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/css/StyleSheet.css
trunk/moodle/mod/liveclassroom/js/Ajax.js
trunk/moodle/mod/liveclassroom/js/hwCommons.js
trunk/moodle/mod/liveclassroom/js/manageXml.js
trunk/moodle/mod/liveclassroom/pictures/items/Thumbs.db
Added Paths:
-----------
trunk/moodle/mod/liveclassroom/pictures/items/tab-selected.gif
trunk/moodle/mod/liveclassroom/pictures/items/tab-unselected.gif
Removed Paths:
-------------
trunk/moodle/mod/liveclassroom/pictures/tab.gif
trunk/moodle/mod/liveclassroom/pictures/tab_Select.gif
trunk/moodle/mod/liveclassroom/pictures/tab_disabled.gif
trunk/moodle/mod/liveclassroom/pictures/tab_over.gif
Modified: trunk/moodle/mod/liveclassroom/css/StyleSheet.css
===================================================================
--- trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-10 00:06:09 UTC (rev 171)
+++ trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-10 00:24:15 UTC (rev 172)
@@ -93,33 +93,34 @@
}
td.tabSelected
{
-
-background-image:url(../pictures/tab_Select.gif);
- background-repeat: no-repeat;
- width: 78px;
- font-size: 10px;
- font-family: Verdana;
- }
-
- td.tabDisabled
+ background-image: url(../pictures/items/tab-selected.gif);
+ background-repeat: no-repeat;
+ width: 78px;
+ font-size: 10px;
+ font-family: Verdana;
+ cursor:default;
+}
+
+td.tabDisabled
{
- color:#CACACA;
- background-image:url(../pictures/tab.gif);
- background-repeat: no-repeat;
- width: 78px;
- font-size: 10px;
- font-family: Verdana;
- border-bottom:solid 1px #818181;
- }
+ color: #CACACA;
+ background-image: url(../pictures/items/tab-unselected.gif);
+ background-repeat: no-repeat;
+ width: 78px;
+ font-size: 10px;
+ font-family: Verdana;
+ border-bottom: solid 1px #818181;
+ cursor:default;
+}
td.tabNoSelected
{
-
- background-image:url(../pictures/tab.gif);
- background-repeat: no-repeat;
- width: 78px;
- font-size: 10px;
- font-family: Verdana;
- border-bottom:solid 1px #818181;
+ background-image: url(../pictures/items/tab-unselected.gif);
+ background-repeat: no-repeat;
+ width: 78px;
+ font-size: 10px;
+ font-family: Verdana;
+ border-bottom: solid 1px #818181;
+ cursor:default;
}
a {
Modified: trunk/moodle/mod/liveclassroom/js/Ajax.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/Ajax.js 2007-01-10 00:06:09 UTC (rev 171)
+++ trunk/moodle/mod/liveclassroom/js/Ajax.js 2007-01-10 00:24:15 UTC (rev 172)
@@ -56,38 +56,39 @@
return xmlhttp;
}
-function gestionDisplay(isfilter)
+function gestionDisplay()
{
if(currentTool==LC_PRODUCT || currentTool=="all"){
- if(numberMainLectureRoom>5 && isfilter==false)
+ if(document.getElementById("div1")!=null){
+ if(numberMainLectureRoom>5 && isFilter==false)
+ {
+
+ document.getElementById("div1").style.height=5*19+"px";
+ document.getElementById("div1More").style.display="block";
+ document.getElementById("div1More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div1\",\""+numberMainLectureRoom+"\")'>"+(numberMainLectureRoom-5)+" more...</label>";
+ //document.getElementById("div1Space").style.display="block";
+ }else if(numberMainLectureRoom==0){
+ document.getElementById("div1").style.display="none";
+ document.getElementById("div1Title").style.display="none";
+ document.getElementById("div1More").style.display="none";
+ // document.getElementById("div1Space").style.display="none";
+ }else{
+
+ document.getElementById("div1").style.height=numberMainLectureRoom*19+"px";
+ document.getElementById("div1More").style.display="none";
+ //document.getElementById("div1Space").style.display="none";
+
+ }
+ }
+ if(document.getElementById("div2")!=null){
+ if(numberDiscussionRoom>5 && isFilter==false)
{
-
- document.getElementById("div1").style.height=5*19+"px";
-
-
-
- document.getElementById("div1More").style.display="block";
- document.getElementById("div1More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div1\",\""+numberMainLectureRoom+"\")'>"+(numberMainLectureRoom-5)+" more...</label>";
-
- }else if(numberMainLectureRoom==0){
- document.getElementById("div1").style.display="none";
- document.getElementById("div1Title").style.display="none";
- document.getElementById("div1More").style.display="none";
-
- }else{
-
- document.getElementById("div1").style.height=numberMainLectureRoom*19+"px";
- document.getElementById("div1More").style.display="none";
-
- }
-
- if(numberDiscussionRoom>5 && isfilter==false)
- {
document.getElementById("div2").style.height=5*19+"px";
document.getElementById("div2More").style.display="block";
document.getElementById("div2More").innerHTML="<table><tr><td><label class='moreRoom' onclick='displayAllDiv(\"div2\",\""+numberDiscussionRoom+"\")'>"+(numberDiscussionRoom-5)+" more...</label></td></tr></table>";
-
+ //document.getElementById("div2Space").style.display="block";
+
@@ -95,60 +96,71 @@
document.getElementById("div2").style.display="none";
document.getElementById("div2Title").style.display="none";
document.getElementById("div2More").style.display="none";
-
+ //document.getElementById("div2Space").style.display="none";
+
}else{
-
+
document.getElementById("div2").style.height=numberDiscussionRoom*19+"px";
document.getElementById("div2More").style.display="none";
+ // document.getElementById("div2Space").style.display="none";
+
}
}
-
-
+ }
if(currentTool==VT_PRODUCT || currentTool=="all"){
- if(numberVoiceBoard>5 && isfilter==false)
- {
- document.getElementById("div3").style.height=5*19+"px";
- document.getElementById("div3More").style.display="block";
- document.getElementById("div3More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div3\",\""+numberVoiceBoard+"\")'>"+(numberVoiceBoard-5)+" more...</label>";
-
-
-
-
- }else if(numberVoiceBoard==0){
- document.getElementById("div3").style.display="none";
- document.getElementById("div3Title").style.display="none";
- document.getElementById("div3More").style.display="none";
-
- }else{
-
- document.getElementById("div3").style.height=numberVoiceBoard*19+"px";
- document.getElementById("div3More").style.display="none";
+ if(document.getElementById("div3")!=null){
+ if(numberVoiceBoard>5 && isFilter==false)
+ {
+ document.getElementById("div3").style.height=5*19+"px";
+ document.getElementById("div3More").style.display="block";
+ document.getElementById("div3More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div3\",\""+numberVoiceBoard+"\")'>"+(numberVoiceBoard-5)+" more...</label>";
+ //document.getElementById("div3Space").style.display="block";
+
+
+
+ }else if(numberVoiceBoard==0){
+ document.getElementById("div3").style.display="none";
+ document.getElementById("div3Title").style.display="none";
+ document.getElementById("div3More").style.display="none";
+ //document.getElementById("div3Space").style.display="none";
+
+ }else{
+
+ document.getElementById("div3").style.height=numberVoiceBoard*19+"px";
+ document.getElementById("div3More").style.display="none";
+ //document.getElementById("div3Space").style.display="none";
+
+ }
+ }
+ if(document.getElementById("div4")!=null){
+ if(numberVoicePresentation>5 && isFilter==false)
+ {
+
+ document.getElementById("div4").style.height=5*19+"px";
+ document.getElementById("div4More").style.display="block";
+ document.getElementById("div4More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div4\",\""+numberVoicePresentation+"\")'>"+(numberVoicePresentation-5)+" more...</label>";
+ //document.getElementById("div4Space").style.display="block";
+
+
+
+ }else if(numberVoicePresentation==0){
+ document.getElementById("div4").style.display="none";
+ document.getElementById("div4Title").style.display="none";
+ document.getElementById("div4More").style.display="none";
+ // document.getElementById("div4Space").style.display="none";
+
+ }
+ else{
+ document.getElementById("div4").style.height=numberVoicePresentation*19+"px";
+ document.getElementById("div4More").style.display="none";
+ // document.getElementById("div4Space").style.display="none";
+
+ }
}
-
- if(numberVoicePresentation>5 && isfilter==false)
- {
-
- document.getElementById("div4").style.height=5*19+"px";
- document.getElementById("div4More").style.display="block";
- document.getElementById("div4More").innerHTML="<label class='moreRoom' onclick='displayAllDiv(\"div4\",\""+numberVoicePresentation+"\")'>"+(numberVoicePresentation-5)+" more...</label>";
-
-
-
- }else if(numberVoicePresentation==0 && isfilter==false){
- document.getElementById("div4").style.display="none";
- document.getElementById("div4Title").style.display="none";
- document.getElementById("div4More").style.display="none";
-
+
}
- else{
- document.getElementById("div4").style.height=numberVoicePresentation*19+"px";
- document.getElementById("div4More").style.display="none";
- }
-
}
-}
-
function displayAllDiv(name,number){
if(currentId!="")
document.getElementById(currentId).style.backgroundColor="white";
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-10 00:06:09 UTC (rev 171)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-10 00:24:15 UTC (rev 172)
@@ -18,10 +18,9 @@
}
function doChangeChat() {
- var radio = document.forms[0].privateChatEnable;
+ var radio = document.forms[0].privateChatEnabled;
for (i=0; i<radio.length; i++) {
-
radio[i].disabled = !document.forms[0].chatenable.checked;
}
}
@@ -77,17 +76,22 @@
- var currentIdtab="1";
+
function onTab(id)
{
- document.getElementById('tab'+id).style.backgroundImage="url(pictures/tab_Select.gif)";
- document.getElementById('tab'+currentIdtab).style.borderBottom="#818181 1px solid";
- document.getElementById('tab'+currentIdtab).style.backgroundImage="url(pictures/tab.gif)";
- document.getElementById('tab'+id).style.borderBottom="none";
- document.getElementById('span'+currentIdtab).style.display="none";
- document.getElementById('span'+id).style.display="block";
- currentIdtab=id;
+ if(currentIdtab=="")
+ currentIdtab=1
+
+
+ if(currentIdtab !=id){
+ document.getElementById('tab'+id).className="tabSelected";
+ document.getElementById('tab'+currentIdtab).className="tabNoSelected";
+ document.getElementById('span'+currentIdtab).style.display="none";
+ document.getElementById('span'+id).style.display="block";
+ currentIdtab=id;
+ }
+
}
function onOver(id)
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 00:06:09 UTC (rev 171)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 00:24:15 UTC (rev 172)
@@ -94,6 +94,7 @@
}
break;
case "settings":
+ currentIdtab=1;
if(divToReload=="all" ){
display+=openDiv("settings","settings")
display+=displaySettings(windowsElements[i].getElements("windowsElementParameters"));
Modified: trunk/moodle/mod/liveclassroom/pictures/items/Thumbs.db
===================================================================
(Binary files differ)
Added: trunk/moodle/mod/liveclassroom/pictures/items/tab-selected.gif
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/tab-selected.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/moodle/mod/liveclassroom/pictures/items/tab-unselected.gif
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/tab-unselected.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/moodle/mod/liveclassroom/pictures/tab.gif
===================================================================
(Binary files differ)
Deleted: trunk/moodle/mod/liveclassroom/pictures/tab_Select.gif
===================================================================
(Binary files differ)
Deleted: trunk/moodle/mod/liveclassroom/pictures/tab_disabled.gif
===================================================================
(Binary files differ)
Deleted: trunk/moodle/mod/liveclassroom/pictures/tab_over.gif
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <to...@us...> - 2007-01-10 00:06:11
|
Revision: 171
http://svn.sourceforge.net/hw4mdl/?rev=171&view=rev
Author: tomroro
Date: 2007-01-09 16:06:09 -0800 (Tue, 09 Jan 2007)
Log Message:
-----------
Fix the bug#10644
I have changed different things:
-First, I have changed the png picture by jpg picture because if I put png picture on a hide div and I apply the transparency correction for Ie, the png pictures don't appear.
-I have modified some css elements to be good on ie,safari and ff
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/css/StyleSheet.css
trunk/moodle/mod/liveclassroom/js/manageXml.js
Added Paths:
-----------
trunk/moodle/mod/liveclassroom/pictures/items/Thumbs.db
trunk/moodle/mod/liveclassroom/pictures/items/listitem-available.jpg
trunk/moodle/mod/liveclassroom/pictures/items/listitem-liveclassroomicon.jpg
trunk/moodle/mod/liveclassroom/pictures/items/listitem-subitem.jpg
trunk/moodle/mod/liveclassroom/pictures/items/listitem-unavailable.jpg
Modified: trunk/moodle/mod/liveclassroom/css/StyleSheet.css
===================================================================
--- trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-08 13:02:27 UTC (rev 170)
+++ trunk/moodle/mod/liveclassroom/css/StyleSheet.css 2007-01-10 00:06:09 UTC (rev 171)
@@ -294,12 +294,12 @@
}
.archive td{
- padding-left:5px ;
+
font-family:Verdana;
color:#666666;
font-style:italic;
font-size:11px;
-
+border-bottom:solid 1px #F3F3F3;
}
.room td{
@@ -312,11 +312,11 @@
}
.archive label{
-
+ padding-left:5px ;
font-family:Verdana;
color:Black;
font-size:10;
- border-bottom:solid 1px #F3F3F3;
+
cursor:default;
}
.room label{
@@ -324,7 +324,7 @@
font-family:Verdana;
color:Black;
font-size:10;
- border-bottom:solid 1px #F3F3F3;
+
cursor:default;
}
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-08 13:02:27 UTC (rev 170)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2007-01-10 00:06:09 UTC (rev 171)
@@ -738,10 +738,10 @@
display += "<tr id="+archive[i].getElements("id")[0].getText()+" height=16px Onclick=\"OneClick('"+archive[i].getElements("id")[0].getText()+"','"+LC_PRODUCT+"')\" Ondblclick=\"javascript:startHorizon('"+archive[i].getElements("id")[0].getText()+"', null, null, null, null, 'hzA="+session["authToken"]+"')\" class='archive'>"
- display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.png\" border=\"0\" /></td>";
- display += "<td style=\"padding-left:7px;\" width=16px align=\"left\"><img src=\"pictures/items/listitem-subitem.png\" border=\"0\" /></td>";
+ display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.jpg\" border=\"0\" /></td>";
+ display += "<td style=\"padding-left:7px;\" width=16px align=\"left\"><img src=\"pictures/items/listitem-subitem.jpg\" border=\"0\" /></td>";
display += "<td width='300px'><label onmousemove='javascript:ShowToolTip(event,\""+archive[i].getElements("nameDisplay")[0].getText()+"\",\""+archive[i].getElements("preview")[0].getText()+"\")' onmouseout='javascript:HideToolTip()'>"+archive[i].getElements("nameDisplay")[0].getText()+"</label></td>";
- display += "<td class='shiftAvailability' align=right><img src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".png\"/></td>";
+ display += "<td class='shiftAvailability' align=right><img src=\"pictures/items/listitem-"+archive[i].getElements("preview")[0].getText()+".jpg\"/></td>";
display += "</tr>";
}else{
closeArchive++;
Added: trunk/moodle/mod/liveclassroom/pictures/items/Thumbs.db
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/moodle/mod/liveclassroom/pictures/items/listitem-available.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/listitem-available.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/moodle/mod/liveclassroom/pictures/items/listitem-liveclassroomicon.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/listitem-liveclassroomicon.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/moodle/mod/liveclassroom/pictures/items/listitem-subitem.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/listitem-subitem.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/moodle/mod/liveclassroom/pictures/items/listitem-unavailable.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/moodle/mod/liveclassroom/pictures/items/listitem-unavailable.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-08 13:02:30
|
Revision: 170
http://svn.sourceforge.net/hw4mdl/?rev=170&view=rev
Author: hugues
Date: 2007-01-08 05:02:27 -0800 (Mon, 08 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10624
- Enlarged the size of the input field for the launcher link, it was not displaying correctly.
- I also fixed a bug when the guest access was removed.
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/lib.php
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-08 10:12:11 UTC (rev 169)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-08 13:02:27 UTC (rev 170)
@@ -1176,7 +1176,7 @@
$launcher_link = $CFG->liveclassroom_servername."/launcher.cgi?room=".$roomId;
$parameters=array("type" => "text", "id" => "link",
- "name" => "link", "maxlength" => "50",
+ "name" => "link", "maxlength" => isset($launcher_link)?strlen($launcher_link):"50",
"size" => strlen($launcher_link) , "readonly" => "");
if($action=='update'){
$parameters['value']=$launcher_link;
Modified: trunk/moodle/mod/liveclassroom/lib.php
===================================================================
--- trunk/moodle/mod/liveclassroom/lib.php 2007-01-08 10:12:11 UTC (rev 169)
+++ trunk/moodle/mod/liveclassroom/lib.php 2007-01-08 13:02:27 UTC (rev 170)
@@ -322,6 +322,8 @@
*/
function liveclassroom_update_room ($course_id, $roomname, $instructor_led, $attributes) {
+ $student_id = liveclassroom_api_get_student_user_id ($courseid) ;
+
//set media_type and media_format according to the appropriate values according to the media_type attribute
$attributes = liveclassroom_check_media($attributes);
@@ -329,12 +331,12 @@
//Test if the type of room has been changed
if($_SESSION['led']!=$attributes['led']) { // Type changed
if($list_attributes['led']=='instructor'){
- liveclassroom_api_remove_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid) , 'Instructor') ;
- liveclassroom_api_add_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid), 'Student');
+ liveclassroom_api_remove_user_role ($_GET['id'], $student_id, 'Instructor') ;
+ liveclassroom_api_add_user_role ($_GET['id'], $student_id, 'Student');
}
else {
- liveclassroom_api_remove_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid) , 'Student') ;
- liveclassroom_api_add_user_role ($_GET['id'], liveclassroom_api_get_student_user_id ($courseid), 'Instructor');
+ liveclassroom_api_remove_user_role ($_GET['id'], $student_id , 'Student') ;
+ liveclassroom_api_add_user_role ($_GET['id'], $student_id, 'Instructor');
}
}
unset($attributes['led']);
@@ -350,6 +352,12 @@
return false;
}
}
+ else if ($attributes['guest']==0) {
+ if (! liveclassroom_api_remove_user_role ($_GET['id'], 'Guest' , 'Student')) {
+ return false;
+ }
+ }
+
return true;
}
@@ -368,20 +376,39 @@
$roomid = LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.'_'.rand();
+ //set media_type and media_format according to the appropriate values according to the media_type attribute
+ $attributes = liveclassroom_check_media($attributes);
+
+
+ if (! liveclassroom_api_create_class ($roomid, $roomname, $instructor_led, $attributes)) {
+ //error ("liveclassroom_create_room: Cannot create room with id:$roomid and name: $roomname");
+ return false;
+ }
+
+ if (! liveclassroom_adjust_roles ($roomid, $enc_coursename, $instructor_led)) {
+ return false;
+ }
+
+ //Guest enabled?
+ if ((isset($attributes['guests'])) && ($attributes['guests']==1)) {
+ if (! liveclassroom_api_add_user_role ($roomid, 'Guest' , 'Student')) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
+
+
+function liveclassroom_adjust_roles ($roomid, $enc_coursename, $instructor_led) {
+
$teacherid = LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.LIVECLASSROOM_TEACHER_SUFFIX;
$studentid = LIVECLASSROOM_MOODLE_PREFIX.$enc_coursename.LIVECLASSROOM_STUDENT_SUFFIX;
- //set media_type and media_format according to the appropriate values according to the media_type attribute
- $attributes = liveclassroom_check_media($attributes);
-
if($instructor_led==true) { // main lecture hall
- if (! liveclassroom_api_create_class ($roomid, $roomname, true, $attributes)) {
- //error ("liveclassroom_create_room: Cannot create room with id:$roomid and name: $roomname");
- return false;
- }
- if (! liveclassroom_api_add_user_role ($roomid, $teacherid, 'ClassAdmin')) {
-
+ if (! liveclassroom_api_add_user_role ($roomid, $teacherid, 'ClassAdmin')) {
//error('liveclassroom_create_room: Cannot add classadminright to Teachers');
return false;
}
@@ -395,10 +422,6 @@
}
}
else if($instructor_led==false){ // discussion room
- if (! liveclassroom_api_create_class ($roomid, $roomname, false, $attributes)) {
- //error ("liveclassroom_create_room: Cannot create room with id:$roomid and name: $roomname");
- return false;
- }
if (! liveclassroom_api_add_user_role ($roomid, $teacherid, 'ClassAdmin')) {
//error('liveclassroom_create_room: Cannot add classadminright to Teachers');
return false;
@@ -412,18 +435,9 @@
return false;
}
}
- //Guest enabled?
- if ((isset($attributes['guests'])) && ($attributes['guests']==1)) {
- if (! liveclassroom_api_add_user_role ($roomid, 'Guest' , 'Student')) {
- return false;
- }
- }
-
return true;
}
-
-
/**
* Return the id of liveclassroom activities in this course
* @param string the courseid
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-08 10:12:14
|
Revision: 169
http://svn.sourceforge.net/hw4mdl/?rev=169&view=rev
Author: hugues
Date: 2007-01-08 02:12:11 -0800 (Mon, 08 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10547
- Fixed the names of the fields and radio buttons
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/generateSettings.php
trunk/moodle/mod/liveclassroom/js/hwCommons.js
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-05 10:52:26 UTC (rev 168)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-08 10:12:11 UTC (rev 169)
@@ -840,7 +840,8 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_chat", "name" => "chatenable", "onclick" => "doChangeChat()") ;
+ $parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_chat",
+ "name" => "chatenable", "onclick" => "doChangeChat()") ;
if($action=='update'){
if($room_info['chatenable']==1) {
$parameters['checked']=true;
@@ -875,7 +876,8 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "radio", "value" => "1", "id" => "privatechatenabled",
+ $parameters=array("type" => "radio", "value" => "1",
+ "id" => "privatechatenable",
"name" => "privateChatEnable") ;
if($action=='update'){
if($room_info['privatechatenable']==1) {
@@ -913,7 +915,8 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "radio", "value" => "0", "id" => "privatedisbledd", "name" => "privateChatEnabled") ;
+ $parameters=array("type" => "radio", "value" => "0",
+ "id" => "privatedisabled", "name" => "privateChatEnable") ;
if($action=='update'){
if($room_info['privatechatenable']==0) {
$parameters['checked']=true;
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-05 10:52:26 UTC (rev 168)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2007-01-08 10:12:11 UTC (rev 169)
@@ -18,9 +18,10 @@
}
function doChangeChat() {
- var radio = document.forms[0].privateChatEnabled;
+ var radio = document.forms[0].privateChatEnable;
for (i=0; i<radio.length; i++) {
+
radio[i].disabled = !document.forms[0].chatenable.checked;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-05 10:52:29
|
Revision: 168
http://svn.sourceforge.net/hw4mdl/?rev=168&view=rev
Author: hugues
Date: 2007-01-05 02:52:26 -0800 (Fri, 05 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10613
- reverted the checkboxes display to the original
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/generateSettings.php
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-04 17:43:55 UTC (rev 167)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-05 10:52:26 UTC (rev 168)
@@ -667,8 +667,7 @@
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
$parameters=array("type" => "checkbox", "value" => "1",
- "id" => "enabled_eboard", "name" => "student_wb_enabled",
- "onclick" => "hideDiv(\"screenGrab\")") ;
+ "id" => "enabled_eboard", "name" => "student_wb_enabled") ;
if($action=='update'){
if($room_info['student_wb_enabled']==1) {
$parameters['checked']=true;
@@ -689,7 +688,7 @@
$plid->append_child($xmldoc->create_text_node("screenGrab"));
$panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(($room_info['student_wb_enabled']==1)?"visible":"hide"));
+ $panelLineStyle->append_child($xmldoc->create_text_node(""));
$panelLine->append_child($panelLineStyle);
$linepart = $xmldoc->create_element('panelLinePart');
$style = $xmldoc->create_element('style');
@@ -877,7 +876,7 @@
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
$parameters=array("type" => "radio", "value" => "1", "id" => "privatechatenabled",
- "name" => "privateChatEnabled") ;
+ "name" => "privateChatEnable") ;
if($action=='update'){
if($room_info['privatechatenable']==1) {
$parameters['checked']=true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2007-01-04 17:43:57
|
Revision: 167
http://svn.sourceforge.net/hw4mdl/?rev=167&view=rev
Author: hugues
Date: 2007-01-04 09:43:55 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
http://u.horizonwimba.com/bugzilla/show_bug.cgi?id=10613
- updated the display of the checkboxes
- Changed the text, the functionnality was actually correctly implemented
Modified Paths:
--------------
trunk/moodle/lang/en/liveclassroom.php
trunk/moodle/lang/en_utf8/liveclassroom.php
trunk/moodle/lang/fr/liveclassroom.php
trunk/moodle/lang/fr_utf8/liveclassroom.php
trunk/moodle/mod/liveclassroom/generateSettings.php
Modified: trunk/moodle/lang/en/liveclassroom.php
===================================================================
--- trunk/moodle/lang/en/liveclassroom.php 2007-01-04 16:32:37 UTC (rev 166)
+++ trunk/moodle/lang/en/liveclassroom.php 2007-01-04 17:43:55 UTC (rev 167)
@@ -116,7 +116,7 @@
$string['Third-party Conference Call'] = "Third-party Conference Call";
$string['Features'] = "Features";
$string['Enable Students to use eBoard'] = "Enable Students to use eBoard";
-$string['Enable Students to use AppShare'] = "Enable Students to use AppShare";
+$string['enableScreenGrab'] = "Enable Students to use the Screen Grab tool.";
$string['Enable Archiving'] = "Enable Archiving";
$string['Enable Appshare'] = "Enable Appshare";
$string['Enable On-The-Fly PPT Import'] = "Enable On-The-Fly PPT Import";
Modified: trunk/moodle/lang/en_utf8/liveclassroom.php
===================================================================
--- trunk/moodle/lang/en_utf8/liveclassroom.php 2007-01-04 16:32:37 UTC (rev 166)
+++ trunk/moodle/lang/en_utf8/liveclassroom.php 2007-01-04 17:43:55 UTC (rev 167)
@@ -116,7 +116,7 @@
$string['Third-party Conference Call'] = "Third-party Conference Call";
$string['Features'] = "Features";
$string['Enable Students to use eBoard'] = "Enable Students to use eBoard";
-$string['Enable Students to use AppShare'] = "Enable Students to use AppShare";
+$string['enableScreenGrab'] = "Enable Students to use the Screen Grab tool.";
$string['Enable Archiving'] = "Enable Archiving";
$string['Enable Appshare'] = "Enable Appshare";
$string['Enable On-The-Fly PPT Import'] = "Enable On-The-Fly PPT Import";
Modified: trunk/moodle/lang/fr/liveclassroom.php
===================================================================
--- trunk/moodle/lang/fr/liveclassroom.php 2007-01-04 16:32:37 UTC (rev 166)
+++ trunk/moodle/lang/fr/liveclassroom.php 2007-01-04 17:43:55 UTC (rev 167)
@@ -118,7 +118,7 @@
$string['Third-party Conference Call'] = "Système de Conférence Téléphonique Alternatif";
$string['Features'] = "Fonctions";
$string['Enable Students to use eBoard'] = "Permettre aux étudiants d'utiliser le tableau blanc <i>eBoard</i>";
-$string['Enable Students to use AppShare'] = "Permettre aux étudiants d'utiliser l'outil de partage d'écran.";
+$string['enableScreenGrab'] = "Permettre aux étudiants d'utiliser l'outil de capture d'écran.";
$string['Enable Archiving'] = "Autoriser l'Archivage";
$string['Enable Appshare'] = "Autoriser le partage d'application <i>AppShare</i>";
$string['Enable On-The-Fly PPT Import'] = "Autoriser l'import de fichier PPT à-la-volée";
Modified: trunk/moodle/lang/fr_utf8/liveclassroom.php
===================================================================
--- trunk/moodle/lang/fr_utf8/liveclassroom.php 2007-01-04 16:32:37 UTC (rev 166)
+++ trunk/moodle/lang/fr_utf8/liveclassroom.php 2007-01-04 17:43:55 UTC (rev 167)
@@ -118,7 +118,7 @@
$string['Third-party Conference Call'] = "Système de Conférence Téléphonique Alternatif";
$string['Features'] = "Fonctions";
$string['Enable Students to use eBoard'] = "Permettre aux étudiants d'utiliser le tableau blanc <i>eBoard</i>";
-$string['Enable Students to use AppShare'] = "Permettre aux étudiants d'utiliser l'outil de partage d'écran.";
+$string['enableScreenGrab'] = "Permettre aux étudiants d'utiliser l'outil de capture d'écran.";
$string['Enable Archiving'] = "Autoriser l'Archivage";
$string['Enable Appshare'] = "Autoriser le partage d'application <i>AppShare</i>";
$string['Enable On-The-Fly PPT Import'] = "Autoriser l'import de fichier PPT à-la-volée";
Modified: trunk/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-04 16:32:37 UTC (rev 166)
+++ trunk/moodle/mod/liveclassroom/generateSettings.php 2007-01-04 17:43:55 UTC (rev 167)
@@ -666,15 +666,19 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_eboard", "name" => "student_wb_enabled") ;
+ $parameters=array("type" => "checkbox", "value" => "1",
+ "id" => "enabled_eboard", "name" => "student_wb_enabled",
+ "onclick" => "hideDiv(\"screenGrab\")") ;
if($action=='update'){
- if($room_info['student_wb_enabled']==1) $parameters['checked']=true;
+ if($room_info['student_wb_enabled']==1) {
+ $parameters['checked']=true;
+ }
}
-
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay, "input", $parameters) );
$panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label", $parameters=array("value" => liveclassroom_get_message("Enable Students to use eBoard")) ));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,$contextDisplay,"label",
+ $parameters=array("value" => liveclassroom_get_message("Enable Students to use eBoard")) ));
$panelLine->append_child($linepart);
$panelContent->append_child($panelLine);
@@ -682,10 +686,10 @@
// SECOND LINE
$panelLine = $xmldoc->create_element('panelLine');
$plid = $xmldoc->create_element('id');
- $plid->append_child($xmldoc->create_text_node(""));
+ $plid->append_child($xmldoc->create_text_node("screenGrab"));
$panelLine->append_child($plid);
$panelLineStyle = $xmldoc->create_element('style');
- $panelLineStyle->append_child($xmldoc->create_text_node(" "));
+ $panelLineStyle->append_child($xmldoc->create_text_node(($room_info['student_wb_enabled']==1)?"visible":"hide"));
$panelLine->append_child($panelLineStyle);
$linepart = $xmldoc->create_element('panelLinePart');
$style = $xmldoc->create_element('style');
@@ -698,7 +702,8 @@
$align = $xmldoc->create_element('align');
$align->append_child($xmldoc->create_text_node(""));
$linepart->append_child($align);
- $parameters=array("type" => "checkbox", "value" => "1", "id" => "enabled_liveapp", "name" => "student_wb_liveapp") ;
+ $parameters=array("type" => "checkbox", "value" => "1",
+ "id" => "enabled_liveapp", "name" => "student_wb_liveapp") ;
if($action=='update'){
if($room_info['student_wb_liveapp']==1) $parameters['checked']=true;
}
@@ -706,7 +711,8 @@
$linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAINLECTURE", "input", $parameters) );
$panelLine->append_child($linepart);
- $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAINLECTURE","label", $parameters=array("value" => liveclassroom_get_message("Enable Students to use AppShare"))));
+ $linepart->append_child(liveclassroom_create_linepart_element($xmldoc,"$MAINLECTURE","label",
+ $parameters=array("value" => liveclassroom_get_message("enableScreenGrab"))));
$panelLine->append_child($linepart);
$panelContent->append_child($panelLine);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
