Index: lams_admin/web/timezoneManagement.jsp =================================================================== diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -rc0ae190cb1f4081bcf86fa46b07d1cbbd43ce250 --- lams_admin/web/timezoneManagement.jsp (.../timezoneManagement.jsp) (revision 35a0e719d061c08b52e705135bb2f2126079ed21) +++ lams_admin/web/timezoneManagement.jsp (.../timezoneManagement.jsp) (revision c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250) @@ -2,10 +2,7 @@ <%@ include file="/taglibs.jsp"%> - - +

Index: lams_central/web/css/thickbox.css =================================================================== diff -u -r472bcb813040efc160e074021be5c71c15455f00 -rc0ae190cb1f4081bcf86fa46b07d1cbbd43ce250 --- lams_central/web/css/thickbox.css (.../thickbox.css) (revision 472bcb813040efc160e074021be5c71c15455f00) +++ lams_central/web/css/thickbox.css (.../thickbox.css) (revision c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250) @@ -110,6 +110,7 @@ top: 50%; left: 50%; margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ + background-image: url(../images/loadingAnimation.gif); /* modified by LAMS */ } * html #TB_load { /* ie6 hack */ position: absolute; Fisheye: Tag c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/thickbox-compressed.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/includes/javascript/thickbox.js =================================================================== diff -u --- lams_central/web/includes/javascript/thickbox.js (revision 0) +++ lams_central/web/includes/javascript/thickbox.js (revision c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250) @@ -0,0 +1,331 @@ +/* + * Thickbox 3.1 - One Box To Rule Them All. + * By Cody Lindley (http://www.codylindley.com) + * Copyright (c) 2007 cody lindley + * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php +*/ + +/*This script has been modified by LAMS.*/ + +// fixed according to: http://jamazon.co.uk/web/2008/03/14/jquerybrowserversion-doesnt-recognise-ie7/ +$.browser.msie6 = +$.browser.msie +&& /MSIE 6\.0/i.test(window.navigator.userAgent) +&& !/MSIE 7\.0/i.test(window.navigator.userAgent) +&& !/MSIE 8\.0/i.test(window.navigator.userAgent); + +/*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/ + +//on page load call tb_init +$(document).ready(function(){ + tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox +}); + +//add thickbox to href & area elements that have a class of .thickbox +function tb_init(domChunk){ + $(domChunk).click(function(){ + var t = this.title || this.name || null; + var a = this.href || this.alt; + var g = this.rel || false; + tb_show(t,a,g); + this.blur(); + return false; + }); +} + +function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link + + try { + if (typeof document.body.style.maxHeight === "undefined") {//if IE 6 + $("body","html").css({height: "100%", width: "100%"}); + $("html").css("overflow","hidden"); + if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6 + $("body").append("
"); + $("#TB_overlay").click(tb_remove); + } + }else{//all others + if(document.getElementById("TB_overlay") === null){ + $("body").append("
"); + $("#TB_overlay").click(tb_remove); + } + } + + if(tb_detectMacXFF()){ + $("#TB_overlay").addClass("TB_overlayMacFFBGHack");//use png overlay so hide flash + }else{ + $("#TB_overlay").addClass("TB_overlayBG");//use background and opacity + } + + if(caption===null){caption="";} + $("body").append("
");//add loader to the page /* modified by LAMS */ + $('#TB_load').show();//show loader + + var baseURL; + if(url.indexOf("?")!==-1){ //ff there is a query string involved + baseURL = url.substr(0, url.indexOf("?")); + }else{ + baseURL = url; + } + + var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/; + var urlType = baseURL.toLowerCase().match(urlString); + + if(urlType == '.jpg' || urlType == '.jpeg' || urlType == '.png' || urlType == '.gif' || urlType == '.bmp'){//code to show images + + TB_PrevCaption = ""; + TB_PrevURL = ""; + TB_PrevHTML = ""; + TB_NextCaption = ""; + TB_NextURL = ""; + TB_NextHTML = ""; + TB_imageCount = ""; + TB_FoundURL = false; + if(imageGroup){ + TB_TempArray = $("a[@rel="+imageGroup+"]").get(); + for (TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === "")); TB_Counter++) { + var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString); + if (!(TB_TempArray[TB_Counter].href == url)) { + if (TB_FoundURL) { + TB_NextCaption = TB_TempArray[TB_Counter].title; + TB_NextURL = TB_TempArray[TB_Counter].href; + TB_NextHTML = "  Next >"; + } else { + TB_PrevCaption = TB_TempArray[TB_Counter].title; + TB_PrevURL = TB_TempArray[TB_Counter].href; + TB_PrevHTML = "  < Prev"; + } + } else { + TB_FoundURL = true; + TB_imageCount = "Image " + (TB_Counter + 1) +" of "+ (TB_TempArray.length); + } + } + } + + imgPreloader = new Image(); + imgPreloader.onload = function(){ + imgPreloader.onload = null; + + // Resizing large images - orginal by Christian Montoya edited by me. + var pagesize = tb_getPageSize(); + var x = pagesize[0] - 150; + var y = pagesize[1] - 150; + var imageWidth = imgPreloader.width; + var imageHeight = imgPreloader.height; + if (imageWidth > x) { + imageHeight = imageHeight * (x / imageWidth); + imageWidth = x; + if (imageHeight > y) { + imageWidth = imageWidth * (y / imageHeight); + imageHeight = y; + } + } else if (imageHeight > y) { + imageWidth = imageWidth * (y / imageHeight); + imageHeight = y; + if (imageWidth > x) { + imageHeight = imageHeight * (x / imageWidth); + imageWidth = x; + } + } + // End Resizing + + TB_WIDTH = imageWidth + 30; + TB_HEIGHT = imageHeight + 60; + $("#TB_window").append(""+caption+"" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
close or Esc Key
"); + + $("#TB_closeWindowButton").click(tb_remove); + + if (!(TB_PrevHTML === "")) { + function goPrev(){ + if($(document).unbind("click",goPrev)){$(document).unbind("click",goPrev);} + $("#TB_window").remove(); + $("body").append("
"); + tb_show(TB_PrevCaption, TB_PrevURL, imageGroup); + return false; + } + $("#TB_prev").click(goPrev); + } + + if (!(TB_NextHTML === "")) { + function goNext(){ + $("#TB_window").remove(); + $("body").append("
"); + tb_show(TB_NextCaption, TB_NextURL, imageGroup); + return false; + } + $("#TB_next").click(goNext); + + } + + document.onkeydown = function(e){ + if (e == null) { // ie + keycode = event.keyCode; + } else { // mozilla + keycode = e.which; + } + if(keycode == 27){ // close + tb_remove(); + } else if(keycode == 190){ // display previous image + if(!(TB_NextHTML == "")){ + document.onkeydown = ""; + goNext(); + } + } else if(keycode == 188){ // display next image + if(!(TB_PrevHTML == "")){ + document.onkeydown = ""; + goPrev(); + } + } + }; + + tb_position(); + $("#TB_load").remove(); + $("#TB_ImageOff").click(tb_remove); + $("#TB_window").css({display:"block"}); //for safari using css instead of show + }; + + imgPreloader.src = url; + }else{//code to show html + + var queryString = url.replace(/^[^\?]+\??/,''); + var params = tb_parseQuery( queryString ); + + TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL + TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL + ajaxContentW = TB_WIDTH - 30; + ajaxContentH = TB_HEIGHT - 45; + + if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window + urlNoQuery = url.split('TB_'); + $("#TB_iframeContent").remove(); + if(params['modal'] != "true"){//iframe no modal + $("#TB_window").append("
"+caption+"
close or Esc Key
"); + }else{//iframe modal + $("#TB_overlay").unbind(); + $("#TB_window").append(""); + } + }else{// not an iframe, ajax + if($("#TB_window").css("display") != "block"){ + if(params['modal'] != "true"){//ajax no modal + $("#TB_window").append("
"+caption+"
close or Esc Key
"); + }else{//ajax modal + $("#TB_overlay").unbind(); + $("#TB_window").append("
"); + } + }else{//this means the window is already up, we are just loading new content via ajax + $("#TB_ajaxContent")[0].style.width = ajaxContentW +"px"; + $("#TB_ajaxContent")[0].style.height = ajaxContentH +"px"; + $("#TB_ajaxContent")[0].scrollTop = 0; + $("#TB_ajaxWindowTitle").html(caption); + } + } + + $("#TB_closeWindowButton").click(tb_remove); + + if(url.indexOf('TB_inline') != -1){ + $("#TB_ajaxContent").append($('#' + params['inlineId']).children()); + $("#TB_window").unload(function () { + $('#' + params['inlineId']).append( $("#TB_ajaxContent").children() ); // move elements back when you're finished + }); + tb_position(); + $("#TB_load").remove(); + $("#TB_window").css({display:"block"}); + }else if(url.indexOf('TB_iframe') != -1){ + tb_position(); + if($.browser.safari){//safari needs help because it will not fire iframe onload + $("#TB_load").remove(); + $("#TB_window").css({display:"block"}); + } + }else{ + $("#TB_ajaxContent").load(url += "&random=" + (new Date().getTime()),function(){//to do a post change this load method + tb_position(); + $("#TB_load").remove(); + tb_init("#TB_ajaxContent a.thickbox"); + $("#TB_window").css({display:"block"}); + }); + } + + } + + if(!params['modal']){ + document.onkeyup = function(e){ + if (e == null) { // ie + keycode = event.keyCode; + } else { // mozilla + keycode = e.which; + } + if(keycode == 27){ // close + tb_remove(); + } + }; + } + + } catch(e) { + //nothing here + } +} + +//helper functions below +function tb_showIframe(){ + $("#TB_load").remove(); + $("#TB_window").css({display:"block"}); +} + +function tb_remove() { + $("#TB_imageOff").unbind("click"); + $("#TB_closeWindowButton").unbind("click"); + $("#TB_window").fadeOut("fast",function(){$('#TB_window,#TB_overlay,#TB_HideSelect').trigger("unload").unbind().remove();}); + $("#TB_load").remove(); + if (typeof document.body.style.maxHeight == "undefined") {//if IE 6 + $("body","html").css({height: "auto", width: "auto"}); + $("html").css("overflow",""); + } + document.onkeydown = ""; + document.onkeyup = ""; + + // refresh parent window if certain attribute is set + if ($("#TB_window").attr("TB_refreshParentOnClose") == 'true'){ + parent.location.reload(1); + } + + return false; +} + +function tb_position() { + jQuery("#TB_window").css({marginLeft: '-' + parseInt((TB_WIDTH / 2),10) + 'px', width: TB_WIDTH + 'px'}); + var version = jQuery.browser.version; + if (version instanceof Object) + version=version.number(); + if ( !(jQuery.browser.msie6)) { // take away IE6; fixed according to: http://jamazon.co.uk/web/2008/03/14/jquerybrowserversion-doesnt-recognise-ie7/ + $("#TB_window").css({marginTop: '-' + parseInt((TB_HEIGHT / 2),10) + 'px'}); + } +} + +function tb_parseQuery ( query ) { + var Params = {}; + if ( ! query ) {return Params;}// return empty object + var Pairs = query.split(/[;&]/); + for ( var i = 0; i < Pairs.length; i++ ) { + var KeyVal = Pairs[i].split('='); + if ( ! KeyVal || KeyVal.length != 2 ) {continue;} + var key = unescape( KeyVal[0] ); + var val = unescape( KeyVal[1] ); + val = val.replace(/\+/g, ' '); + Params[key] = val; + } + return Params; +} + +function tb_getPageSize(){ + var de = document.documentElement; + var w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth; + var h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight; + arrayPageSize = [w,h]; + return arrayPageSize; +} + +function tb_detectMacXFF() { + var userAgent = navigator.userAgent.toLowerCase(); + if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox')!=-1) { + return true; + } +} \ No newline at end of file Fisheye: Tag c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/thickbox.patched.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/lessonIntro.jsp =================================================================== diff -u -re64a90c0cc74118c5b88f5cbae323065abd59cac -rc0ae190cb1f4081bcf86fa46b07d1cbbd43ce250 --- lams_central/web/lessonIntro.jsp (.../lessonIntro.jsp) (revision e64a90c0cc74118c5b88f5cbae323065abd59cac) +++ lams_central/web/lessonIntro.jsp (.../lessonIntro.jsp) (revision c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250) @@ -16,7 +16,7 @@ <fmt:message key="title.learner.window"/> - + Index: lams_central/web/main.jsp =================================================================== diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -rc0ae190cb1f4081bcf86fa46b07d1cbbd43ce250 --- lams_central/web/main.jsp (.../main.jsp) (revision 35a0e719d061c08b52e705135bb2f2126079ed21) +++ lams_central/web/main.jsp (.../main.jsp) (revision c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250) @@ -33,10 +33,7 @@ - - + Index: lams_learning/web/lessonChat.jsp =================================================================== diff -u -re64a90c0cc74118c5b88f5cbae323065abd59cac -rc0ae190cb1f4081bcf86fa46b07d1cbbd43ce250 --- lams_learning/web/lessonChat.jsp (.../lessonChat.jsp) (revision e64a90c0cc74118c5b88f5cbae323065abd59cac) +++ lams_learning/web/lessonChat.jsp (.../lessonChat.jsp) (revision c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250) @@ -35,8 +35,6 @@ - + - - + - - + - - + - - + - - + - - + - - + Index: lams_tool_kaltura/web/pages/learning/learning.jsp =================================================================== diff -u -r1420c1000e389cc9a29b3b3d37d2ec63ae735e2d -rc0ae190cb1f4081bcf86fa46b07d1cbbd43ce250 --- lams_tool_kaltura/web/pages/learning/learning.jsp (.../learning.jsp) (revision 1420c1000e389cc9a29b3b3d37d2ec63ae735e2d) +++ lams_tool_kaltura/web/pages/learning/learning.jsp (.../learning.jsp) (revision c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250) @@ -60,14 +60,12 @@ - + Index: lams_tool_kaltura/web/pages/monitoring/summary.jsp =================================================================== diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -rc0ae190cb1f4081bcf86fa46b07d1cbbd43ce250 --- lams_tool_kaltura/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b) +++ lams_tool_kaltura/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision c0ae190cb1f4081bcf86fa46b07d1cbbd43ce250) @@ -8,8 +8,6 @@