Index: lams_admin/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_admin/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_admin/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -49,6 +49,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_central/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_central/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_central/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -63,6 +63,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_central/web/ckeditor/plugins/videorecorder/VideoRecorderCKEditor.jsp =================================================================== diff -u --- lams_central/web/ckeditor/plugins/videorecorder/VideoRecorderCKEditor.jsp (revision 0) +++ lams_central/web/ckeditor/plugins/videorecorder/VideoRecorderCKEditor.jsp (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -0,0 +1,221 @@ + + +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration" %> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="tags-core" prefix="c"%> + +<% + String red5Url = Configuration.get(ConfigurationKeys.RED5_SERVER_URL); + String red5RecordingsUrl = Configuration.get(ConfigurationKeys.RED5_RECORDINGS_URL); +%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ +

+ + + + +

+ +

+ + Index: lams_central/web/ckeditor/plugins/videorecorder/VideoRecorderCKEditor.swf =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/videorecorder/history/history.css =================================================================== diff -u --- lams_central/web/ckeditor/plugins/videorecorder/history/history.css (revision 0) +++ lams_central/web/ckeditor/plugins/videorecorder/history/history.css (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -0,0 +1,6 @@ +/* This CSS stylesheet defines styles used by required elements in a flex application page that supports browser history */ + +#ie_historyFrame { width: 0px; height: 0px; display:none } +#firefox_anchorDiv { width: 0px; height: 0px; display:none } +#safari_formDiv { width: 0px; height: 0px; display:none } +#safari_rememberDiv { width: 0px; height: 0px; display:none } Index: lams_central/web/ckeditor/plugins/videorecorder/history/history.js =================================================================== diff -u --- lams_central/web/ckeditor/plugins/videorecorder/history/history.js (revision 0) +++ lams_central/web/ckeditor/plugins/videorecorder/history/history.js (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -0,0 +1,662 @@ +BrowserHistoryUtils = { + addEvent: function(elm, evType, fn, useCapture) { + useCapture = useCapture || false; + if (elm.addEventListener) { + elm.addEventListener(evType, fn, useCapture); + return true; + } + else if (elm.attachEvent) { + var r = elm.attachEvent('on' + evType, fn); + return r; + } + else { + elm['on' + evType] = fn; + } + } +} + +BrowserHistory = (function() { + // type of browser + var browser = { + ie: false, + firefox: false, + safari: false, + opera: false, + version: -1 + }; + + // if setDefaultURL has been called, our first clue + // that the SWF is ready and listening + //var swfReady = false; + + // the URL we'll send to the SWF once it is ready + //var pendingURL = ''; + + // Default app state URL to use when no fragment ID present + var defaultHash = ''; + + // Last-known app state URL + var currentHref = document.location.href; + + // Initial URL (used only by IE) + var initialHref = document.location.href; + + // Initial URL (used only by IE) + var initialHash = document.location.hash; + + // History frame source URL prefix (used only by IE) + var historyFrameSourcePrefix = 'history/historyFrame.html?'; + + // History maintenance (used only by Safari) + var currentHistoryLength = -1; + + var historyHash = []; + + var initialState = createState(initialHref, initialHref + '#' + initialHash, initialHash); + + var backStack = []; + var forwardStack = []; + + var currentObjectId = null; + + //UserAgent detection + var useragent = navigator.userAgent.toLowerCase(); + + if (useragent.indexOf("opera") != -1) { + browser.opera = true; + } else if (useragent.indexOf("msie") != -1) { + browser.ie = true; + browser.version = parseFloat(useragent.substring(useragent.indexOf('msie') + 4)); + } else if (useragent.indexOf("safari") != -1) { + browser.safari = true; + browser.version = parseFloat(useragent.substring(useragent.indexOf('safari') + 7)); + } else if (useragent.indexOf("gecko") != -1) { + browser.firefox = true; + } + + if (browser.ie == true && browser.version == 7) { + window["_ie_firstload"] = false; + } + + // Accessor functions for obtaining specific elements of the page. + function getHistoryFrame() + { + return document.getElementById('ie_historyFrame'); + } + + function getAnchorElement() + { + return document.getElementById('firefox_anchorDiv'); + } + + function getFormElement() + { + return document.getElementById('safari_formDiv'); + } + + function getRememberElement() + { + return document.getElementById("safari_remember_field"); + } + + // Get the Flash player object for performing ExternalInterface callbacks. + // Updated for changes to SWFObject2. + function getPlayer(id) { + if (id && document.getElementById(id)) { + var r = document.getElementById(id); + if (typeof r.SetVariable != "undefined") { + return r; + } + else { + var o = r.getElementsByTagName("object"); + var e = r.getElementsByTagName("embed"); + if (o.length > 0 && typeof o[0].SetVariable != "undefined") { + return o[0]; + } + else if (e.length > 0 && typeof e[0].SetVariable != "undefined") { + return e[0]; + } + } + } + else { + var o = document.getElementsByTagName("object"); + var e = document.getElementsByTagName("embed"); + if (e.length > 0 && typeof e[0].SetVariable != "undefined") { + return e[0]; + } + else if (o.length > 0 && typeof o[0].SetVariable != "undefined") { + return o[0]; + } + else if (o.length > 1 && typeof o[1].SetVariable != "undefined") { + return o[1]; + } + } + return undefined; + } + + function getPlayers() { + var players = []; + if (players.length == 0) { + var tmp = document.getElementsByTagName('object'); + players = tmp; + } + + if (players.length == 0 || players[0].object == null) { + var tmp = document.getElementsByTagName('embed'); + players = tmp; + } + return players; + } + + function getIframeHash() { + var doc = getHistoryFrame().contentWindow.document; + var hash = String(doc.location.search); + if (hash.length == 1 && hash.charAt(0) == "?") { + hash = ""; + } + else if (hash.length >= 2 && hash.charAt(0) == "?") { + hash = hash.substring(1); + } + return hash; + } + + /* Get the current location hash excluding the '#' symbol. */ + function getHash() { + // It would be nice if we could use document.location.hash here, + // but it's faulty sometimes. + var idx = document.location.href.indexOf('#'); + return (idx >= 0) ? document.location.href.substr(idx+1) : ''; + } + + /* Get the current location hash excluding the '#' symbol. */ + function setHash(hash) { + // It would be nice if we could use document.location.hash here, + // but it's faulty sometimes. + if (hash == '') hash = '#' + document.location.hash = hash; + } + + function createState(baseUrl, newUrl, flexAppUrl) { + return { 'baseUrl': baseUrl, 'newUrl': newUrl, 'flexAppUrl': flexAppUrl, 'title': null }; + } + + /* Add a history entry to the browser. + * baseUrl: the portion of the location prior to the '#' + * newUrl: the entire new URL, including '#' and following fragment + * flexAppUrl: the portion of the location following the '#' only + */ + function addHistoryEntry(baseUrl, newUrl, flexAppUrl) { + + //delete all the history entries + forwardStack = []; + + if (browser.ie) { + //Check to see if we are being asked to do a navigate for the first + //history entry, and if so ignore, because it's coming from the creation + //of the history iframe + if (flexAppUrl == defaultHash && document.location.href == initialHref && window['_ie_firstload']) { + currentHref = initialHref; + return; + } + if ((!flexAppUrl || flexAppUrl == defaultHash) && window['_ie_firstload']) { + newUrl = baseUrl + '#' + defaultHash; + flexAppUrl = defaultHash; + } else { + // for IE, tell the history frame to go somewhere without a '#' + // in order to get this entry into the browser history. + getHistoryFrame().src = historyFrameSourcePrefix + flexAppUrl; + } + setHash(flexAppUrl); + } else { + + //ADR + if (backStack.length == 0 && initialState.flexAppUrl == flexAppUrl) { + initialState = createState(baseUrl, newUrl, flexAppUrl); + } else if(backStack.length > 0 && backStack[backStack.length - 1].flexAppUrl == flexAppUrl) { + backStack[backStack.length - 1] = createState(baseUrl, newUrl, flexAppUrl); + } + + if (browser.safari) { + // for Safari, submit a form whose action points to the desired URL + if (browser.version <= 419.3) { + var file = window.location.pathname.toString(); + file = file.substring(file.lastIndexOf("/")+1); + getFormElement().innerHTML = ''; + //get the current elements and add them to the form + var qs = window.location.search.substring(1); + var qs_arr = qs.split("&"); + for (var i = 0; i < qs_arr.length; i++) { + var tmp = qs_arr[i].split("="); + var elem = document.createElement("input"); + elem.type = "hidden"; + elem.name = tmp[0]; + elem.value = tmp[1]; + document.forms.historyForm.appendChild(elem); + } + document.forms.historyForm.submit(); + } else { + top.location.hash = flexAppUrl; + } + // We also have to maintain the history by hand for Safari + historyHash[history.length] = flexAppUrl; + _storeStates(); + } else { + // Otherwise, write an anchor into the page and tell the browser to go there + addAnchor(flexAppUrl); + setHash(flexAppUrl); + } + } + backStack.push(createState(baseUrl, newUrl, flexAppUrl)); + } + + function _storeStates() { + if (browser.safari) { + getRememberElement().value = historyHash.join(","); + } + } + + function handleBackButton() { + //The "current" page is always at the top of the history stack. + var current = backStack.pop(); + if (!current) { return; } + var last = backStack[backStack.length - 1]; + if (!last && backStack.length == 0){ + last = initialState; + } + forwardStack.push(current); + } + + function handleForwardButton() { + //summary: private method. Do not call this directly. + + var last = forwardStack.pop(); + if (!last) { return; } + backStack.push(last); + } + + function handleArbitraryUrl() { + //delete all the history entries + forwardStack = []; + } + + /* Called periodically to poll to see if we need to detect navigation that has occurred */ + function checkForUrlChange() { + + if (browser.ie) { + if (currentHref != document.location.href && currentHref + '#' != document.location.href) { + //This occurs when the user has navigated to a specific URL + //within the app, and didn't use browser back/forward + //IE seems to have a bug where it stops updating the URL it + //shows the end-user at this point, but programatically it + //appears to be correct. Do a full app reload to get around + //this issue. + if (browser.version < 7) { + currentHref = document.location.href; + document.location.reload(); + } else { + if (getHash() != getIframeHash()) { + // this.iframe.src = this.blankURL + hash; + var sourceToSet = historyFrameSourcePrefix + getHash(); + getHistoryFrame().src = sourceToSet; + } + } + } + } + + if (browser.safari) { + // For Safari, we have to check to see if history.length changed. + if (currentHistoryLength >= 0 && history.length != currentHistoryLength) { + //alert("did change: " + history.length + ", " + historyHash.length + "|" + historyHash[history.length] + "|>" + historyHash.join("|")); + // If it did change, then we have to look the old state up + // in our hand-maintained array since document.location.hash + // won't have changed, then call back into BrowserManager. + currentHistoryLength = history.length; + var flexAppUrl = historyHash[currentHistoryLength]; + if (flexAppUrl == '') { + //flexAppUrl = defaultHash; + } + //ADR: to fix multiple + if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) { + var pl = getPlayers(); + for (var i = 0; i < pl.length; i++) { + pl[i].browserURLChange(flexAppUrl); + } + } else { + getPlayer().browserURLChange(flexAppUrl); + } + _storeStates(); + } + } + if (browser.firefox) { + if (currentHref != document.location.href) { + var bsl = backStack.length; + + var urlActions = { + back: false, + forward: false, + set: false + } + + if ((window.location.hash == initialHash || window.location.href == initialHref) && (bsl == 1)) { + urlActions.back = true; + // FIXME: could this ever be a forward button? + // we can't clear it because we still need to check for forwards. Ugg. + // clearInterval(this.locationTimer); + handleBackButton(); + } + + // first check to see if we could have gone forward. We always halt on + // a no-hash item. + if (forwardStack.length > 0) { + if (forwardStack[forwardStack.length-1].flexAppUrl == getHash()) { + urlActions.forward = true; + handleForwardButton(); + } + } + + // ok, that didn't work, try someplace back in the history stack + if ((bsl >= 2) && (backStack[bsl - 2])) { + if (backStack[bsl - 2].flexAppUrl == getHash()) { + urlActions.back = true; + handleBackButton(); + } + } + + if (!urlActions.back && !urlActions.forward) { + var foundInStacks = { + back: -1, + forward: -1 + } + + for (var i = 0; i < backStack.length; i++) { + if (backStack[i].flexAppUrl == getHash() && i != (bsl - 2)) { + arbitraryUrl = true; + foundInStacks.back = i; + } + } + for (var i = 0; i < forwardStack.length; i++) { + if (forwardStack[i].flexAppUrl == getHash() && i != (bsl - 2)) { + arbitraryUrl = true; + foundInStacks.forward = i; + } + } + handleArbitraryUrl(); + } + + // Firefox changed; do a callback into BrowserManager to tell it. + currentHref = document.location.href; + var flexAppUrl = getHash(); + if (flexAppUrl == '') { + //flexAppUrl = defaultHash; + } + //ADR: to fix multiple + if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) { + var pl = getPlayers(); + for (var i = 0; i < pl.length; i++) { + pl[i].browserURLChange(flexAppUrl); + } + } else { + getPlayer().browserURLChange(flexAppUrl); + } + } + } + //setTimeout(checkForUrlChange, 50); + } + + /* Write an anchor into the page to legitimize it as a URL for Firefox et al. */ + function addAnchor(flexAppUrl) + { + if (document.getElementsByName(flexAppUrl).length == 0) { + getAnchorElement().innerHTML += "" + flexAppUrl + ""; + } + } + + var _initialize = function () { + if (browser.ie) + { + var scripts = document.getElementsByTagName('script'); + for (var i = 0, s; s = scripts[i]; i++) { + if (s.src.indexOf("history.js") > -1) { + var iframe_location = (new String(s.src)).replace("history.js", "historyFrame.html"); + } + } + historyFrameSourcePrefix = iframe_location + "?"; + var src = historyFrameSourcePrefix; + + var iframe = document.createElement("iframe"); + iframe.id = 'ie_historyFrame'; + iframe.name = 'ie_historyFrame'; + //iframe.src = historyFrameSourcePrefix; + try { + document.body.appendChild(iframe); + } catch(e) { + setTimeout(function() { + document.body.appendChild(iframe); + }, 0); + } + } + + if (browser.safari) + { + var rememberDiv = document.createElement("div"); + rememberDiv.id = 'safari_rememberDiv'; + document.body.appendChild(rememberDiv); + rememberDiv.innerHTML = ''; + + var formDiv = document.createElement("div"); + formDiv.id = 'safari_formDiv'; + document.body.appendChild(formDiv); + + var reloader_content = document.createElement('div'); + reloader_content.id = 'safarireloader'; + var scripts = document.getElementsByTagName('script'); + for (var i = 0, s; s = scripts[i]; i++) { + if (s.src.indexOf("history.js") > -1) { + html = (new String(s.src)).replace(".js", ".html"); + } + } + reloader_content.innerHTML = ''; + document.body.appendChild(reloader_content); + reloader_content.style.position = 'absolute'; + reloader_content.style.left = reloader_content.style.top = '-9999px'; + iframe = reloader_content.getElementsByTagName('iframe')[0]; + + if (document.getElementById("safari_remember_field").value != "" ) { + historyHash = document.getElementById("safari_remember_field").value.split(","); + } + + } + + if (browser.firefox) + { + var anchorDiv = document.createElement("div"); + anchorDiv.id = 'firefox_anchorDiv'; + document.body.appendChild(anchorDiv); + } + + //setTimeout(checkForUrlChange, 50); + } + + return { + historyHash: historyHash, + backStack: function() { return backStack; }, + forwardStack: function() { return forwardStack }, + getPlayer: getPlayer, + initialize: function(src) { + _initialize(src); + }, + setURL: function(url) { + document.location.href = url; + }, + getURL: function() { + return document.location.href; + }, + getTitle: function() { + return document.title; + }, + setTitle: function(title) { + try { + backStack[backStack.length - 1].title = title; + } catch(e) { } + //if on safari, set the title to be the empty string. + if (browser.safari) { + if (title == "") { + try { + var tmp = window.location.href.toString(); + title = tmp.substring((tmp.lastIndexOf("/")+1), tmp.lastIndexOf("#")); + } catch(e) { + title = ""; + } + } + } + document.title = title; + }, + setDefaultURL: function(def) + { + defaultHash = def; + def = getHash(); + //trailing ? is important else an extra frame gets added to the history + //when navigating back to the first page. Alternatively could check + //in history frame navigation to compare # and ?. + if (browser.ie) + { + window['_ie_firstload'] = true; + var sourceToSet = historyFrameSourcePrefix + def; + var func = function() { + getHistoryFrame().src = sourceToSet; + window.location.replace("#" + def); + setInterval(checkForUrlChange, 50); + } + try { + func(); + } catch(e) { + window.setTimeout(function() { func(); }, 0); + } + } + + if (browser.safari) + { + currentHistoryLength = history.length; + if (historyHash.length == 0) { + historyHash[currentHistoryLength] = def; + var newloc = "#" + def; + window.location.replace(newloc); + } else { + //alert(historyHash[historyHash.length-1]); + } + //setHash(def); + setInterval(checkForUrlChange, 50); + } + + + if (browser.firefox || browser.opera) + { + var reg = new RegExp("#" + def + "$"); + if (window.location.toString().match(reg)) { + } else { + var newloc ="#" + def; + window.location.replace(newloc); + } + setInterval(checkForUrlChange, 50); + //setHash(def); + } + + }, + + /* Set the current browser URL; called from inside BrowserManager to propagate + * the application state out to the container. + */ + setBrowserURL: function(flexAppUrl, objectId) { + if (browser.ie && typeof objectId != "undefined") { + currentObjectId = objectId; + } + //fromIframe = fromIframe || false; + //fromFlex = fromFlex || false; + //alert("setBrowserURL: " + flexAppUrl); + //flexAppUrl = (flexAppUrl == "") ? defaultHash : flexAppUrl ; + + var pos = document.location.href.indexOf('#'); + var baseUrl = pos != -1 ? document.location.href.substr(0, pos) : document.location.href; + var newUrl = baseUrl + '#' + flexAppUrl; + + if (document.location.href != newUrl && document.location.href + '#' != newUrl) { + currentHref = newUrl; + addHistoryEntry(baseUrl, newUrl, flexAppUrl); + currentHistoryLength = history.length; + } + + return false; + }, + + browserURLChange: function(flexAppUrl) { + var objectId = null; + if (browser.ie && currentObjectId != null) { + objectId = currentObjectId; + } + pendingURL = ''; + + if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) { + var pl = getPlayers(); + for (var i = 0; i < pl.length; i++) { + try { + pl[i].browserURLChange(flexAppUrl); + } catch(e) { } + } + } else { + try { + getPlayer(objectId).browserURLChange(flexAppUrl); + } catch(e) { } + } + + currentObjectId = null; + } + + } + +})(); + +// Initialization + +// Automated unit testing and other diagnostics + +function setURL(url) +{ + document.location.href = url; +} + +function backButton() +{ + history.back(); +} + +function forwardButton() +{ + history.forward(); +} + +function goForwardOrBackInHistory(step) +{ + history.go(step); +} + +//BrowserHistoryUtils.addEvent(window, "load", function() { BrowserHistory.initialize(); }); +(function(i) { + var u =navigator.userAgent;var e=/*@cc_on!@*/false; + var st = setTimeout; + if(/webkit/i.test(u)){ + st(function(){ + var dr=document.readyState; + if(dr=="loaded"||dr=="complete"){i()} + else{st(arguments.callee,10);}},10); + } else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) || (/opera/i.test(u))){ + document.addEventListener("DOMContentLoaded",i,false); + } else if(e){ + (function(){ + var t=document.createElement('doc:rdy'); + try{t.doScroll('left'); + i();t=null; + }catch(e){st(arguments.callee,0);}})(); + } else{ + window.onload=i; + } +})( function() {BrowserHistory.initialize();} ); Index: lams_central/web/ckeditor/plugins/videorecorder/history/historyFrame.html =================================================================== diff -u --- lams_central/web/ckeditor/plugins/videorecorder/history/historyFrame.html (revision 0) +++ lams_central/web/ckeditor/plugins/videorecorder/history/historyFrame.html (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -0,0 +1,29 @@ + + + + + + + + Hidden frame for Browser History support. + + Index: lams_central/web/ckeditor/plugins/videorecorder/icon.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/videorecorder/lang/en.js =================================================================== diff -u --- lams_central/web/ckeditor/plugins/videorecorder/lang/en.js (revision 0) +++ lams_central/web/ckeditor/plugins/videorecorder/lang/en.js (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -0,0 +1,42 @@ +CKEDITOR.plugins.setLang( 'videorecorder', 'en', + { + videorecorder : + { + VideoRecorderBtn : 'Insert a video recording', + button_ok : 'OK', + button_save : 'Save', + button_cancel : 'Cancel', + button_yes : 'Yes', + button_no : 'No', + videorecorder_video_player : 'Video Player', + videorecorder_video_recorder : 'Video Recorder', + videorecorder_web_application_not_available : 'The requested web application is not available', + videorecorder_net_connection_not_connected : 'Connection to the media server could not be established', + videorecorder_net_connection_closed : 'Connection to the media server closed', + videorecorder_playing : 'Playing', + videorecorder_ready : 'Ready', + videorecorder_paused : 'Paused', + videorecorder_recording : 'Recording', + videorecorder_buffering : 'Buffering', + videorecorder_waiting : 'Waiting', + videorecorder_description : 'Description', + videorecorder_title : 'Title', + videorecorder_new_recording_details : 'New Recording Details', + videorecorder_recording_complete_authoring : 'Recording complete and added to the list of video recordings. Click the play button to review the last added recording or the record button to record another video.', + videorecorder_enter_something_here : 'Enter {0} here', + videorecorder_recording_complete_fck : 'Recording complete. Click the play button to review, the record button to overwrite the recording or the save button to post the current recording.', + videorecorder_tooltip_play : 'Play the recording', + videorecorder_tooltip_pause : 'Pause the recording being played', + videorecorder_tooltip_resume : 'Resume the recording', + videorecorder_tooltip_save_recording : 'Save the recording', + videorecorder_tooltip_start_recording : 'Start recording', + videorecorder_tooltip_start_recording_again : 'Start recording again (overwrites previous recording)', + videorecorder_tooltip_start_recording_next : 'Record another recording', + videorecorder_tooltip_stop_recording : 'Stop recording', + videorecorder_disabled : 'Disabled', + videorecorder_error_noconfig : 'LAMS does not have a media server configured. Please contact your system administrator.', + videorecorder_camera_not_available : 'No camera was detected. Please connect one and restart your browser if you want to record video.', + videorecorder_mic_not_available : 'No microphone was detected. Please connect one and restart your browser if you want to record audio.' + } + } + ); \ No newline at end of file Index: lams_central/web/ckeditor/plugins/videorecorder/plugin.js =================================================================== diff -u --- lams_central/web/ckeditor/plugins/videorecorder/plugin.js (revision 0) +++ lams_central/web/ckeditor/plugins/videorecorder/plugin.js (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -0,0 +1,69 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ +CKEDITOR.plugins.add('videorecorder', + { + lang : [ 'en' ], + init : function(editor) { + var popup = null; + var command = editor.addCommand('VideoRecorder', { + exec : function(editor){ + //open a popup window when the button is clicked + if (popup==null || popup.closed || !popup.location){ + popup = window.open(CKEDITOR.plugins.getPath('videorecorder')+'/VideoRecorderCKEditor.jsp?ckEditorName=' + editor.name, + 'VideoRecorder', + 'width=380,height=440,status=no,scrollbars=no,resizable=no,location=no,toolbar=no' + ); + } + popup.focus(); + }, + setState : function(newState){ + // do nothing, state is always OFF + }, + toggleState : function(){ + // do nothing, state is always OFF + }, + enable : function(){ + // do nothing, state is always OFF + }, + disable : function(){ + // do nothing, state is always OFF + } + }); + + command.state = CKEDITOR.TRISTATE_OFF; + command.previousState = CKEDITOR.TRISTATE_OFF; + + var pluginPath = CKEDITOR.plugins.getPath('videorecorder'); + + editor.ui.addButton( + 'VideoRecorder', + { + label : "VideoRecorder", + command : 'VideoRecorder', + icon : pluginPath + 'icon.png', + title : editor.lang.videorecorder.VideoRecorderBtn + } + ); + } + } + ); \ No newline at end of file Index: lams_central/web/includes/javascript/ckconfig_custom.js =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_central/web/includes/javascript/ckconfig_custom.js (.../ckconfig_custom.js) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_central/web/includes/javascript/ckconfig_custom.js (.../ckconfig_custom.js) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -42,13 +42,9 @@ CKEDITOR.config.templates = CKEDITOR.basePath + '../www/htmltemplates.xml'; CKEDITOR.config.format_tags = 'div;h1;h2;h3;h4;h5;h6;pre;address;p' ; CKEDITOR.config.enterMode = 'div' ; -// CKEDITOR.plugins.add('equation') ; -// CKEDITOR.plugins.add('movieplayer') ; -// CKEDITOR.plugins.add('videorecorder') ; -// CKEDITOR.plugins.add('paint') ; CKEDITOR.plugins.addExternal('WikiLink', CKEDITOR.basePath + '../tool/lawiki10/wikilink/', 'plugin.js') ; //CKEDITOR.config.extraPlugins = 'equation,movieplayer,videorecorder,paint,wikilink' ; -CKEDITOR.config.extraPlugins = 'WikiLink' ; +CKEDITOR.config.extraPlugins = 'videorecorder,WikiLink' ; // ---- Additional scripts ----- // Hides editor instaces until they are fully initialized Index: lams_gradebook/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r3b43792711de3e1d3703c241de6553245c6a728d -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_gradebook/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 3b43792711de3e1d3703c241de6553245c6a728d) +++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_learning/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r3b43792711de3e1d3703c241de6553245c6a728d -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_learning/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 3b43792711de3e1d3703c241de6553245c6a728d) +++ lams_learning/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_monitoring/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r3b43792711de3e1d3703c241de6553245c6a728d -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_monitoring/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 3b43792711de3e1d3703c241de6553245c6a728d) +++ lams_monitoring/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_openid/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r3b43792711de3e1d3703c241de6553245c6a728d -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_openid/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 3b43792711de3e1d3703c241de6553245c6a728d) +++ lams_openid/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_daco/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_forum/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_images/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_images/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "$ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "$ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "$ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "$ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "$ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_nb/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_nb/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_nb/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_survey/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_task/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_task/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_vote/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" }); Index: lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908 -rd0c090e91794c1e3b6f91a51f4dd404b01160255 --- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908) +++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) @@ -48,6 +48,7 @@ filebrowserImageUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/", filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", filebrowserFlashBrowseUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/", - filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/" + filebrowserFlashUploadUrl : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/", + contentFolderID : "${contentFolderID}" });