[Hw4mdl-svn] SF.net SVN: hw4mdl: [172] trunk/moodle/mod/liveclassroom
Brought to you by:
jhlinder,
trollinger
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. |