Thread: [Hw4mdl-svn] SF.net SVN: hw4mdl: [121] trunk/moodle/mod/liveclassroom/js
Brought to you by:
jhlinder,
trollinger
Menu
▾
▴
hw4mdl-svn
|
From: <sh...@us...> - 2006-12-22 10:11:17
|
Revision: 121
http://svn.sourceforge.net/hw4mdl/?rev=121&view=rev
Author: shazan
Date: 2006-12-22 02:11:12 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
new js files
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/js/Ajax.js
trunk/moodle/mod/liveclassroom/js/constants.js
trunk/moodle/mod/liveclassroom/js/hwCommons.js
trunk/moodle/mod/liveclassroom/js/manageXml.js
trunk/moodle/mod/liveclassroom/js/pngfix.js
trunk/moodle/mod/liveclassroom/js/verifForm.js
Removed Paths:
-------------
trunk/moodle/mod/liveclassroom/js/General.js
trunk/moodle/mod/liveclassroom/js/xml.js
Modified: trunk/moodle/mod/liveclassroom/js/Ajax.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/Ajax.js 2006-12-22 10:01:56 UTC (rev 120)
+++ trunk/moodle/mod/liveclassroom/js/Ajax.js 2006-12-22 10:11:12 UTC (rev 121)
@@ -59,7 +59,7 @@
function gestionDisplay(isfilter)
{
-
+if(currentTool==LC_PRODUCT || currentTool=="all"){
if(numberMainLectureRoom>5 && isfilter==false)
{
@@ -82,68 +82,71 @@
}
- if(numberBreakoutRoom>5 && isfilter==false)
+ 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\",\""+numberBreakoutRoom+"\")'>"+(numberBreakoutRoom-5)+" more...</label></td></tr></table>";
+ document.getElementById("div2More").innerHTML="<table><tr><td><label class='moreRoom' onclick='displayAllDiv(\"div2\",\""+numberDiscussionRoom+"\")'>"+(numberDiscussionRoom-5)+" more...</label></td></tr></table>";
- }else if(numberBreakoutRoom==0){
+ }else if(numberDiscussionRoom==0){
document.getElementById("div2").style.display="none";
document.getElementById("div2Title").style.display="none";
document.getElementById("div2More").style.display="none";
}else{
- document.getElementById("div2").style.height=numberBreakoutRoom*19+"px";
+ document.getElementById("div2").style.height=numberDiscussionRoom*19+"px";
document.getElementById("div2More").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>";
+ 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";
+ 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";
+ document.getElementById("div3").style.height=numberVoiceBoard*19+"px";
+ document.getElementById("div3More").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>";
+ 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";
+ 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";
+ document.getElementById("div4").style.height=numberVoicePresentation*19+"px";
+ document.getElementById("div4More").style.display="none";
}
-
}
+}
function displayAllDiv(name,number){
@@ -200,13 +203,13 @@
return params;
}
-function DisplayFirstPage(){
+function DisplayFirstPage(url){
/* Cr\xE9ation de l'objet : */
/* Pr\xE9paration d'une requ\xEAte asynchrone de type GET : */
-xmlhttp.open("POST", 'generateListRooms.php',true);
+xmlhttp.open("POST", url,true);
/* Effectue la requ\xEAte : */
xmlhttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
xmlhttp.onreadystatechange=Management;
@@ -224,8 +227,10 @@
var parameters="";
if(currentProduct != "" )
parameters="product="+currentProduct+"&"
-
- if( currentId != "")
+ if(typeSelect != "" )
+ parameters+="type="+typeSelect+"&"
+
+ if( currentId != "")
parameters+="id="+currentId+"&"
if(action!="")
parameters+="action="+action+"&";
@@ -241,9 +246,10 @@
}
-function launchNew(url,fonction,action,product){
+function launchNew(url,fonction,action,product,type){
- currentProduct = product;
+ currentProduct = product;
+ typeSelect=type;
launchAjaxRequest(url,fonction,action,"true");
}
Deleted: trunk/moodle/mod/liveclassroom/js/General.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/General.js 2006-12-22 10:01:56 UTC (rev 120)
+++ trunk/moodle/mod/liveclassroom/js/General.js 2006-12-22 10:11:12 UTC (rev 121)
@@ -1,369 +0,0 @@
-// JScript File
-
- function toggleUserlimit(isLimited){
- document.forms[0].userlimittext.disabled = (isLimited==false);
- }
- function doChangeChat() {
- var radio = document.forms[0].privateChatEnabled;
- for (i=0; i<radio.length; i++) {
- radio[i].disabled = !document.forms[0].chatEnabled.checked;
- }
- }
-
- function doChangeMedia(mediatype)
- {
- document.forms[0].student_simulcast.disabled = (mediatype=="video" || mediatype=="none")
- document.forms[0].two_way_enabled.disabled = (mediatype=="video" || mediatype=="none")
- if (mediatype=="video"){document.getElementById('roomId_row').style.display="block"}else{
- document.getElementById('roomId_row').style.display="none"}
- }
- function doChangeLink()
- {
-
- if (document.getElementById('launcher_link_row').style.display=="block"){
- document.getElementById('launcher_link_row').style.display="none"
- }else{
- document.getElementById('launcher_link_row').style.display="block"
- }
- }
-
-
- function toggleType(type)
- {
- typeSelect=type;
- manageXml('','all');
-
-
-
-
- }
- function confirmDelete(delUrl, type){
- if (confirm("Are you sure you want to delete this " + type)) {
- if (confirm("Are you really sure you want to delete this " + type)) {
- location.href = delUrl
- }
- }
- }
-
-
-
- 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;
- }
-
- function onOver(id)
- {
- if(currentIdtab!=id)
- document.getElementById('tab'+id).style.backgroundImage="url(pictures/tab_over.gif)";
-
- }
- function onOut(id)
- {
- if(currentIdtab!=id)
- document.getElementById('tab'+id).style.backgroundImage="url(pictures/tab.gif)";
-
- }
-
- function hwSubmit(action) {
- if(action != null)
- {
- document.forms[0].action.value=action;
- }
- document.forms[0].submit();
- }
-
-
- function hideDiv(id,pictureId){
- if (document.getElementById(id).style.display=="none")
- {
-
- document.getElementById(id).style.display="block";
- document.getElementById(id+"More").style.display="block";
- if(pictureId!="")
- document.images[pictureId].src="pictures/items/category-expanded.png";
-
- }
- else if (document.getElementById(id).style.display=="block")
- {
-
- document.getElementById(id).style.display="none";
- document.getElementById(id+"More").style.display="none";
- if(pictureId!="")
- document.images[pictureId].src="pictures/items/category-collapsed.png";
- }
- if (document.getElementById(id).className=="hide")
- {
- document.getElementById(id).className="visible";
- document.getElementById(id+"More").className="visible";
-
- if(pictureId!="")
- document.images[pictureId].src="pictures/items/category-expanded.png";
-
- }
- else if (document.getElementById(id).className=="visible")
- {
- document.getElementById(id).className="hide";
- document.getElementById(id+"More").className="hide";
-
- if(pictureId!="")
- document.images[pictureId].src="pictures/items/category-collapsed.png";
- }
-}
-
-
-
-
-function hideArchive(type,id,pictureId,roomId)
-{
-
- if (document.getElementById(id).style.display=="none")
- {
- if(type=="MainLecture")
- numberMainLectureRoom+=numberArchive[roomId];
- else
- numberBreakoutRoom+=numberArchive[roomId];
- document.getElementById(id).style.display="block";
- document.images[pictureId].src="pictures/minus.gif";
-
-
- }
- else
- {
- if(type=="MainLecture")
- numberMainLectureRoom-=numberArchive[roomId];
- else
- numberBreakoutRoom-=numberArchive[roomId];
-
- document.getElementById(id).style.display="none";
- document.images[pictureId].src="pictures/plus.gif";
-
-
- }
- gestionDisplay(false)
-}
-
-function Navigateur()
-{
- if (navigator.appName.indexOf("Netscape") > -1)
- {
- return "Netscape";
- }
- if (navigator.appName.indexOf("Explorer") > -1)
- {
- return "Explorer";
- }
- return "Unknown";
-}
-
-
-function changePicture(id,pictureUrl){
- if(Navigateur()=="Explorer" && parseFloat(navigator.appVersion)<5.5)
- {
- document.getElementById(id).style.filter=" progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+pictureUrl+"', sizingMethod='scale')";
- }
- else
- {
- // document.images[id].src=pictureUrl;
-
- }
-
-}
-
-function OneClick(id,product,type)
-
-{
-
- if(currentId!="" && currentId!=id)
- document.getElementById(currentId).style.backgroundColor="white";
- if(currentId!=id)
- {
- document.getElementById(id).style.backgroundColor="#c3dbf7";
- }
- currentId=id;
- currentProduct=product;
- typeSelect=type;
-
- //alert(typeSelect);
- if(document.getElementById("info")!=null && document.getElementById("info").style.display=="block")
- document.getElementById("info").style.display="none";
- if(currentId!="")
- manageXml("","toolBar");
-}
-function dclick(id)
-{
- if(currentId!=""){
- document.getElementById(currentId).style.backgroundColor="white";
- currentId=id;
- Launch();
- }
-}
-
-function Horizon()
-{
-
- if(currentId!="")
- startHorizon(currentId, null, null, null, null, 'hzA='+session['authToken'])
-}
-
-function ChangeView()
-{
-//alert("eeeE")
- if( document.getElementById("view").value=="student")
- {
- studentView=true;
-
- }
- else
- {
- studentView=false;
- }
- currentId="";
- currentProduct="";
- manageXml("","all");
-
-
-}
-
-function LaunchWizard(url)
-{
-var w = window.open(url,'lc_popup','scrollbars=yes,resizable=yes,width=800,height=500');
-w.focus();
-}
-
-function doOpen(url,param)
-{
-
- if(currentId!="")
- {
- var complete_url=url+'?roomId='+currentId+'&'+param;
-
- window.open(complete_url,"_self");
-
- }
-}
-function doOpenPopup(url,param)
-{
- if(currentId!="")
- {
- var complete_url=url+'?roomId='+currentId+'&'+param;
- var w = window.open(complete_url,'lc_popup','scrollbars=yes,resizable=yes,width=800,height=500');
- w.focus();
- }
-}
-function doOpenExtern(url,param)
-{
- if(currentId!="")
- {
- var complete_url=url+'?class_id='+currentId+'&'+param;
- var w = window.open(complete_url,'lc_popup','scrollbars=yes,resizable=yes,width=800,height=500');
- w.focus();
- }
-}
-function hideCroix(v)
-{
- if(v.length>0)
- document.getElementById("croix").style.display="block";
- else
- document.getElementById("croix").style.display="none";
-}
-var hiddenCroix=0;
-function overCroix(v)
-{
- if(hiddenCroix==0)
- {
- v.src="pictures/x_normal.gif";
- hiddenCroix=1;
- }
- else
- {
- v.src="pictures/x_over.gif";
- hiddenCroix=0;
-
- }
-}
-function clickCroix()
-{
- document.getElementById("search").value="";
- document.getElementById("croix").style.display="none";
-}
-
-// JScript File
-
-//manage the filter
-function activateFilter(id,divNumber){
- currentFilter=id;
- currentDiv=divNumber;
- currentId="";
- currentProduct="";
- manageXml('',"all");
-
-}
-
-function onFilter(id){
- if(currentFilter!=id){
- document.getElementById(id+"_left").style.backgroundImage="url(pictures/items/filter-rollover-left.png)";
- document.getElementById(id+"_center").style.backgroundImage="url(pictures/items/filter-rollover-middle.png)";
- document.getElementById(id+"_right").style.backgroundImage="url(pictures/items/filter-rollover-right.png)";
- }
-}
-
-function outFilter(id){
-
- if(currentFilter==id){
- document.getElementById(id+"_left").style.backgroundImage="url(pictures/items/filter-enabled-left.png)";
- document.getElementById(id+"_center").style.backgroundImage="url(pictures/items/filter-enabled-middle.png)";
- document.getElementById(id+"_right").style.backgroundImage="url(pictures/items/filter-enabled-right.png)";
- }else{
- document.getElementById(id+"_left").style.backgroundImage="";
- document.getElementById(id+"_center").style.backgroundImage="";
- document.getElementById(id+"_right").style.backgroundImage="";
- }
-}
-function startBoard()
-{
-
- if(currentId!="")
- {
- //openPopup('<%=Setup.getInstance().getVtServerURL()%>/board?action=display_popup&nid='+currentId)
- }
-
-}
-
-function search(value){
- currentId=""
- currentProduct=""
- manageXml(search.value,"all");
-
-}
-function Launch(){
-
- if(currentProduct="liveclassroom"){
- Horizon();
- }else if(currentProduct="voiceboard"){
- startBoard();
- }
-
-}
-
-function openContentWindows(){
- if(currentId!="")
- window.open('http://test13.horizonwimba.com/admin/class/carousels.epl?class_id='+currentId+'&hzA='+session["authToken"],'lc_popup','scrollbars=yes,resizable=yes,width=800,height=500');
-}
-
-
-
-function submitForm(url,action){
- //alert(currentId)
- document.myform.action=url+'?id='+currentId+'&action='+action+'&time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"];
- document.myform.submit();
- }
-
\ No newline at end of file
Modified: trunk/moodle/mod/liveclassroom/js/constants.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/constants.js 2006-12-22 10:01:56 UTC (rev 120)
+++ trunk/moodle/mod/liveclassroom/js/constants.js 2006-12-22 10:11:12 UTC (rev 121)
@@ -1,5 +1,14 @@
// JScript File
+//Constants
+var LC_PRODUCT= "LiveClassroom";
+var LC_MAINLECTURE = "MainLecture";
+var LC_DISCUSSION = "Discussion";
+var VT_PRODUCT = "VoiceTools";
+var VB_PRODUCT = "VoiceBoard";
+var VP_PRODUCT = "VoicePresentation";
+
+
var session=new Array();
var timeOfLoad="";
var currentFilter='all';
@@ -7,14 +16,14 @@
var currentId="";
var currentProduct="";
var currentTool="all";
-var typeSelect="mainLecture"
+var typeSelect=LC_MAINLECTURE;
var longname="";
var description="";
+var currentNid="";
-
var currentDiv=0;
var numberMainLectureRoom=0;
-var numberBreakoutRoom=0;
+var numberDiscussionRoom=0;
var numberVoiceBoard=0;
var numberVoicePresentation=0;
var studentView=false;
@@ -23,12 +32,5 @@
var objDom;
var objDomTree;
-//Constants
-var LIVECLASSROOM="liveclassroom";
-var MAINLECTURE="mainLectureRoom";
-var DISCUSSION="discussionRoom";
-var BOARD="voiceBoard";
-var PRESENTATION="voicePresentation";
-
//Ajax
var xmlhttp = getHTTPObject();
\ No newline at end of file
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2006-12-22 10:01:56 UTC (rev 120)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2006-12-22 10:11:12 UTC (rev 121)
@@ -46,13 +46,13 @@
function toggleType(type)
{
-
+
longname=document.getElementById('longname').value;
description=document.getElementById('description').value;
typeSelect=type;
-
+
manageXml('','all');
- longname="";
+ longname="";
description="";
@@ -60,11 +60,10 @@
}
function confirmDelete(delUrl, type){
- if (confirm("Are you sure you want to delete this " + type)) {
- if (confirm("Are you really sure you want to delete this " + type)) {
+ if (confirm("Are you really sure you want to delete this " + type + " ?" )) {
location.href = delUrl
}
- }
+
}
@@ -148,10 +147,10 @@
if (document.getElementById(id).style.display=="none" || document.getElementById(id).className=="hide")
{
- if(type=="MainLecture")
+ if(type==LC_MAINLECTURE)
numberMainLectureRoom+=numberArchive[roomId];
else
- numberBreakoutRoom+=numberArchive[roomId];
+ numberDiscussionRoom+=numberArchive[roomId];
if (document.getElementById(id).className=="hide")
{
document.getElementById(id).className="visible";
@@ -164,10 +163,10 @@
}
else
{
- if(type=="MainLecture")
+ if(type==LC_MAINLECTURE)
numberMainLectureRoom-=numberArchive[roomId];
else
- numberBreakoutRoom-=numberArchive[roomId];
+ numberDiscussionRoom-=numberArchive[roomId];
if (document.getElementById(id).className=="visible")
{
@@ -183,6 +182,9 @@
gestionDisplay(false)
}
+
+
+
function Navigateur()
{
if (navigator.appName.indexOf("Netscape") > -1)
@@ -193,16 +195,19 @@
{
return "Explorer";
}
+
+ if ( navigator.userAgent.indexOf("Safari") != -1)
+ {
+ return "Safari";
+ }
return "Unknown";
}
-function OneClick(id,product,type)
-
-{
-
+function OneClick(id,product,type,nid)
+{
if(currentId!="" && currentId!=id)
document.getElementById(currentId).style.backgroundColor="white";
if(currentId!=id)
@@ -210,27 +215,40 @@
document.getElementById(id).style.backgroundColor="#c3dbf7";
}
currentId=id;
+
+ if(product==VT_PRODUCT )
+ currentNid=nid;
+
currentProduct=product;
typeSelect=type;
-
+
if(document.getElementById("info")!=null && document.getElementById("info").style.display=="block")
document.getElementById("info").style.display="none";
if(currentId!="")
- manageXml("","toolBar");
+ manageXml("","toolBar");
}
function dclick(id)
{
+
if(currentId!=""){
- document.getElementById(currentId).style.backgroundColor="white";
+
currentId=id;
Launch();
}
}
+function managePublicState(id,type){
+if(type=="private")
+ document.getElementById(id).disabled=true;
+else
+ document.getElementById(id).disabled=false;
+}
+
function Horizon()
{
+
if(currentId!="")
startHorizon(currentId, null, null, null, null, 'hzA='+session['authToken'])
}
@@ -248,6 +266,7 @@
studentView=false;
}
currentId="";
+ currentNid="";
currentProduct="";
manageXml("","all");
@@ -265,7 +284,7 @@
if(currentId!="")
{
- var complete_url=url+'?product='+currentProduct+'&id='+currentId+'&'+param;
+ var complete_url=url+'?type='+typeSelect+'&product='+currentProduct+'&id='+currentId+'&'+param;
window.open(complete_url,"_self");
@@ -317,6 +336,7 @@
currentFilter=id;
currentDiv=divNumber;
currentId="";
+ currentNid="";
currentProduct="";
manageXml('',"all");
@@ -347,38 +367,42 @@
function startBoard(type)
{
- if(currentId!="")
+ if(currentNid!="")
{
- var type;
- if(typeSelect=="voiceBoard"){
- type="board"
- }
- else if(typeSelect=="voicePresentation"){
- type="presentation"
- }
- window.open(session["vtServerUrl"]+'/'+type+'?action=display_popup&nid='+currentId,"vt_popup",'scrollbars=yes,resizable=yes,width=800,height=500')
- }
+ var type;
+ if(typeSelect==VB_PRODUCT){
+ type="board"
+ window.open(session["vtServerUrl"]+'/'+type+'?action=display_popup&nid='+currentNid,"vt_popup",'scrollbars=yes,resizable=yes,width=800,height=500')
+ }
+ else if(typeSelect==VP_PRODUCT){
+ type="presentation"
+ window.open(session["vtServerUrl"]+'/'+type+'?action=display_popup&nid='+currentNid,"vt_popup",'scrollbars=yes,resizable=yes,width=100,height=500')
+
+ }
+ }
+
}
function search(value){
currentId=""
+ currentNid=""
currentProduct=""
manageXml(search.value,"all");
gestionDisplay();
}
function Launch(){
- if(currentProduct=="liveClassroom"){
+
+
+ if(currentProduct==LC_PRODUCT){
Horizon();
- }else if(currentProduct=="voiceBoard"){
-
+ }else if(currentProduct==VT_PRODUCT){
+
startBoard(typeSelect);
}
-
- currentId="";
- currentProduct="";
-
+
+
}
@@ -407,23 +431,23 @@
}
if ( useplugin != null ) {
- horizonurl += "&useplugin=" + useplugin;
+ horizonurl += "&useplugin=" + useplugin;
}
if ( user != null ) {
- horizonurl += "&AuthName=Horizon&credential_0=" + user;
+ horizonurl += "&AuthName=Horizon&credential_0=" + user;
}
if ( password != null ) {
- horizonurl += "&credential_1=" + password;
+ horizonurl += "&credential_1=" + password;
}
if ( nickname != null ) {
- horizonurl += "&credential_2=" + nickname;
+ horizonurl += "&credential_2=" + nickname;
}
if ( paramstring != null ) {
- horizonurl += "&" + paramstring;
+ horizonurl += "&" + paramstring;
}
// open a window with the horizon ui
@@ -442,8 +466,8 @@
}
function submitForm(url,action,id){
-alert(id);
- if(currentProduct=="liveClassroom")
+
+ if(currentProduct==LC_PRODUCT)
verifyFormLiveClassRoom(url+'?product='+currentProduct+'&id='+id+'&action='+action+'&time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]);
else
verifyFormVoiceBoard(url+'?product='+currentProduct+'&id='+id+'&action='+action+'&time='+session["timeOfLoad"]+'&enc_course_id='+session["courseId"]+'&enc_email='+session["email"]+'&enc_firstname='+session["firstName"]+'&enc_lastname='+session["lastName"]+'&enc_role='+session["role"]+'&signature='+session["signature"]);
@@ -483,6 +507,7 @@
function initSearch(search){
currentProduct="";
currentId="";
+ currentNid=""
manageXml(search,"all");
document.getElementById("search").focus();
}
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2006-12-22 10:01:56 UTC (rev 120)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2006-12-22 10:11:12 UTC (rev 121)
@@ -3,7 +3,7 @@
function manageXml(search,divToReload){
var display="";
-
+
if(divToReload=="all"){
display+="<form method=post name=myform>"
display+=initDisplay();
@@ -23,7 +23,7 @@
for(var i=0;i<windowsElements.length;i++){
// display+=openPart();
var type = windowsElements[i].getElements("type")[0].getText();
-
+
switch(type){
case "headerBar":
if(divToReload=="all" ){
@@ -60,7 +60,7 @@
}
break;
- case "messageBar":
+ case "message":
if(divToReload=="all"){
display+=openDiv("messageBar","messageBar")
display+=displayMessageBar(windowsElements[i].getElements("windowsElementParameters"));
@@ -153,7 +153,8 @@
correctPNG();
if(divToReload=="all" || divToReload=="list"){
- gestionDisplay(false);
+
+ gestionDisplay(false);
document.getElementById("search").focus();
}
@@ -167,8 +168,9 @@
var messageInformations=elementParameters[0].getElements("message")
switch(messageInformations[0].getElements("type")[0].getText()){
- case "info":
- pictureUrl="pictures/items/messagelabel-info.png";
+ case "message":
+ display="<table><tr><td><img src='pictures/items/messagelabel-info.png'></td><td>"+messageInformations[0].getElements("value")[0].getText()+"</td></tr></table>"
+
break;
case "error":
@@ -293,7 +295,8 @@
var display="";
var actionString=""
-
+ if(session["role"]=="Student")
+ studentView=true;
var actionString=action[0].getElements("name")[0].getText()+"(";
@@ -306,40 +309,73 @@
actionString+="\'"+ actionParameters[j].getText()+"\',";
}
actionString+=")";
-
- if(typeOfUser=="all" || (typeOfUser=="instructor" && studentView==false)){
-
+ var actionDelete="";
+ if( typeOfUser=="all" || (typeOfUser=="instructor" && studentView==false)){
+
if(availibility=="true" || currentId!=""){
- if(product=="all" || currentProduct==product){
- display+="<td align='center' class='button_enabled'>"
- display+="<a href=\"javascript:"+actionString+";\">"
-
- display+="<img src='"+pictureUrl+".png' style='text-decoration:none;' border=0 id='"+value+"' name='"+value+"_icon' ><br style='text-decoration:none;' />"
+ if(product=="all" || currentTool=="all"){
+ if(value=="Delete")
+ {
+ actionDelete="onclick=\";return confirm('Are you sure to delete this element?');\""
+ }
+ display+="<td align='center' class='button_enabled' "+actionDelete+">"
+
+ display+="<a href=\"javascript:"+actionString+";\">"
+ display+="<img src='"+pictureUrl+".png' style='text-decoration:none;height:26px' border=0 id='"+value+"' name='"+value+"_icon' ><br style='text-decoration:none;' />"
+
display+=value ;
display+="</a></td> "
- }else{
- display+="<td align='center' class='button_disabled' >"
+ }else if(currentTool==product ){
+ if(value=="Delete")
+ {
+ actionDelete="onclick=\";return confirm('Are you sure to delete this element?');\""
+ }
+ display+="<td align='center' class='button_enabled' "+actionDelete+">"
+
+ display+="<a href=\"javascript:"+actionString+";\">"
+
+ display+="<img src='"+pictureUrl+".png' style='text-decoration:none;height:26px' border=0 id='"+value+"' name='"+value+"_icon' ><br style='text-decoration:none;' />"
+
+ display+=value ;
+ display+="</a></td> "
+
+ }else if(currentTool!=product ){
+
+ display+="<td align='center' class='empty_space'> </td>"
+
+ }else {
+
+ display+="<td align='center' class='button_disabled' "+actionDelete+">"
+
display+="<img src='"+pictureUrl+"-disabled.png' border=0 id='"+value+"' name='"+value+"_icon' height='24' width='24'><br />"
display+=value ;
- display+="</td> "
+ display+="</td> "
+
}
}else{
- display+="<td align='center' class='button_disabled' >"
-
- display+="<img src='"+pictureUrl+"-disabled.png' border=0 id='"+value+"' name='"+value+"_icon' height='24' width='24'><br />"
+
+ if(currentTool==product || product=="all" || currentTool=="all"){
+ display+="<td align='center' class='button_disabled' "+actionDelete+" >"
+
+ display+="<img src='"+pictureUrl+"-disabled.png' border=0 id='"+value+"' name='"+value+"_icon' height='24' width='24'><br />"
- display+=value ;
- display+="</td> "
+ display+=value ;
+ display+="</td> "
+ }else{
+ display+="<td align='center' class='empty_space'> </td>"
+
+
+ }
}
}else{ // the button is unavalaible for this user
display+="<td align='center' class='empty_space'> </td>"
}
- display+="<td class='separator_space'></td> "
+ display+="<td class='separator_space'> </td> "
return display;
}
@@ -347,9 +383,23 @@
function displayToolBarSearch(search)
{
var display="";
+
+ if(Navigateur()=="Safari"){
+ display+="<td align='right' width=115px>"
+ display+="<table border=0 class='search' cellspacing=0 cellpadding=0 >"
+ display+="<tr>"
+
+ display+="<td align='right' >"
+ display+="<input name='search' id='search' type='search' style='border:0; width: 110px;' "
+ display+="onkeyup='javascript:manageXml(search.value,\"list\");' onClick='javascript:initSearch(search.value);' value='"+search+"' />"
+ display+="</td>"
+ display+="</tr>"
+ display+="</table>"
+ display+="</td>"
+ }else{
display+="<td align='right' width=115px>"
- display+="<table border=0 class='search' cellspacing=0 cellpadding=0 >"
+ display+="<table border=0 class='search' cellspacing=0 cellpadding=0 style=border:none>"
display+="<tr>"
display+="<td align='right' width=26px style='background-image: url(pictures/items/headerbar-searchfield-left.png); background-repeat:no-repeat;'>"
display+="</td>"
@@ -366,6 +416,8 @@
display+="</tr>"
display+="</table>"
display+="</td>"
+ }
+
return display;
}
@@ -435,7 +487,7 @@
{
//clear the global variable
numberMainLectureRoom=0;
- numberBreakoutRoom=0;
+ numberDiscussionRoom=0;
numberVoiceBoard=0;
numberVoicePresentation=0;
@@ -475,11 +527,17 @@
var content = list[0].getElements("listElements");
+
+ if(content!=""){
var listElements = content[0].getElements("listElement");
var positionDiscussionRoom=0;
var positionMainLecture=0;
var orphanedMainLecture="";
var orphanedDiscussion="";
+
+ if(session["role"]=="Student")
+ studentView=true;
+
for(i=0; i< listElements.length; i++)
{
var parameters=listElements[i].getElements("listElementParameters");
@@ -487,47 +545,46 @@
var results = parameters[0].getElements("nameDisplay")[0].getText().toLowerCase().match(mysearch.toLowerCase())
if(search==null || results!=null)
{
-
- if(studentView==false || (studentView==true && parameters[0].getElements("preview")[0].getText()=="available")){
-
+ if(studentView==false || ((studentView==true) && parameters[0].getElements("preview")[0].getText()=="available")){
+
switch(parameters[0].getElements("typeOfElement")[0].getText()){
- case "Main Lecture":
+ case LC_MAINLECTURE:
//test needed for orphaned
if(currentFilter=="all" || currentDiv== parameters[0].getElements("position")[0].getText()){
- parts[parameters[0].getElements("position")[0].getText()]=parts[parameters[0].getElements("position")[0].getText()]+addRoomElement("mainLectureRoom",parameters);
+ parts[parameters[0].getElements("position")[0].getText()]=parts[parameters[0].getElements("position")[0].getText()]+addRoomElement(LC_MAINLECTURE,parameters);
numberMainLectureRoom++;
positionMainLecture=parameters[0].getElements("position")[0].getText();
}
break;
- case "DiscussionRoom":
+ case "Discussion":
if(currentFilter=="all" || currentDiv== parameters[0].getElements("position")[0].getText()){
-
- parts[parameters[0].getElements("position")[0].getText()]=parts[parameters[0].getElements("position")[0].getText()]+addRoomElement("discussionRoom",parameters);
- numberBreakoutRoom++;
+
+ parts[parameters[0].getElements("position")[0].getText()]=parts[parameters[0].getElements("position")[0].getText()]+addRoomElement("Discussion",parameters);
+ numberDiscussionRoom++;
positionDiscussionRoom=parameters[0].getElements("position")[0].getText();
}
break;
- case "VoiceBoard":
- parts[parameters[0].getElements("position")[0].getText()]=parts[parameters[0].getElements("position")[0].getText()]+addBoardElement("voiceBoard",parameters);
+ case VB_PRODUCT:
+ parts[parameters[0].getElements("position")[0].getText()]=parts[parameters[0].getElements("position")[0].getText()]+addBoardElement(VB_PRODUCT,parameters);
numberVoiceBoard++;
break;
- case "VoicePresentation":
+ case VP_PRODUCT:
- parts[parameters[0].getElements("position")[0].getText()]=parts[parameters[0].getElements("position")[0].getText()]+addBoardElement("voicePresentation",parameters);
+ parts[parameters[0].getElements("position")[0].getText()]=parts[parameters[0].getElements("position")[0].getText()]+addBoardElement(VP_PRODUCT,parameters);
numberVoicePresentation++;
break;
case "orphanedArchive":
- if(parameters[0].getElements("type")[0].getText()=="discussionRoom")
+ if(parameters[0].getElements("type")[0].getText()==LC_DISCUSSION)
{ orphanedDiscussion=orphanedDiscussion+addOrphanedElement(parameters);
- numberBreakoutRoom++;
+ numberDiscussionRoom++;
}
- else if(parameters[0].getElements("type")[0].getText()=="mainLectureRoom")
+ else if(parameters[0].getElements("type")[0].getText()==LC_MAINLECTURE)
{ orphanedMainLecture=orphanedMainLecture+addOrphanedElement(parameters);
numberMainLectureRoom++;
}
@@ -536,7 +593,7 @@
}
}
}
-
+ }
var display="";
display+="<table border='0' align='center' cellpadding='0' cellspacing='0' width=100% >";
@@ -554,15 +611,18 @@
display+=parts[i];
}
display+="</td></tr>";
+ display+="<tr><td height=5px></td></tr>"
}
display+="</table>";
+
return display;
}
function openDivProduct(name,cssStyle,value){
var display="";
- display+="<div id='div"+name+"Title' >";
+
+ display+="<div id='div"+name+"Title' class='separateProduct'>";
display+="<table cellpadding='0' cellspacing='0' width='100%'>";
display+="<tr class='productTitle'>";
@@ -583,7 +643,7 @@
{
var display="";
- display += "<tr id="+parameters[0].getElements("id")[0].getText()+" height=16px Onclick=\"OneClick('"+parameters[0].getElements("id")[0].getText()+"','liveclassroom','archive')\" Ondblclick=\"javascript:startHorizon('"+parameters[0].getElements("id")[0].getText()+"', null, null, null, null, 'hzA="+session["authToken"]+"')\" class='room'>"
+ display += "<tr id="+parameters[0].getElements("id")[0].getText()+" height=16px Onclick=\"OneClick('"+parameters[0].getElements("id")[0].getText()+"','"+LC_PRODUCT+"','archive')\" Ondblclick=\"javascript:startHorizon('"+parameters[0].getElements("id")[0].getText()+"', null, null, null, null, 'hzA="+session["authToken"]+"')\" class='room'>"
display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.png\" border=\"0\" /></td>";
display += "<td width=16px align=\"left\"><img src=\"pictures/items/space-16x16px.png\" border=\"0\" /></td>";
@@ -610,7 +670,7 @@
function displayBoard(type,availibility,title,rid,nid)
{
var display="";
- display += "<tr id="+rid+" height=16px Onclick=\"OneClick('"+rid+"','voiceBoard','"+type+"')\" Ondblclick=\"javascript:dclick('"+nid+"')\" class='room'>"
+ display += "<tr id='"+rid+"' height=16px Onclick=\"OneClick('"+rid+"','"+VT_PRODUCT+"','"+type+"','"+nid+"')\" Ondblclick=\"javascript:dclick('"+rid+"')\" class='room'>"
display += "<td width=16px align=\"left\"><img src=\"pictures/items/listitem-"+type+"icon.png\" border=\"0\" /></td>";
display += "<td width=16px align=\"left\" Ondblclick=''></td>";
@@ -647,10 +707,10 @@
display += "<tr id="+roomId+" height=16px class='room'>"
- display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"','liveClassroom','"+type+"')\" width=16px align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.png\" border=\"0\" /></td>";
+ display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"','"+LC_PRODUCT+"','"+type+"')\" width=16px align=\"left\"><img src=\"pictures/items/listitem-liveclassroomicon.png\" border=\"0\" /></td>";
display += "<td align=\"left\" Onclick=\"javascript:hideArchive('"+type+"','"+roomId+"hide','toggleimg"+roomId+"hide','"+roomId+"')\" width=16px><img src='"+archive+"' id=\"toggleimg"+roomId+"hide\" border=\"0\" /></td>";
- display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"','liveClassroom','"+type+"')\" width=300px ><label onmousemove='javascript:ShowToolTip(event,\""+longname+"\",\""+availibility+"\")' onmouseout='javascript:HideToolTip()'>"+longname+"</label></td>";
- display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"','liveClassroom','"+type+"')\" class='shiftAvailability' align=right ><img src=\"pictures/items/listitem-"+availibility+".png\"/></td>";
+ display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"','"+LC_PRODUCT+"','"+type+"')\" width=300px ><label onmousemove='javascript:ShowToolTip(event,\""+longname+"\",\""+availibility+"\")' onmouseout='javascript:HideToolTip()'>"+longname+"</label></td>";
+ display += "<td Ondblclick=\"dclick('"+roomId+"')\" Onclick=\"OneClick('"+roomId+"','"+LC_PRODUCT+"','"+type+"')\" class='shiftAvailability' align=right ><img src=\"pictures/items/listitem-"+availibility+".png\"/></td>";
display += "</tr>";
if(archives!=null){
@@ -674,11 +734,11 @@
{
if(studentView==false || (studentView==true && archive[i].getElements("preview")[0].getText()=="available")){
- display += "<tr id="+archive[i].getElements("id")[0].getText()+" height=16px Onclick=\"OneClick('"+archive[i].getElements("id")[0].getText()+"','liveclassroom')\" Ondblclick=\"javascript:startHorizon('"+archive[i].getElements("id")[0].getText()+"', null, null, null, null, 'hzA="+session["authToken"]+"')\" class='archive'>"
+ 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 width=16px align=\"left\"><img src=\"pictures/items/listitem-subitem.jpg\" border=\"0\" /></td>";
- display += "<td width='300px' class='archive' ><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 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 += "</tr>";
}else{
@@ -715,9 +775,13 @@
actionJavascript+="\""+ actionParameters[j].getText()+"\",";
}
actionJavascript+=")";
-
+ var height="72px";
- display +="<table cellspacing='0' cellpadding='0' align=center width=100% border='0' >";
+
+ if(currentProduct==VT_PRODUCT)
+ height="116px"
+
+ display +="<table cellspacing='0' cellpadding='0' align=center width=100% border='0' height="+height+" >";
display +="<tr onclick='"+actionJavascript+"'>";
display+= "<td align=center width=130px><img src='"+informations[0].getElements("pictureUrl")[0].getText()+"' /><br><label>"+informations[0].getElements("value")[0].getText()+"</label></td>"
display +="<td>"+informations[0].getElements("description")[0].getText()+"</td>";
@@ -797,32 +861,45 @@
var line=div[j].getElements("panelLine");
display +="<div style='border-bottom: #818181 1px solid;height:200px;display:"+info[j].getElements("display")[0].getText()+";' id='span"+info[j].getElements("position")[0].getText()+"' class=tab>";
-display +="<table cellspacing='5px' cellpadding='0' align='center' border='0' width=100%>";
+display +="<table cellspacing='5px' cellpadding='0px' align='center' border='0' width=100%>";
for(var i=0;i<line.length; i++){
- if(line[i].getElements("style")[0].getText()!="" && (line[i].getElements("style")[0].getText()=="hide"|| line[i].getElements("style")[0].getText()=="hideAndShift")){
- display +="<tr ><td>";
+ if(line[i].getElements("style")[0].getText()=="hide" ){
+
+ display +="<tr>";
- display +="<div id='"+line[i].getElements("id")[0].getText()+"' class='"+line[i].getElements("style")[0].getText()+"'><table cellspacing='0px' cellpadding='0'><tr>"
- display += DisplayElementsLine(line[i].getElements("panelLinePart"));
- display += "</tr></table></div>"
- display +="</td></tr>";
+ display += DisplayElementsLine(line[i].getElements("panelLinePart"),line[i].getElements("id")[0].getText(),true,line[i].getElements("style")[0].getText());
+
+ display +="</tr>";
+
- }else{
- display +="<tr class='"+line[i].getElements("style")[0].getText()+"'>";
+ }
+ else if(line[i].getElements("style")[0].getText()=="visible" ){
+
+ display +="<tr>";
- display += DisplayElementsLine(line[i].getElements("panelLinePart"));
+ display += DisplayElementsLine(line[i].getElements("panelLinePart"),line[i].getElements("id")[0].getText(),true,line[i].getElements("style")[0].getText());
- display +="</tr>";
+ display +="</tr>";
+
+
}
+
+
+ else{
+
+ display +="<tr class='"+line[i].getElements("style")[0].getText()+"'>";
+
+ display += DisplayElementsLine(line[i].getElements("panelLinePart"),line[i].getElements("id")[0].getText());
+
+ display +="</tr>";
+ }
}
-
-
display +="</table>";
display +="</div>";
}
@@ -832,28 +909,45 @@
return display;
}
+function displayDiv(){
-function DisplayElementsLine(linePart){
+}
+
+
+
+
+function DisplayElementsLine(linePart,id,hide,styleDiv){
+
+
var display="";
for(var j=0;j<linePart.length; j++){
var elements=linePart[j].getElements("lineElement")
display +="<td";
var style=new String(linePart[j].getElements("style")[0].getText());
- if(style != "")
+
+ if(style != "" )
display+=" class="+style;
+
var colspan=new String(linePart[j].getElements("colspan")[0].getText());
if(colspan != "0")
display+=" colspan="+colspan;
- var align=new String(linePart[j].getElements("align")[0].getText());
+ var align=new String(linePart[j].getElements("align")[0].getText());
if(align != "")
+ display+=" align="+align;
display+=" >"
+
+ if(hide==true)
+ display+="<div id="+id+" class='"+styleDiv+"'><table ><tr><td>"
for(var i=0;i<elements.length; i++){
+
+
var context=new String(elements[i].getElements("displayContext")[0].getText());
-
+
if(context.indexOf("all")!=-1 || context.indexOf(typeSelect)!=-1){
switch(elements[i].getElements("type")[0].getText()){
+
case "label":
display += displayElement("label",elements[i].getElements("parameters"));
@@ -882,6 +976,8 @@
}
}
}
+ if(hide==true)
+ display+="</td></tr></table></div>"
display +="</td>";
}
@@ -989,7 +1085,6 @@
}
-
return display;
}
@@ -1010,7 +1105,7 @@
var product="";
display="<table cellspacing='0' cellpadding='0'>"
display+= "<tr>"
- display+= "<td align=left><label class='roomNameForSettings'> "+contextBarInformations[0].getElements("name")[0].getText()+"</label><label>: "+context+"</label></td>"
+ display+= "<td align=left class='roomNameForSetting'>"+contextBarInformations[0].getElements("name")[0].getText()+"<label> : "+context+"</label></td>"
display+= "<td align=right>"+product+"</td>"
display+= "</tr>"
@@ -1106,14 +1201,24 @@
session["role"] = informations[0].getElements("role")[0].getText();
if(informations[0].getElements("authToken")!="")
session["authToken"] = informations[0].getElements("authToken")[0].getText();
- if(informations[0].getElements("vtServerUrl")!="")
- session["vtServerUrl"] = informations[0].getElements("vtServerUrl")[0].getText();
-
- else
- currentTool="voiceTools";
- if(informations[0].getElements("lcServerUrl")!="")
+
+
+ if(informations[0].getElements("lcServerUrl")[0].getText()!="" && informations[0].getElements("vtServerUrl")[0].getText()!=""){
+ session["vtServerUrl"] = informations[0].getElements("vtServerUrl")[0].getText();
+ session["lcServerUrl"] = informations[0].getElements("lcServerUrl")[0].getText();
+
+ currentTool="all";
+ }
+ else if(informations[0].getElements("vtServerUrl")[0].getText()!=""){
+ session["vtServerUrl"] = informations[0].getElements("vtServerUrl")[0].getText();
+
+ currentTool=VT_PRODUCT;
+ }
+ else if(informations[0].getElements("lcServerUrl")[0].getText()!=""){
session["lcServerUrl"] = informations[0].getElements("lcServerUrl")[0].getText();
- else
- currentTool="liveClassroom";
+ currentTool=LC_PRODUCT;
+
+ }
-}
+
+}
\ No newline at end of file
Modified: trunk/moodle/mod/liveclassroom/js/pngfix.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/pngfix.js 2006-12-22 10:01:56 UTC (rev 120)
+++ trunk/moodle/mod/liveclassroom/js/pngfix.js 2006-12-22 10:11:12 UTC (rev 121)
@@ -32,4 +32,4 @@
}
}
-
\ No newline at end of file
+
Modified: trunk/moodle/mod/liveclassroom/js/verifForm.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/verifForm.js 2006-12-22 10:01:56 UTC (rev 120)
+++ trunk/moodle/mod/liveclassroom/js/verifForm.js 2006-12-22 10:11:12 UTC (rev 121)
@@ -107,7 +107,7 @@
function check_time(fd, fm, fy, fth, ftm, td, tm, ty, tth, ttm) {
- var d = window.document.entry_info_form;
+ var d = window.document.myform;
var fday = parseInt(fd);
var fmon = parseInt(fm);
var fyear = parseInt(fy);
Deleted: trunk/moodle/mod/liveclassroom/js/xml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/xml.js 2006-12-22 10:01:56 UTC (rev 120)
+++ trunk/moodle/mod/liveclassroom/js/xml.js 2006-12-22 10:11:12 UTC (rev 121)
@@ -1,956 +0,0 @@
-// JScript File
-
-function manageXml(search,divToReload){
-
- var display="";
-
- if(divToReload=="all"){
- display+="<form method=post name=myform>"
- display+=initDisplay();
- }
- //session management
- var information= objDomTree.getElements("information");
-
- if(information!="")
- createSession(information);
-
- //Get windows Element
- var windows = objDomTree.getElements("windows");
- //get the different part of the windows
- var windowsElements = windows[0].getElements("windowsElement");
- for(var i=0;i<windowsElements.length;i++){
- // display+=openPart();
- var type = windowsElements[i].getElements("type")[0].getText();
-
- switch(type){
- case "headerBar":
- if(divToReload=="all" ){
- display+=openDiv("headerBar","headerBar");
- display+=displayHeaderBar(windowsElements[i].getElements("windowsElementParameters"));
- display+=closeDiv();
- }else if(divToReload=="headerBar"){
-
- display+=displayHeaderBar(windowsElements[i].getElements("windowsElementParameters"));
-
- }
- break;
- case "toolBar":
- if(divToReload=="all"){
- display+=openDiv("toolBar","toolBar")
- display+=displayToolBar(windowsElements[i].getElements("windowsElementParameters"),search);
- display+=closeDiv();
- }
- else if(divToReload=="toolBar"){
- display+=displayToolBar(windowsElements[i].getElements("windowsElementParameters"),search);
-
- }
- break;
- case "filterBar":
- if(divToReload=="all"){
- display+=openDiv("filterBar","filterBar")
- display+=displayFilterBar(windowsElements[i].getElements("windowsElementParameters"));
- display+=closeDiv();
- }else if(divToReload=="filterBar"){
-
- display+=displayFilterBar(windowsElements[i].getElements("windowsElementParameters"));
-
- }
- break;
- case "messageBar":
- if(divToReload=="all"){
- display+=openDiv("messageBar","messageBar")
- display+=displayMessageBar(windowsElements[i].getElements("windowsElementParameters"));
- display+=closeDiv();
- }else if(divToReload=="messageBar"){
-
- display+=displayMessageBar(windowsElements[i].getElements("windowsElementParameters"));
-
- }
- break;
- case "list":
- if(divToReload=="all"){
- display+=openDiv("list","list") //style='height:245px;overflow-y:scroll'"
- display+=displayList(windowsElements[i].getElements("windowsElementParameters"),search);
- display+=closeDiv();
- }else if(divToReload=="list"){
-
- display+=displayList(windowsElements[i].getElements("windowsElementParameters"),search);
-
- }
- break;
- case "settings":
- if(divToReload=="all" ){
- display+=openDiv("settings","settings")
- display+=displaySettings(windowsElements[i].getElements("windowsElementParameters"));
- display+=closeDiv();
- }else if(divToReload=="settings"){
- display+=displaySettings(windowsElements[i].getElements("windowsElementParameters"));
-
-
- }
- break;
- case "contextBar":
- if(divToReload=="all"){
- display+=openDiv("contextBar","contextBar")
- display+=displayContextBar(windowsElements[i].getElements("windowsElementParameters"));
- display+=closeDiv();
- }else if(divToReload=="contextBar"){
-
- display+=displayContextBar(windowsElements[i].getElements("windowsElementParameters"));
-
- }
- break;
- case "validationBar":
- if(divToReload=="all" ){
- display+=openDiv("validationBar","validationBar")
- display+=displayValidationBar(windowsElements[i].getElements("windowsElementParameters"));
- display+=closeDiv();
-
- display+="</form>"
- }else if(divToReload=="validationBar"){
- display+=displayValidationBar(windowsElements[i].getElements("windowsElementParameters"));
- display+="</form>"
-
- }
- break;
- case "productChoice":
- if(divToReload=="all"){
- display+=openDiv("productChoice","productChoice")
- display+=displayProductChoice(windowsElements[i].getElements("windowsElementParameters"));
- display+=closeDiv();
- }else if(divToReload=="productChoice"){
-
- display+=displayProductChoice(windowsElements[i].getElements("windowsElementParameters"));
-
- }
- break;
-
- }
- // display+=displayPart();
- }
-
- display+=closeDisplay();
-
- document.getElementById(divToReload).innerHTML = display;
-
- if(divToReload=="all"){
- //gestionDisplay(false);
- // document.getElementById("search").focus();
- }
-}
-
-
-function displayHeaderBar(elementParameters){
- var display="";
- var headerBarInformations=elementParameters[0].getElements("headerBarInformations")
- display="<table cellspacing=0 cellpadding=0>"
- display+= "<tr>"
- display+= "<td><img...
[truncated message content] |
|
From: <sh...@us...> - 2006-12-29 12:06:30
|
Revision: 149
http://svn.sourceforge.net/hw4mdl/?rev=149&view=rev
Author: shazan
Date: 2006-12-29 04:06:29 -0800 (Fri, 29 Dec 2006)
Log Message:
-----------
add features of js files and fix bug 10533. Dialog while deleting Archive/room
Modified Paths:
--------------
trunk/moodle/mod/liveclassroom/js/constants.js
trunk/moodle/mod/liveclassroom/js/hwCommons.js
trunk/moodle/mod/liveclassroom/js/manageXml.js
trunk/moodle/mod/liveclassroom/js/verifForm.js
Removed Paths:
-------------
trunk/moodle/mod/liveclassroom/js/verif.js
Modified: trunk/moodle/mod/liveclassroom/js/constants.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/constants.js 2006-12-29 11:05:36 UTC (rev 148)
+++ trunk/moodle/mod/liveclassroom/js/constants.js 2006-12-29 12:06:29 UTC (rev 149)
@@ -16,11 +16,12 @@
var currentId="";
var currentProduct="";
var currentTool="all";
+ var currentIdtab="1";
var typeSelect=LC_MAINLECTURE;
var longname="";
var description="";
var currentNid="";
-
+var message=false;
var currentDiv=0;
var numberMainLectureRoom=0;
var numberDiscussionRoom=0;
@@ -28,6 +29,7 @@
var numberVoicePresentation=0;
var studentView=false;
var numberArchive=new Array();
+var isFilter=false;
// xml
var objDom;
var objDomTree;
Modified: trunk/moodle/mod/liveclassroom/js/hwCommons.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/hwCommons.js 2006-12-29 11:05:36 UTC (rev 148)
+++ trunk/moodle/mod/liveclassroom/js/hwCommons.js 2006-12-29 12:06:29 UTC (rev 149)
@@ -59,10 +59,16 @@
}
- function confirmDelete(delUrl, type){
- if (confirm("Are you really sure you want to delete this " + type + " ?" )) {
- location.href = delUrl
- }
+ function confirmDelete(){
+ var type=""
+ if(currentProduct==LC_PRODUCT && (typeSelect==LC_MAINLECTURE || typeSelect==LC_DISCUSSION) ) type="room"
+ else type="archive"
+ /* else if(currentProduct==VT_PRODUCT && typeSelect==VB_PRODUCT)
+ type="voice board"
+ else if(currentProduct==VT_PRODUCT && typeSelect==VP_PRODUCT)
+ type="voice presentation" */
+ return confirm("Are you sure you want to delete this " + type)
+
}
Modified: trunk/moodle/mod/liveclassroom/js/manageXml.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/manageXml.js 2006-12-29 11:05:36 UTC (rev 148)
+++ trunk/moodle/mod/liveclassroom/js/manageXml.js 2006-12-29 12:06:29 UTC (rev 149)
@@ -149,8 +149,11 @@
document.getElementById(divToReload).innerHTML = display;
- if(Navigateur()=="Explorer" && parseFloat(navigator.appVersion)<5.5)
+ if(navigator.appName.indexOf("Explorer") > -1 && parseFloat(navigator.appVersion)<5.5)
+ {
+
correctPNG();
+ }
if(divToReload=="all" || divToReload=="list"){
@@ -317,7 +320,7 @@
if(product=="all" || currentTool=="all"){
if(value=="Delete")
{
- actionDelete="onclick=\";return confirm('Are you sure you want to delete this room ?');\""
+ actionDelete="onclick=\"javascript:return confirmDelete();\""
}
display+="<td align='center' class='button_enabled' "+actionDelete+">"
@@ -384,14 +387,14 @@
{
var display="";
- if(Navigateur()=="Safari"){
- display+="<td align='right' width=115px>"
- display+="<table border=0 class='search' cellspacing=0 cellpadding=0 >"
+ if(navigator.userAgent.indexOf("Safari") != -1 ){
+ display+="<td align='right' width=120px>"
+ display+="<table border=0 class='search' cellspacing=0 cellpadding=0 style=border:none >"
display+="<tr>"
display+="<td align='right' >"
- display+="<input name='search' id='search' type='search' style='border:0; width: 110px;' "
- display+="onkeyup='javascript:manageXml(search.value,\"list\");' onClick='javascript:initSearch(search.value);' value='"+search+"' />"
+ display+="<input name='search' id='search' type='search' style='border:0; width: 105px;' "
+ display+="onkeyup='javascript:manageXml(search.value,\"list\",false);' onClick='javascript:initSearch(search.value);' value='"+search+"' />"
display+="</td>"
display+="</tr>"
display+="</table>"
@@ -405,7 +408,7 @@
display+="</td>"
display+="<td align='right' height=26px style='background-image: url(pictures/items/headerbar-searchfield-middle.png); '>"
display+="<input name='search' id='search' type='search' style='border:0; width: 50px;' "
- display+="onkeyup='javascript:manageXml(search.value,\"list\");' onClick='javascript:initSearch(search.value);' value='"+search+"' />"
+ display+="onkeyup='javascript:manageXml(search.value,\"list\",false);' onClick='javascript:initSearch(search.value);' value='"+search+"' />"
display+="</td>"
display+="<td align=left width=26px style='background-image: url(pictures/items/headerbar-searchfield-right.png); background-repeat:no-repeat;'>"
display+="<div id='croix' style='display:none'> "
@@ -420,7 +423,6 @@
return display;
}
-
function displayToolBarSeparator()
{
var display="";
Deleted: trunk/moodle/mod/liveclassroom/js/verif.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/verif.js 2006-12-29 11:05:36 UTC (rev 148)
+++ trunk/moodle/mod/liveclassroom/js/verif.js 2006-12-29 12:06:29 UTC (rev 149)
@@ -1,57 +0,0 @@
-// JScript File
-
- function verifyFormUpdate() {
- var theForm = window.document.entry_info_form;
- var validated = false;
- var errorMessage = "";
- var roomIdPattern = /^[a-z|A-Z|0-9|_]{1,32}$/;
- var longnamePattern = /^[a-z|A-Z|0-9|_| |\'|!|?|(|)|:|\-|\/|]{1,50}$/;
- if (!longnamePattern.test(theForm.longname.value)){
- errorMessage += "Please fill in a Title that is 1-50 alphanumeric or space characters or - / : ' ? ! ( )\n";
- }
- if (theForm.longname.length > 50) {
- errorMessage += "The Title you have entered is too long. This field should not exceed 50 characters.\n";
- }
- if (errorMessage.length > 0) {
- alert(errorMessage);
- } else {
-
- theForm.submit();
- }
- }
-
- function verifyForm() {
-
- var theForm = window.document.entry_info_form;
- var validated = false;
- var errorMessage = "";
- var roomIdPattern = /^[a-z|A-Z|0-9|_]{1,32}$/;
- var userlimitPattern = /^[0-9]+[0-9]*$/;
- var longnamePattern = /^[a-z|A-Z|0-9|_| |\'|!|?|(|)|]{1,50}$/;
- if (!longnamePattern.test(theForm.longname.value)){
- errorMessage += "Please fill in a Title that is 1-50 alphanumeric or space characters or ' ? ! ( ) \n";
- }
- if (theForm.longname.length > 50) {
- errorMessage += "The Title you have entered is too long. This field should not exceed 50 characters.\n";
- }
- var radio = theForm.userlimit;
-
- for (i=0; i<radio.length; i++) {
- if(radio[i].checked && radio[i].value == "true"){
- if (theForm.userlimitValue.value == null || theForm.userlimitValue == "") {
- errorMessage += "Please fill in the user limit value\n";
- }
- if (!userlimitPattern.test(theForm.userlimitValue.value)) {
- errorMessage += "User Limit should be an integer\n";
- } else if (parseInt(theForm.userlimitValue.value) > 100) {
- errorMessage += "User Limit should be less than 100\n";
- }
- }
- }
-
- if (errorMessage.length > 0) {
- alert(errorMessage);
- } else {
- theForm.submit();
- }
- }
\ No newline at end of file
Modified: trunk/moodle/mod/liveclassroom/js/verifForm.js
===================================================================
--- trunk/moodle/mod/liveclassroom/js/verifForm.js 2006-12-29 11:05:36 UTC (rev 148)
+++ trunk/moodle/mod/liveclassroom/js/verifForm.js 2006-12-29 12:06:29 UTC (rev 149)
@@ -1,4 +1,4 @@
- function verifyFormLiveClassRoomUpdate(url) {
+ function verifyFormLiveClassRoomUpdate(url) {
var theForm = window.document.myform;
theForm.action=url;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X