Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/webservice/PresenceChatLoggerAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/webservice/PresenceChatLoggerServlet.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/fckeditor/fckconfig.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/Attic/fckconfig.js,v diff -u -r1.16.4.1 -r1.16.4.2 --- lams_central/web/fckeditor/fckconfig.js 16 Apr 2009 02:13:17 -0000 1.16.4.1 +++ lams_central/web/fckeditor/fckconfig.js 17 Apr 2009 08:22:34 -0000 1.16.4.2 @@ -1,4 +1,4 @@ -/* +/* * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2009 Frederico Caldeira Knabben * Index: lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/editor/plugins/videorecorder/Attic/VideoRecorderFCKEditor.swf,v diff -u -r1.3 -r1.3.2.1 Binary files differ Index: lams_central/web/images/icons/user_offline.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/images/icons/Attic/user_offline.png,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_central/web/images/icons/user_online.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/images/icons/user_online.png,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_central/web/includes/javascript/jquery-ui/themes/cupertino/ui.tabs.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/jquery-ui/themes/cupertino/Attic/ui.tabs.css,v diff -u -r1.1 -r1.1.2.1 --- lams_central/web/includes/javascript/jquery-ui/themes/cupertino/ui.tabs.css 1 Apr 2009 00:45:15 -0000 1.1 +++ lams_central/web/includes/javascript/jquery-ui/themes/cupertino/ui.tabs.css 17 Apr 2009 08:22:34 -0000 1.1.2.1 @@ -7,5 +7,4 @@ .ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: .1em; border-bottom: 0; } .ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border: 0; background: none; } .ui-tabs .ui-tabs-hide { display: none !important; } -.ui-tabs .ui-tabs-wrapper { overflow: hidden } -.ui-tabs .ui-tabs-wrapped {} \ No newline at end of file +.ui-tabs .ui-tabs-wrapped { margin-left: 0px; margin-right: 0px;} \ No newline at end of file Index: lams_central/web/includes/javascript/jquery-ui/ui/ui.tabs.scrollable.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/jquery-ui/ui/Attic/ui.tabs.scrollable.js,v diff -u -r1.2 -r1.2.2.1 --- lams_central/web/includes/javascript/jquery-ui/ui/ui.tabs.scrollable.js 2 Apr 2009 01:42:04 -0000 1.2 +++ lams_central/web/includes/javascript/jquery-ui/ui/ui.tabs.scrollable.js 17 Apr 2009 08:22:35 -0000 1.2.2.1 @@ -10,10 +10,6 @@ * Depends: * ui.core.js */ - -function breakTabs(){ - var i = 0; -} (function($) { @@ -68,7 +64,6 @@ this.tabLabels = $(".ui-tabs-label"); this.imagesInTabs = $("img", this.list); this.$panels = $([]); - this.leftMostScroll = 25; } else{ this.list = this.element.is('div') ? this.element.children('ul:first, ol:first').eq(0) : this.element; @@ -81,9 +76,12 @@ this.$tabs.each(function(i, a) { var href = $(a).attr('href'); + // Fix tab IDs in IE6/7 + href = href.substring(href.indexOf("#")); + // inline tab if (fragmentId.test(href)) - self.$panels = self.$panels.add(self._sanitizeSelector(href)); + self.$panels = self.$panels.add(self._sanitizeSelector(href)); // remote tab else if (href != '#') { // prevent loading the page itself if href is just "#" @@ -117,12 +115,10 @@ if (this.element.is('div')) { this.element.addClass('ui-tabs ui-widget ui-widget-content ui-corner-all'); } - this.wrapper.addClass('ui-tabs-wrapper ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all'); + this.wrapper.addClass('ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all'); this.list.addClass('ui-tabs-wrapped'); this.$lis.addClass('ui-state-default ui-corner-top'); this.$panels.addClass('ui-tabs-panel ui-widget-content ui-corner-bottom'); - - //this.tabsHolder.animate( { scrollLeft: this.leftMostScroll}, this.scrollSpeed ) } else{ // attach necessary classes for styling @@ -362,45 +358,45 @@ }); if(o.scrollable){ - this.scrollableWidth = 0; + /* + var totalWidth = 0; - for(var i = 0; i < this.tabLabels.length; i++){ - this.scrollableWidth += this.tabLabels[i].innerHTML.length * o.characterWidth; - } + this.$lis.each(function(){ + totalWidth += this.offsetWidth; + }); - for(var i = 0; i < this.imagesInTabs.length; i++){ - this.scrollableWidth += this.imagesInTabs[i].width; - } + totalWidth += (this.$lis.length - 1) * 7 + 3; - this.scrollableWidth += o.margins; + this.scrollableWidth = totalWidth; + */ - $(".ui-tabs-wrapped").css("width", this.scrollableWidth + "px"); - - if(init){ - this.tabsHolder.animate( { scrollLeft: this.leftMostScroll }, this.scrollSpeed ) + if(this.$lis.length > 1){ + var lastElem = this.$lis[this.$lis.length - 1]; + var beforeLastElem = this.$lis[this.$lis.length - 2]; + + if(this.$lis[0].offsetLeft != 0){ + this.scrollableWidth = beforeLastElem.offsetLeft + beforeLastElem.offsetWidth + lastElem.offsetWidth; + }else{ + this.scrollableWidth = this.$lis[0].parentNode.parentNode.offsetLeft + beforeLastElem.offsetLeft + beforeLastElem.offsetWidth + lastElem.offsetWidth; + } } + else{ + var lastElem = this.$lis[this.$lis.length - 1]; + + if(this.$lis[0].offsetLeft != 0){ + this.scrollableWidth = lastElem.offsetLeft + lastElem.offsetWidth; + }else{ + this.scrollableWidth = this.$lis[0].parentNode.parentNode.offsetLeft + lastElem.offsetLeft + lastElem.offsetWidth; + } + + } + + $(".ui-tabs-wrapped").css("width", this.scrollableWidth + "px"); } // disable click if event is configured to something else if (o.event != 'click') this.$tabs.bind('click.tabs', function(){return false;}); }, - - _tabWidth: function(index) { - var self = this, o = this.options; - var tabWidth = 0; - if(o.scrollable){ - tabWidth += this.tabLabels[index].innerHTML.length * o.characterWidth; - - var imagesInTab = $("img", this.list[index]); - for(var i = 0; i < imagesInTab.length; i++){ - tabWidth+= imagesInTab[i].width; - } - - tabWidth += o.margins; - - return tabWidth; - } - }, scrollLeft: function() { var o = this.options; @@ -409,16 +405,24 @@ //var scrollOffset = _tabWidth(this.scrolledTab - 1); var scrollOffset = o.scrollOffset; if(this.tabsHolder[0].scrollLeft < scrollOffset){ - newScrollLeft = this.leftMostScroll; + newScrollLeft = 0; } else{ newScrollLeft = this.tabsHolder[0].scrollLeft - scrollOffset; } - this.tabsHolder.animate( { scrollLeft: newScrollLeft}, this.scrollSpeed ) + this.tabsHolder.animate( { scrollLeft: newScrollLeft}, this.scrollSpeed ); }, + scrollTo: function(position) { + if(this.$lis[0].offsetLeft != 0){ + this.tabsHolder.animate( { scrollLeft: position - this.$lis[0].offsetLeft}, this.scrollSpeed ); + }else{ + this.tabsHolder.animate( { scrollLeft: position}, this.scrollSpeed ); + } + }, + scrollRight: function() { var o = this.options; var newScrollRight; @@ -432,7 +436,7 @@ newScrollRight = this.tabsHolder[0].scrollLeft + scrollOffset; } - this.tabsHolder.animate( { scrollLeft: newScrollRight}, this.scrollSpeed ) + this.tabsHolder.animate( { scrollLeft: newScrollRight}, this.scrollSpeed ); }, destroy: function() { @@ -533,7 +537,6 @@ this._trigger('add', null, this._ui(this.$tabs[index], this.$panels[index])); }, - remove: function(index) { var o = this.options, $li = this.$lis.eq(index).remove(), $panel = this.$panels.eq(index).remove(); @@ -677,7 +680,7 @@ tabTemplate: '
  • #{label}
    • ', scrollable: false, characterWidth: 9, - margins: 5, + margins: 6, scrollSpeed: 150, scrollOffset: 100 } Index: lams_common/src/java/org/lamsfoundation/lams/presence/dao/IPresenceChatMessageDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/presence/dao/Attic/IPresenceChatMessageDAO.java,v diff -u -r1.1 -r1.1.2.1 --- lams_common/src/java/org/lamsfoundation/lams/presence/dao/IPresenceChatMessageDAO.java 1 Apr 2009 00:44:11 -0000 1.1 +++ lams_common/src/java/org/lamsfoundation/lams/presence/dao/IPresenceChatMessageDAO.java 17 Apr 2009 08:21:20 -0000 1.1.2.1 @@ -37,6 +37,6 @@ List getMessagesByRoomName(String roomName); - List getMessagesByConversation(String from, String to); + List getMessagesByConversation(String from, String to, String roomName); } Index: lams_common/src/java/org/lamsfoundation/lams/presence/dao/hibernate/PresenceChatMessageDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/presence/dao/hibernate/Attic/PresenceChatMessageDAO.java,v diff -u -r1.1 -r1.1.2.1 --- lams_common/src/java/org/lamsfoundation/lams/presence/dao/hibernate/PresenceChatMessageDAO.java 1 Apr 2009 00:44:11 -0000 1.1 +++ lams_common/src/java/org/lamsfoundation/lams/presence/dao/hibernate/PresenceChatMessageDAO.java 17 Apr 2009 08:21:20 -0000 1.1.2.1 @@ -34,14 +34,14 @@ public class PresenceChatMessageDAO extends BaseDAO implements IPresenceChatMessageDAO { - private static final String BY_MESSAGE_ID = "from " + PresenceChatMessage.class.getName() - + " where uid=? order by create_date desc"; + private static final String BY_MESSAGE_ID = "from " + PresenceChatMessage.class.getName() + " msg" + + " where msg.uid=? order by msg.dateSent desc"; - private static final String BY_CONVERSATION = "from " + PresenceChatMessage.class.getName() - + " where from_user=? and to_user=? order by create_date asc"; + private static final String BY_CONVERSATION = "from " + PresenceChatMessage.class.getName() + " msg" + + " where (msg.from=:from and msg.to=:to) or (msg.from=:to and msg.to=:from) and msg.roomName=:roomName order by msg.dateSent asc"; - private static final String BY_ROOM_NAME = "from " + NotebookEntry.class.getName() - + " where room_name=? order by create_date asc"; + private static final String BY_ROOM_NAME = "from " + PresenceChatMessage.class.getName() + " msg" + + " where msg.roomName=? and msg.to is null order by msg.dateSent asc"; public void saveOrUpdate(PresenceChatMessage presenceChatMessage) { this.getHibernateTemplate().saveOrUpdate(presenceChatMessage); @@ -57,9 +57,8 @@ else return null; } - public List getMessagesByConversation(String from, - String to) { - return (List)(getHibernateTemplate().find(BY_CONVERSATION, new Object[]{from, to})); + public List getMessagesByConversation(String from, String to, String roomName) { + return (List)(getHibernateTemplate().findByNamedParam(BY_CONVERSATION, new String[]{"from", "to", "roomName"}, new Object[]{from, to, roomName})); } public List getMessagesByRoomName(String roomName) { Index: lams_common/src/java/org/lamsfoundation/lams/presence/model/PresenceChatMessage.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/presence/model/PresenceChatMessage.java,v diff -u -r1.1 -r1.1.2.1 --- lams_common/src/java/org/lamsfoundation/lams/presence/model/PresenceChatMessage.java 1 Apr 2009 00:44:11 -0000 1.1 +++ lams_common/src/java/org/lamsfoundation/lams/presence/model/PresenceChatMessage.java 17 Apr 2009 08:21:20 -0000 1.1.2.1 @@ -47,6 +47,10 @@ private String message; + public PresenceChatMessage() { + + } + public PresenceChatMessage(Long uid, String roomName, String from, String to, Date dateSent, String message) { super(); Index: lams_common/src/java/org/lamsfoundation/lams/presence/service/IPresenceChatLoggerService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/presence/service/Attic/IPresenceChatLoggerService.java,v diff -u -r1.1 -r1.1.2.1 --- lams_common/src/java/org/lamsfoundation/lams/presence/service/IPresenceChatLoggerService.java 1 Apr 2009 00:44:11 -0000 1.1 +++ lams_common/src/java/org/lamsfoundation/lams/presence/service/IPresenceChatLoggerService.java 17 Apr 2009 08:21:20 -0000 1.1.2.1 @@ -39,8 +39,8 @@ PresenceChatMessage getMessageById(Long id); List getMessagesByRoomName(String roomName); - - List getMessagesByConversation(String from, String to); + + List getMessagesByConversation(String from, String to, String roomName); void saveOrUpdatePresenceChatMessage(PresenceChatMessage presenceChatMessage); Index: lams_common/src/java/org/lamsfoundation/lams/presence/service/PresenceChatLoggerService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/presence/service/Attic/PresenceChatLoggerService.java,v diff -u -r1.1 -r1.1.2.1 --- lams_common/src/java/org/lamsfoundation/lams/presence/service/PresenceChatLoggerService.java 1 Apr 2009 00:44:11 -0000 1.1 +++ lams_common/src/java/org/lamsfoundation/lams/presence/service/PresenceChatLoggerService.java 17 Apr 2009 08:21:20 -0000 1.1.2.1 @@ -58,8 +58,8 @@ return presenceChatMessageDAO.getMessagesByRoomName(roomName); } - public List getMessagesByConversation(String from, String to){ - return presenceChatMessageDAO.getMessagesByConversation(from, to); + public List getMessagesByConversation(String from, String to, String roomName){ + return presenceChatMessageDAO.getMessagesByConversation(from, to, roomName); } public void saveOrUpdatePresenceChatMessage(PresenceChatMessage presenceChatMessage){ Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/util/Base64StringToImageUtil.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml,v diff -u -r1.3 -r1.3.2.1 --- lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml 19 Mar 2009 06:35:45 -0000 1.3 +++ lams_flash/src/central/flex/VideoRecorder/src/AddCommentPopUp.mxml 17 Apr 2009 08:21:52 -0000 1.3.2.1 @@ -1,34 +1,68 @@ - + + + + - + - + Index: lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml,v diff -u -r1.4 -r1.4.2.1 --- lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml 19 Mar 2009 06:35:45 -0000 1.4 +++ lams_flash/src/central/flex/VideoRecorder/src/GetRecordingDetailsPopUp.mxml 17 Apr 2009 08:21:51 -0000 1.4.2.1 @@ -1,24 +1,33 @@ - + + + + - - + + - + Index: lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as,v diff -u -r1.3 -r1.3.2.1 Binary files differ Index: lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml,v diff -u -r1.3 -r1.3.2.1 --- lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml 19 Mar 2009 06:35:45 -0000 1.3 +++ lams_flash/src/central/flex/VideoRecorder/src/VideoProfile.mxml 17 Apr 2009 08:21:51 -0000 1.3.2.1 @@ -1,7 +1,10 @@ - + - + - + Index: lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml,v diff -u -r1.4 -r1.4.2.1 --- lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml 19 Mar 2009 06:35:45 -0000 1.4 +++ lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml 17 Apr 2009 08:21:52 -0000 1.4.2.1 @@ -58,6 +58,7 @@ [Bindable] private var allowRatings:Boolean; [Bindable] private var red5ServerUrl:String; [Bindable] private var serverUrl:String; + [Bindable] private var servletUrl:String; [Bindable] private var languageXML:XML; [Bindable] private var mode:String; @@ -75,10 +76,8 @@ // ui stuff private var getDetailsPopUp:GetRecordingDetailsPopUp; - private var addCommentPopUp:AddCommentPopUp; - private var previewImage:BitmapData; + private var addCommentPopUp:AddCommentPopUp; - // icon embeds [Embed(source="../../../../../../lams_central/web/images/icons/control_play.png")] [Bindable] private var playIcon:Class; [Embed(source="../../../../../../lams_central/web/images/icons/control_pause.png")] [Bindable] private var pauseIcon:Class; @@ -111,8 +110,8 @@ if(toolSessionId == 0){ contentEditable = true; userId = 1; - toolSessionId = 7; - toolContentId = 8; + toolSessionId = 1; + toolContentId = 5; allowUseVoice = true; allowUseCamera = true; allowComments = true; @@ -163,8 +162,12 @@ red5ServerUrl += red5App; // add the servlet location to the server url to complete - serverUrl += servletLocation; + servletUrl = serverUrl + servletLocation; + // add server url and servlet url to video display + videoDisplay.serverUrl = serverUrl; + videoDisplay.servletUrl = servletUrl; + // if the cam is to be used, set that up if(allowUseCamera){ cam = VideoDisplayUtil.setupCamera(); @@ -206,6 +209,13 @@ enableVideoList(true); seekSlider.enable(false); + // if content is not editable + if(!contentEditable){ + // disable view and record buttons + viewCameraButton.enabled = false; + startRecButton.enabled = false; + } + // create the connection createConnection(); } @@ -282,7 +292,7 @@ private function addListeners():void{ videoInformation.ratingButton.addEventListener(RatingEvent.SELECTION_CHANGE, addRatingClick); videoInformation.addCommentButton.addEventListener(MouseEvent.CLICK, addCommentClick); - videoList.addEventListener(MouseEvent.CLICK, deleteClick); + videoList.addEventListener("recordingDeleted", confirmDeleteClick); sortButtonGroup.addEventListener(SortEvent.EVENT_TYPE, sortRecordingsHandler); playButton.addEventListener(MouseEvent.CLICK, playClick); startRecButton.addEventListener(MouseEvent.CLICK, startRecordingClick); @@ -413,7 +423,7 @@ var rating:Number = 0; // call the http service to save a recording - saveRecordingToServer(userId, title, description, filename + ".flv", rating, toolSessionId, recordingId); + saveRecordingToServer(userId, title, description, filename, rating, toolSessionId, recordingId); } // if the given popup is of type addCommentPopUp else if(event.target == addCommentPopUp){ @@ -459,7 +469,7 @@ private function startRecordingClick(event:MouseEvent):void{ if(!videoDisplay.isPublishing){ filename = VideoDisplayUtil.createFilename(toolSessionId, userId); - videoDisplay.startPublish(filename); + videoDisplay.startPublish(filename, true); } else if(videoDisplay.isPublishing) videoDisplay.stopPublish(); @@ -486,33 +496,30 @@ } // delete recording click handler - private function deleteClick(event:MouseEvent):void{ - if(event.target.hasOwnProperty("id") && event.target.id == "deleteButton"){ - Alert.show(dictionary.getLabel("videorecorder.message.sure.delete"), dictionary.getLabel("videorecorder.confirm"), 3, this, confirmDeleteClick); - } + private function confirmDeleteClick(event:Event):void{ + deleteRecordingFromServer(VideoProfile(event.target).data.recordingId); + videoInformation.resetInformation(); + videoDisplay.reset(); } - // confirm delete click handler - private function confirmDeleteClick(event:CloseEvent):void{ - if (event.detail==Alert.YES){ - var recordingId:int = itemClicked.recordingId; - deleteRecordingFromServer(recordingId); - videoInformation.resetInformation(); - videoDisplay.reset(); - } - } - // click handler for the videoDataGrid list private function videoListClick(event:ListEvent):void { - if(videoList.enabled){ + if(videoList.enabled && !event.currentTarget.isPrototypeOf(Button)){ // reset video information videoInformation.resetInformation(); // store last item clicked itemClicked = event.itemRenderer.data; - // enable video information buttons - videoInformation.enableVideoInformationButtons(true); + // if content is editable + if(contentEditable){ + // enable video information buttons + videoInformation.enableVideoInformationButtons(true); + } + else{ + videoInformation.enableVideoInformationButtons(false); + } + // scroll the video information box back up to top videoInformation.verticalScrollPosition = 0; @@ -552,8 +559,7 @@ makeReadytItemClicked(); } else{ - itemClicked = null; - videoList.selectedItem = null; + resetVideoList(); videoInformation.resetInformation(); } } @@ -598,7 +604,7 @@ // reset play buttons enablePlaybackButtons(false); seekSlider.enable(false); - seekSlider.stopTimerLabel(); + seekSlider.resetSeekSliderPositon(); // set panel status label videoRecorderPanel.status = dictionary.getLabel("videorecorder.waiting"); @@ -721,8 +727,7 @@ videoRecorderPanel.status = dictionary.getLabel("videorecorder.waiting"); // clear item clicked - videoList.selectedItem = null; - itemClicked = null; + resetVideoList(); // enable buttons enablePlaybackButtons(true); @@ -810,7 +815,14 @@ } } } - + + // resets video list + private function resetVideoList():void{ + // clear item clicked + videoList.selectedItem = null; + itemClicked = null; + } + // getters public function getUserId():int{ return userId; @@ -839,12 +851,6 @@ public function getMode():String{ return mode; } - - /* - private function showDebug():void{ - DebugPopUp.getInstance().visible = true; - } - */ ]]> @@ -855,12 +861,12 @@ - - + + - + Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/GetRecordingDetailsPopUp.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/GetRecordingDetailsPopUp.mxml,v diff -u -r1.2 -r1.2.2.1 --- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/GetRecordingDetailsPopUp.mxml 19 Mar 2009 06:35:44 -0000 1.2 +++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/GetRecordingDetailsPopUp.mxml 17 Apr 2009 08:21:52 -0000 1.2.2.1 @@ -25,8 +25,8 @@ titleLabel.text = dictionary.getLabelAndConcatenate("videorecorder.title", [":"]); descriptionLabel.text = dictionary.getLabelAndConcatenate("videorecorder.description", [":"]); - titleInput.text = dictionary.getLabelAndReplace("videorecorder.enter.something.here", ["videorecorder.title"]); - descriptionInput.text = dictionary.getLabelAndReplace("videorecorder.enter.something.here", ["videorecorder.description"]); + titleInput.text = dictionary.getLabelAndReplace("videorecorder.enter.something.here", ["videorecorder.title"], true); + descriptionInput.text = dictionary.getLabelAndReplace("videorecorder.enter.something.here", ["videorecorder.description"], true); doneButton.label = dictionary.getLabel("button.save"); doneButton.toolTip = dictionary.getLabel("videorecorder.tooltip.save.recording"); } Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml,v diff -u -r1.3 -r1.3.2.1 --- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml 19 Mar 2009 06:35:44 -0000 1.3 +++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml 17 Apr 2009 08:21:52 -0000 1.3.2.1 @@ -123,21 +123,10 @@ // add the save to lams servlet location saveToLamsServletUrl = serverUrl + saveToLamsServletLocation; - /* - Alert.show( - "filename: " + filename + - "\nred5ServerUrl: " + red5ServerUrl + - "\nserverUrl: " + serverUrl + - "\nlanguageXML: " + languageXML + - "\ntoolContentId: " + toolContentId + - "\ntoolServletUrl: " + toolServletUrl + - "\nsaveToLamsServletUrl: " + saveToLamsServletUrl + - "\nred5RecordingsUrl: " + red5RecordingsUrl + - "\nsaveToLamsDestUrl: " + saveToLamsDestUrl + - "\nlamsEarDir: " + lamsEarDir + - "\nmode: " + mode); - */ - + // add server url and servlet url to video display + videoDisplay.serverUrl = serverUrl; + videoDisplay.servletUrl = toolServletUrl; + // swtich on mode switch(mode){ case "playerModeOnline":{ @@ -406,7 +395,7 @@ var description:String = getDetailsPopUp.descriptionInput.text; // call the http service to save a recording - saveRecordingToServer(title, description, filename + ".flv", toolContentId); + saveRecordingToServer(title, description, filename, toolContentId); } if(event.target is TitleWindow){ @@ -417,12 +406,14 @@ // record button click handler private function recordClick(event:MouseEvent):void{ if(!videoDisplay.isPublishing){ - if(mode == "recorderModeFCK") + if(mode == "recorderModeFCK"){ filename = VideoDisplayUtil.createFilenameForFCK(userId); - else if(mode == "recorderModeAuthor") + videoDisplay.startPublish(filename, false); + } + else if(mode == "recorderModeAuthor"){ filename = VideoDisplayUtil.createFilenameForAuthor(toolContentId); - - videoDisplay.startPublish(filename); + videoDisplay.startPublish(filename, true); + } } else if(videoDisplay.isPublishing) videoDisplay.stopPublish(); Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/conn/ImageService.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/org/lamsfoundation/lams/common/conn/ImageService.as,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/SeekSlider.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/SeekSlider.mxml,v diff -u -r1.2 -r1.2.2.1 --- lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/SeekSlider.mxml 19 Mar 2009 06:35:45 -0000 1.2 +++ lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/SeekSlider.mxml 17 Apr 2009 08:21:53 -0000 1.2.2.1 @@ -57,7 +57,7 @@ // if the video isn't actually playing yet if(_videoDisplay.playMode == _videoDisplay.INIT_MODE){ seekSliderBar.value = 0; - seekSliderTimerLabel.text = "0:0" + " / " + VideoDisplayUtil.secondsToString(String(_videoDisplay.duration)); + seekSliderTimerLabel.text = "0:00" + " / " + VideoDisplayUtil.secondsToString(String(_videoDisplay.duration)); /* seekSliderProgress.minimum = 0; @@ -115,7 +115,7 @@ // resets the timer public function resetTimerLabel():void{ - seekSliderTimerLabel.text = "0:0 / 0:0"; + seekSliderTimerLabel.text = "0:00 / 0:00"; } // starts the timer @@ -128,7 +128,9 @@ playTimer.stop(); } - + public function resetSeekSliderPositon():void{ + seekSliderBar.value = 0; + } ]]> Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml,v diff -u -r1.4 -r1.4.2.1 --- lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml 19 Mar 2009 06:35:45 -0000 1.4 +++ lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml 17 Apr 2009 08:21:53 -0000 1.4.2.1 @@ -3,40 +3,54 @@ @@ -649,6 +681,9 @@ + + + Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/NetStreamScreenShotter.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/NetStreamScreenShotter.as,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/NetStreamScreenShotterEvent.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/Attic/NetStreamScreenShotterEvent.as,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/VideoDisplayUtil.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/VideoDisplayUtil.as,v diff -u -r1.3 -r1.3.2.1 Binary files differ Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java,v diff -u -r1.6 -r1.6.4.1 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java 10 Feb 2009 00:42:31 -0000 1.6 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java 17 Apr 2009 08:22:31 -0000 1.6.4.1 @@ -109,6 +109,9 @@ // build up a list of the misc images to copy setupMiscImages(); + + // build up a list of things to add for vr to work + setupVideoRecorderExport(); } // now copy all those files @@ -161,4 +164,28 @@ } } } + + /** + * Adds VideoRecorder stuff to be exported + */ + private void setupVideoRecorderExport() { + String vrDirectory = lamsCentralPath + File.separatorChar + "fckeditor" + File.separatorChar + "editor" + + File.separatorChar + "plugins" + File.separatorChar + "videorecorder"; + + String outputVrDirectory = outputDirectory + File.separatorChar + "fckeditor" + File.separatorChar + + "editor" + File.separatorChar + "plugins" + File.separatorChar + "videorecorder"; + + directoriesRequired.add(outputVrDirectory); + + File dir = new File(vrDirectory); + if (!dir.canRead() || !dir.isDirectory()) { + log.debug("Unable to read vr directory " + dir.getAbsolutePath()); + } else { + File[] files = dir.listFiles(); + for (File file : files) { + if(!file.isDirectory()) + filesToCopy.put(outputVrDirectory + File.separatorChar + file.getName(), file); + } + } + } } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java,v diff -u -r1.29 -r1.29.6.1 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java 3 Nov 2008 03:10:45 -0000 1.29 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java 17 Apr 2009 08:22:31 -0000 1.29.6.1 @@ -228,11 +228,15 @@ try { // String to find String fckeditorpath = "/" + lamsOrRams + "/www/secure/" + contentFolderID; + String fckeditorrecpath = "../" + contentFolderID + "/Recordings"; String fckeditorsmiley = "/" + lamsOrRams + "/fckeditor/editor/images/smiley"; + String fckeditorvr = "/" + lamsOrRams + "/fckeditor/editor/plugins/videorecorder"; // Replacing string String newfckeditorpath = "../" + contentFolderID; + String newfckeditorrecpath = "../../../../" + contentFolderID + "/Recordings"; String newfckeditorsmiley = "../fckeditor/editor/images/smiley"; + String newfckeditorvr = "../fckeditor/editor/plugins/videorecorder"; File fin = new File(filename); //Open and input stream @@ -244,8 +248,14 @@ Pattern p = Pattern.compile(fckeditorpath); Matcher m = p.matcher(""); - Pattern p2 = Pattern.compile(fckeditorsmiley); + Pattern p2 = Pattern.compile(fckeditorrecpath); Matcher m2 = p2.matcher(""); + + Pattern p3 = Pattern.compile(fckeditorsmiley); + Matcher m3 = p3.matcher(""); + + Pattern p4 = Pattern.compile(fckeditorvr); + Matcher m4 = p4.matcher(""); String aLine = null; String output = ""; @@ -256,10 +266,18 @@ // Replace the p matching pattern with the newfckeditorpath String firstpass = m.replaceAll(newfckeditorpath); - // Replace the p2 matching patterns with the newfckeditorsmiley + // Replace the p2 matching patterns with the newfckeditorrecpath m2.reset(firstpass); - String result = m2.replaceAll(newfckeditorsmiley); + String secondpass = m2.replaceAll(newfckeditorrecpath); + // Replace the p2 matching patterns with the newfckeditorsmiley + m3.reset(secondpass); + String thirdpass = m3.replaceAll(newfckeditorsmiley); + + // Replace the p3 matching patterns with the newfckeditorvr + m4.reset(thirdpass); + String result = m4.replaceAll(newfckeditorvr); + output = output + result + "\n"; } in.close(); Index: lams_learning/web/lams_learner.swd =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/lams_learner.swd,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_learning/web/mainflash.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/mainflash.jsp,v diff -u -r1.3 -r1.3.2.1 --- lams_learning/web/mainflash.jsp 1 Apr 2009 00:44:23 -0000 1.3 +++ lams_learning/web/mainflash.jsp 17 Apr 2009 08:22:31 -0000 1.3.2.1 @@ -92,7 +92,8 @@ function resizeIframe() { var width = $(window).width() - 160; - $('#contentFrame').css({'width': width + "px"}); + var height = $(window).height(); + $('#contentFrame').css({'width': width + "px", 'height': height + "px"}); resizeChat(); @@ -155,7 +156,7 @@ <%@ include file="/includes/presenceChat.jsp" %> - Index: lams_learning/web/includes/presence.css =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/includes/Attic/presence.css,v diff -u -r1.2 -r1.2.2.1 --- lams_learning/web/includes/presence.css 2 Apr 2009 01:42:04 -0000 1.2 +++ lams_learning/web/includes/presence.css 17 Apr 2009 08:22:31 -0000 1.2.2.1 @@ -42,6 +42,11 @@ overflow-y: scroll; } +#minMaxIcon{ + position:absolute; + top: 0px; + right:0px; +} .presenceName { width:"100%"; } @@ -78,6 +83,10 @@ } .sendArea { - style="width: 100%; + width: 100%; height: 20%; +} + +table.tabLabelTable { + width: auto; } \ No newline at end of file Index: lams_learning/web/includes/presence.js =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/includes/Attic/presence.js,v diff -u -r1.7 -r1.7.2.1 --- lams_learning/web/includes/presence.js 1 Apr 2009 00:44:36 -0000 1.7 +++ lams_learning/web/includes/presence.js 17 Apr 2009 08:22:31 -0000 1.7.2.1 @@ -11,22 +11,47 @@ var tabLabelsLocal = null; var windowHeight; var presenceShown = false; +var showStatus = false; /* ******* HTML writer functions ******* */ function createPrivateTabLabel(label, tag){ - return '
    ' + label + '
    '; + return '' + + '' + + '' + + '' + + '' + + '' + + '
    ' + label + '
    '; } function createPrivateTabContent(label, tag){ - return '

    '; + return '

    ' + + '
    ' + + '
    ' + + '' + + '' + + '' + + '' + + '' + + '
    ' + + '
    ' + + '
    '; } function createPresenceListing(nick, tag){ - return '
    ' + nick + '
    '; + return '' + + '' + + '' + + '' + + '' + + '
    ' + nick + '
    '; } function createContextMenu(tag){ - return ''; + return ''; } /* ******* Helper Functions ******* */ @@ -89,6 +114,8 @@ $("#" + tag).attr("style", "width: 95%; height: 80%;"); // add the content $("#" + tag).html(createPrivateTabContent(nick, tag)); + + $.get(lamsUrl + "PresenceChatLogger.do", {method: "getConversationHistory", roomName:CONFERENCEROOM, from:NICK, to:nick}, handleGetConversation); } function htmlEnc(str) { @@ -116,9 +143,37 @@ } function nickToMessageArea(nick){ - return nick.replace(/ /g, "_") + '_messageArea'; + return tagToMessageArea(nickToTag(nick)); } +function tagToMessageArea(tag){ + return tag + '_messageArea'; +} + +function nickToListing(nick){ + return tagToListing(nickToTag(nick)); +} + +function tagToListing(tag){ + return tag + '_listing'; +} + +function nickToListingImage(nick){ + return tagToListingImage(nickToTag(nick)); +} + +function tagToListingImage(tag){ + return tag + '_listingImage'; +} + +function nickToContentMenu(nick){ + return tagToContextMenu(nickToTag(nick)); +} + +function tagToContextMenu(tag){ + return tag + '_contextMenu'; +} + function getRosterUserByNick(nick) { for (var i = 0; i < this.users.length; i++) { if (this.users[i].nick == nick) { @@ -138,12 +193,20 @@ } function sortFunction(a, b){ - if (a.nick < b.nick){ + if(a.status < b.status){ return -1; } - if (a.nick > b.nick){ + else if(a.status > b.status){ return 1; } + else{ + if (a.nick < b.nick){ + return -1; + } + if (a.nick > b.nick){ + return 1; + } + } return 0; } @@ -165,6 +228,10 @@ return "(" + hours + ":" + minutes + ":" + seconds + ")"; } +function trimTime(time){ + return "(" + time.substring(11, 19) + ")"; +} + function createElem(name, attrs, style, innerHTML) { var e = document.createElement(name); if (attrs) { @@ -217,7 +284,7 @@ return !blocked; } -function addContextMenu(div, contextMenu){ +function connectUserContextMenu(div, contextMenu){ var myDiv = $("#" + div); myDiv.contextMenu({ menu: contextMenu @@ -265,17 +332,15 @@ else if(document.getElementById(tag) == null){ // add a tab addTab(nick, tag); - // select the added tab - $("#presenceChatTabs").tabs('select' , tag); } // if the clicked user's tab is open else{ // make the sender's tab label unbold $('#' + tag + '_tabLabel').html(nick); - - // select the tab - $("#presenceChatTabs").tabs('select' , tag); } + + // select the added tab + $("#presenceChatTabs").tabs('select' , tag); } function handleCloseTabClick(label){ @@ -290,10 +355,12 @@ function handlePresenceClick() { if(presenceShown){ $("#presenceChat").animate({top: windowHeight + "px"}, 1000 ); + $("#minMaxIcon").attr("src", "../images/icons/bullet_arrow_top.png") presenceShown = false; } else{ $("#presenceChat").animate({top: windowHeight - 270 + "px"}, 1000 ); + $("#minMaxIcon").attr("src", "../images/icons/bullet_arrow_bottom.png"); presenceShown = true; } } @@ -325,69 +392,89 @@ function UpdateRosterDisplay() { // sort users by name this.users.sort(sortFunction); + + // reset the count var availableCount = 0; - // get number available users (sorry) - for (var i = 0; i < this.users.length; i++) { - if (this.users[i].status != "unavailable") { - availableCount++; - } - } - - // update presenceTabLabel - var presenceTabLabelDiv = $("#presence_tabLabel"); - presenceTabLabelDiv.html("Users (" + availableCount + ")"); - - // update users in presence tab // get rosterDiv var rosterDiv = $("#presenceUserListings"); - // clear rosterDiv - rosterDiv.html(""); - + // if presence im is enabled if(presenceImEnabled == "true"){ // get rosterDiv var contextMenus = $("#presenceContextMenus"); - // clear rosterDiv - contextMenus.html(""); } // for all users for (var i = 0; i < this.users.length; i++) { - // if available - if (this.users[i].status != "unavailable") { - // get nick - var nick = this.users[i].nick; - // get tag - var tag = this.users[i].tag; - // get blocked - var blocked = this.users[i].blocked; - - // create listing div name - var listingName = tag + "_listing"; + // get available + var available = this.users[i].status; + // get nick + var nick = this.users[i].nick; + // get tag + var tag = this.users[i].tag; + // get blocked + var blocked = this.users[i].blocked; + + // get listing name + var listingName = tagToListing(tag); + + // get the actual listing + var listing = $("#" + listingName); + + // if no listing exists + if(listing.length == 0){ // create listing div // note: attrId must be added to array before onClick var listingDiv = createElem("div", {attrId:listingName, rosterIndex:i, onClick:"handlePresenceLeftClick('" + listingName + "');", attrClass:"presenceName"}, {}, createPresenceListing(nick, tag)); + // add the listing div rosterDiv.append(listingDiv); // if presence im is enabled if(presenceImEnabled == "true"){ // if not oneself if(nick != NICK){ - // create context menu div name - var contextMenuName = tag + "_contextMenu"; // add the context menu contextMenus.html(contextMenus.html() + createContextMenu(tag)); - // connect the context menu to the last added div - addContextMenu(listingName, contextMenuName); - // refresh the context menu - refreshContextMenu(tag, blocked); } } - } + else{ + // remove and append at the right place (from sort) + rosterDiv.append(listing.remove()); + + // refresh roster index + listing.attr("rosterindex", i); + } + + // get context menu div name + var contextMenuName = tagToContextMenu(tag); + + /* + connect the context menu to the last added div + when listings are moved events are scrapped... must reconnect them each time + */ + connectUserContextMenu(listingName, contextMenuName); + + // refresh the context menu + refreshContextMenu(tag, blocked); + + // get the listingImage + var listingImage = $("#" + tagToListingImage(tag)); + + // set the correct icon depending on status + if(available == "available"){ + availableCount++; + listingImage.attr("src", "../images/icons/user_online.png"); + }else{ + listingImage.attr("src", "../images/icons/user_offline.png"); + } } + + // update presenceTabLabel + var presenceTabLabelDiv = $("#presence_tabLabel"); + presenceTabLabelDiv.html("Users (" + availableCount + ")"); } function Roster() { @@ -409,8 +496,15 @@ document.forms[0].msg.focus(); } -function generateMessageHTML(nick, message) { - var fromElem = createElem("div", {attrClass:"presenceMessageFrom"}, null, getTime() + " " + nick); +function generateMessageHTML(nick, message, date) { + var fromElem; + + if(!date){ + fromElem = createElem("div", {attrClass:"presenceMessageFrom"}, null, getTime() + " " + nick); + }else{ + fromElem = createElem("div", {attrClass:"presenceMessageFrom"}, null, trimTime(date) + " " + nick); + } + var msgElem = createElem("div", {attrClass:"presenceMessage"}, null, message); msgElem.insertBefore(fromElem, msgElem.firstChild); return msgElem; @@ -452,19 +546,19 @@ // since the jabber server will not echo sent private messages. // TODO: need to check if this is correct behaviour if (!(NICK == toNick)) { - updateMessageDisplay(nickToMessageArea(toNick), generateMessageHTML(NICK, aForm.messageInput.value)); + updateMessageDisplay(nickToMessageArea(toNick), generateMessageHTML(NICK, aForm.messageInput.value, null)); } // log message - $.get(lamsUrl + "PresenceChatLogger", {roomName:CONFERENCEROOM, from:NICK, to:toNick, dateSent:new Date(), message:aForm.messageInput.value}, null); + $.get(lamsUrl + "PresenceChatLogger.do", {method: "saveMessage", roomName:CONFERENCEROOM, from:NICK, to:toNick, dateSent:new Date(), message:aForm.messageInput.value}, null); } // otherwise, it's a group chat message else { aMsg.setTo(CONFERENCEROOM); aMsg.setType("groupchat"); aMsg.setBody(aForm.messageInput.value); - $.get(lamsUrl + "PresenceChatLogger", {roomName:CONFERENCEROOM, from:NICK, to:null, dateSent:new Date(), message:aForm.messageInput.value}, null); + $.get(lamsUrl + "PresenceChatLogger.do", {method: "saveMessage", roomName:CONFERENCEROOM, from:NICK, to:null, dateSent:new Date(), message:aForm.messageInput.value}, null); } aMsg.setFrom(USERNAME + "@" + XMPPDOMAIN + "/" + RESOURCE); @@ -527,10 +621,11 @@ if(getUserFromTabIndex(selected).tag != tag){ // make the sender's tab label bold $('#' + tag + '_tabLabel').html('' + nick + ''); + $("#presenceChatTabs").tabs('_tabify', false); } // generate html - htmlMessage = generateMessageHTML(nick, message); + htmlMessage = generateMessageHTML(nick, message, null); // add the div to the sender's tab updateMessageDisplay(nickToMessageArea(nick), htmlMessage); @@ -546,9 +641,10 @@ if(selected != 0){ // make the group chat label label bold $('#groupchat_tabLabel').html('Group Chat'); + $("#presenceChatTabs").tabs('_tabify', false); } - htmlMessage = generateMessageHTML(nick, message); + htmlMessage = generateMessageHTML(nick, message, null); updateMessageDisplay('groupchat_messageArea', htmlMessage); } else { // somethings wrong, dont add anything @@ -601,75 +697,56 @@ if (type == "unavailable") { // set unavailable status user.status = "unavailable"; - - // if presence im is enabled (there is a chatbox) - if(presenceImEnabled == "true"){ - // get the selected tab - var selected = $("#presenceChatTabs").tabs().data('selected.tabs'); - - // if the selected tab is any other than groupchat - if(selected != 0){ - // make the group chat label bold - $('#groupchat_tabLabel').html('Group Chat'); - } - - // generate the emote message and display it to group chat - var emoteMessage = generateEmoteHTML(nick, "has gone offline"); - updateMessageDisplay('groupchat_messageArea', emoteMessage); - - // if the person who got disconnected has a tab open - if(document.getElementById(nickToMessageArea(nick)) != null){ - // get the selected tab - var selected = $("#presenceChatTabs").tabs().data('selected.tabs'); - - // if the selected tab is any other than sender's tab - if(getUserFromTabIndex(selected).tag != tag){ - // make the sender's tab label bold - $('#' + tag + '_tabLabel').html('' + nick + ''); - } - - // generate the emote message and display it to group chat - var emoteMessage = generateEmoteHTML(nick, "has gone offline"); - updateMessageDisplay(nickToMessageArea(nick), emoteMessage); - } - } } } // default: means presence is available else { // set status to available user.status = "available"; + } + } + + // if presence im is enabled (there is a chatbox) + if(presenceImEnabled == "true"){ + // get the selected tab + var selected = $("#presenceChatTabs").tabs().data('selected.tabs'); + + if(showStatus){ + // if the selected tab is any other than groupchat + if(selected != 0){ + // make the group chat label bold + $('#groupchat_tabLabel').html('Group Chat'); + } - // if presence im is enabled (there is a chatbox) - if(presenceImEnabled == "true"){ - // get the selected tab - var selected = $("#presenceChatTabs").tabs().data('selected.tabs'); + // generate the emote message and display it to group chat + var emoteMessage; + if(user.status == "unavailable"){ + emoteMessage = generateEmoteHTML(nick, "has gone offline"); + } + else if(user.status == "available"){ + emoteMessage = generateEmoteHTML(nick, "has come online"); + } + updateMessageDisplay('groupchat_messageArea', emoteMessage); + } - // if the selected tab is any other than groupchat - if(selected != 0){ - // make the group chat label label bold - $('#groupchat_tabLabel').html('Group Chat'); + // if the person who got disconnected has a tab open + if(document.getElementById(nickToMessageArea(nick)) != null){ + // if the selected tab is any other than sender's tab + if(getUserFromTabIndex(selected).tag != tag){ + // make the sender's tab label bold + $('#' + tag + '_tabLabel').html('' + nick + ''); + } + + if(showStatus){ + // generate the emote message and display it to private chat + var emoteMessage; + if(user.status == "unavailable"){ + emoteMessage = generateEmoteHTML(nick, "has gone offline"); } - - // generate the emote message and display it to group chat - var emoteMessage = generateEmoteHTML(nick, "has come online"); - updateMessageDisplay('groupchat_messageArea', emoteMessage); - - // if the person who got connected has a tab open - if(document.getElementById(nickToMessageArea(nick)) != null){ - // get the selected tab - var selected = $("#presenceChatTabs").tabs().data('selected.tabs'); - - // if the selected tab is any other than sender's tab - if(getUserFromTabIndex(selected).tag != tag){ - // make the sender's tab label bold - $('#' + tag + '_tabLabel').html('' + nick + ''); - } - - // generate the emote message and display it to group chat - var emoteMessage = generateEmoteHTML(nick, "has come online"); - updateMessageDisplay(nickToMessageArea(nick), emoteMessage); + else if(user.status == "available"){ + emoteMessage = generateEmoteHTML(nick, "has come online"); } + updateMessageDisplay(nickToMessageArea(nick), emoteMessage); } } } @@ -680,7 +757,7 @@ function handleConnected() { // if presence im is enabled (there is a chatbox) - if(presenceImEnabled == "true"){ + if(presenceImEnabled == "true" && showStatus){ // generate the emote message and display it to group chat var emoteMessage = generateEmoteHTML("You", "have been connected to LAMS instant messaging"); updateMessageDisplay('groupchat_messageArea', emoteMessage); @@ -698,11 +775,14 @@ // set up roster roster = new Roster(); + + // get group chat history + $.get(lamsUrl + "PresenceChatLogger.do", {method: "getGroupHistory", roomName:CONFERENCEROOM}, handleGetGroupHistory); } function handleDisconnected() { // if presence im is enabled (there is a chatbox) - if(presenceImEnabled == "true"){ + if(presenceImEnabled == "true" && showStatus){ // generate the emote message and display it to group chat var emoteMessage = generateEmoteHTML("You", "have been disconnected from LAMS instant messaging"); updateMessageDisplay('groupchat_messageArea', emoteMessage); @@ -725,7 +805,36 @@ doLogin(presenceUrl, userId, userId, userId, roomName, nickname, false); } } - + +function handleGetGroupHistory(groupHistory){ + if(groupHistory){ + $(groupHistory).find("clause").each(function() { + var from = $(this).find('from').text(); + var dateSent = $(this).find('dateSent').text(); + var message = $(this).find('message').text(); + var htmlMessage = generateMessageHTML(from, message, dateSent); + updateMessageDisplay('groupchat_messageArea', htmlMessage); + }); + } +} + +function handleGetConversation(conversation){ + if(conversation) { + var nick = $(conversation).find('nick').text(); + $(conversation).find("clause").each(function() { + var from = $(this).find('from').text(); + var to = $(this).find('to').text(); + var dateSent = $(this).find('dateSent').text(); + var message = $(this).find('message').text(); + + var htmlMessage = generateMessageHTML(from, message, dateSent); + + // add the div to the sender's tab + updateMessageDisplay(nickToMessageArea(nick), htmlMessage); + }); + } +} + /* ******* Connection function ******* */ function doLogin(presenceServerUrl, userID, password, resource, chatroom, nickname, register) { try { Index: lams_learning/web/includes/presenceChat.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/includes/Attic/presenceChat.jsp,v diff -u -r1.2 -r1.2.2.1 --- lams_learning/web/includes/presenceChat.jsp 2 Apr 2009 01:42:04 -0000 1.2 +++ lams_learning/web/includes/presenceChat.jsp 17 Apr 2009 08:22:31 -0000 1.2.2.1 @@ -36,6 +36,7 @@ $("#presenceChatTabs").bind('tabsselect', function(event, ui) { var nick = getUserFromTag(ui.panel.id).nick; $('#' + ui.panel.id + '_tabLabel').html(nick); + $("#presenceChatTabs").tabs('scrollTo', ui.tab.offsetLeft); }); @@ -51,41 +52,40 @@ - <%-- html --%> + <%-- initial html / presence.js adds on html into here --%>
    + <%-- only pop the message box if im is enabled --%>
    -
    -
    - -
    - -
    - -
    +
    +
    + +
    + +

    - +
    @@ -100,14 +100,15 @@
    +
    Users
    +
    Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/.classpath'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/.cvsignore'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/.project'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/build.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/build.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/.settings/com.genuitec.eclipse.j2eedt.core.prefs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/.settings/org.eclipse.core.resources.prefs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/.settings/org.eclipse.jdt.core.prefs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/.settings/org.eclipse.jdt.ui.prefs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/hibernate/mappings/hibernate.cfg.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderAttachment.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderComment.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderCondition.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRating.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/hibernate/mappings/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/jar/META-INF/MANIFEST.MF'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/ApplicationResources.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_el_GR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_en_AU.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/lams/ApplicationResources_no_NO.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/rams/ApplicationResources.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/language/rams/ApplicationResources_en_AU.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/middlegen/lams_tool_lavideoRecorder11-prefs.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/war/META-INF/MANIFEST.MF'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/error-pages.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/filter-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/filters.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/global-forwards.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/listeners.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/servlet-mappings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/servlets.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/struts-actions.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/struts-forms.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/struts-message-resources.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/struts-plugins.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/taglibs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/web-security.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/xdoclet/web-settings.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/db/model/videoRecorder_tool.clay'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/activity_insert.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/db_version_insert.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/drop_lams_tool_videoRecorder.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/library_insert.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/table-schema.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/tool_insert.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/updatescripts/updateTo20070227.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/db/sql/updatescripts/updateTo20080229.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderAttachmentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderCommentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRatingDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRecordingDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderUserDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderAttachmentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderCommentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderUserDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/autopatchContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dbupdates/patch20080929_updateFrom21.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderAttachmentDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderCommentDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderConditionDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRatingDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRecordingDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderSessionDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderUserDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorder.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderAttachment.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderComment.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderCondition.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRating.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderSession.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderUser.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderOutputFactory.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderServiceProxy.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderCommentComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderConstants.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderRecordingComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/util/VideoRecorderToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/AuthoringVideoRecorderConditionAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/ClearSessionAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/MonitoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/forms/AuthoringForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/forms/LearningForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/forms/MonitoringForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/forms/VideoRecorderConditionForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/VideoRecorderAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/403.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/404.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/error.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/META-INF/MANIFEST.MF'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/lams.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/web.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/fckeditor/tlds/FCKeditor.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/jstl/tlds/c.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/jstl/tlds/fmt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/jstl/tlds/fn.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/jstl/tlds/permittedTaglibs.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/jstl/tlds/scriptfree.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/jstl/tlds/x.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/struts/struts-config.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/struts/tiles-defs.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/struts/validator-rules.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/struts/tlds/struts-bean.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/struts/tlds/struts-html.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/struts/tlds/struts-logic.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/struts/tlds/struts-nested.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/struts/tlds/struts-tiles.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/Date.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/DefineLater.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/ExportPortOutput.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/FCKEditor.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/Head.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/ImgButtonWrapper.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/ProgressOutput.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/Tab.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/TabBody.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/TabName.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/Tabs.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/TextSearch.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/headItems.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/empty.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/footer.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/header.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/learnerheader.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/message.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/messages.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/common/taglibs.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/images/VideoRecorder.xcf.zip =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/images/VideoRecorder.xcf.zip,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/images/cross.gif =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/images/cross.gif,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/images/down.gif =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/images/down.gif,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/images/down_disabled.gif =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/images/down_disabled.gif,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/images/edit.gif =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/images/edit.gif,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/images/icon_videoRecorder.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/images/icon_videoRecorder.swf,v diff -u -r1.2.4.1 -r1.2.4.2 Binary files differ Index: lams_tool_videorecorder/web/images/success.gif =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/images/success.gif,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/images/up.gif =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/images/up.gif,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/images/up_disabled.gif =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/images/up_disabled.gif,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/AC_OETags.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/VideoRecorder.html'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/includes/flash/VideoRecorder.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/VideoRecorder.swf,v diff -u -r1.6.2.1 -r1.6.2.2 Binary files differ Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/VideoRecorderFCKEditor.html'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/includes/flash/VideoRecorderFCKEditor.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/VideoRecorderFCKEditor.swf,v diff -u -r1.5.2.1 -r1.5.2.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/playerProductInstall.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/playerProductInstall.swf,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/24-heart-gold.png =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/24-heart-gold.png,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/24-heart-red.png =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/24-heart-red.png,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/24-heart-silver.png =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/24-heart-silver.png,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/deleteIcon.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/deleteIcon.swf,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/downArrow.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/downArrow.swf,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/exportIcon.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/exportIcon.swf,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/assets/images/license.txt'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/includes/flash/assets/images/pauseIcon.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/pauseIcon.swf,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/playArray.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/playArray.swf,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/playerVolume.png =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/playerVolume.png,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/recordIcon.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/recordIcon.swf,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/upArrow.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/upArrow.swf,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/assets/images/volume.jpg =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/assets/images/volume.jpg,v diff -u -r1.1.4.1 -r1.1.4.2 Binary files differ Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/assets/styles/main.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/history/history.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/history/history.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/flash/history/historyFrame.html'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/javascript/authoring.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/includes/javascript/monitoring.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/layouts/defaultLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/layouts/learningLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/layouts/tabLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/addCondition.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/advanced.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/authoring.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/basic.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/conditionList.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/conditions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/authoring/instructions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/export/exportPortfolio.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/learning/defineLater.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/learning/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/learning/runOffline.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/learning/parts/finishButton.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/editActivity.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/instructions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/monitoring.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/statistics.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/summary.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/pages/monitoring/videoRecorderDisplay.jsp'. Fisheye: No comparison available. Pass `N' to diff?