"+title+"

");//right side + $('body').append('

'); + var arrowOffset = getElementWidth(linkId) + 11; + var clickElementx = getAbsoluteLeft(linkId) + arrowOffset; //set x position + $('#JT_arrow_left').css({left: (clickElementx - 10) + "px", top: clickElementy +"px"}); + }else{ + $("body").append("

"+title+"

");//left side + $('body').append('

'); + var clickElementx = getAbsoluteLeft(linkId) - ((params['width']*1) + 20); //set x position + $('#JT_arrow_right').css({left: (getAbsoluteLeft(linkId) - 20) + "px", top: clickElementy + "px"}); + } + if ($.browser.msie) { + $('#JT').prepend(''); // iframe for IE select box z-index issue + $('#jTipiFrame').width((params['width']*1) + "px"); + } + $('#JT').css({left: clickElementx+"px", top: clickElementy +"px"}); + + $('#JT_copy').load(url, function() { + //if jtip goes to left side and is partially cut off at left of doc... + if ($('#JT_arrow_right') && clickElementx < 0) { + var JT_width = (getAbsoluteLeft(linkId) - 22); + $('#JT').css({left: 2, width: JT_width}); //adjust width to fit + } + //get the height of the jtip after loading it + var jtip_height = $('#JT').height(); + //adjust the top of jTip + move_jtip(); + if ( (scroll_position + window_height) - clickElementy < jtip_height ) { + var adjusted_top = (window_height - jtip_height) - 6 + scroll_position; + if ( adjusted_top - scroll_position < 0 ) { + $('#JT').css({top: scroll_position + 1}); + } else { + $('#JT').css({top: adjusted_top}); + } + } + }); // end .load() + $('#JT').show(); +} // end JT_show() + +function getElementWidth(objectId) { + x = document.getElementById(objectId); + return x.offsetWidth; +} + +function getAbsoluteLeft(objectId) { + // Get an object left position from the upper left viewport corner + o = document.getElementById(objectId) + oLeft = o.offsetLeft // Get left position from the parent object + while(o.offsetParent!=null) { // Parse the parent hierarchy up to the document element + oParent = o.offsetParent // Get parent object reference + oLeft += oParent.offsetLeft // Add parent left position + o = oParent + } + return oLeft +} + +function getAbsoluteTop(objectId) { + // Get an object top position from the upper left viewport corner + o = document.getElementById(objectId); + oTop = 0; + if(o.offsetParent) { + o = o.offsetParent; + } + while(o) { // Parse the parent hierarchy up to the document element + oTop += o.offsetTop; // Add parent top position + o = o.offsetParent; + } + return oTop +} + +function parseQuery ( query ) { + var Params = new Object (); + if ( ! query ) return Params; // return empty object + var Pairs = query.split(/[;&]/); + for ( var i = 0; i < Pairs.length; i++ ) { + var KeyVal = Pairs[i].split('='); + if ( ! KeyVal || KeyVal.length != 2 ) continue; + var key = unescape( KeyVal[0] ); + var val = unescape( KeyVal[1] ); + val = val.replace(/\+/g, ' '); + Params[key] = val; + } + return Params; +} +function move_jtip() { + if (window.innerHeight) { + scroll_position = window.pageYOffset; + window_height = window.innerHeight; + } + else if (document.documentElement && document.documentElement.scrollTop) { + scroll_position = document.documentElement.scrollTop; + window_height = document.documentElement.clientHeight; + } + else if (document.body) { + scroll_position = document.body.scrollTop; + window_height = document.body.clientHeight; + } +} + +function blockEvents(evt) { + if(evt.target){ + evt.preventDefault(); + }else{ + evt.returnValue = false; + } +} \ No newline at end of file Index: lams_central/web/includes/javascript/openUrls.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v diff -u -r1.32 -r1.33 --- lams_central/web/includes/javascript/openUrls.js 26 Jan 2009 10:13:14 -0000 1.32 +++ lams_central/web/includes/javascript/openUrls.js 26 Jan 2009 18:32:29 -0000 1.33 @@ -74,7 +74,7 @@ function openPedagogicalPlanner(){ if(isMac) { - authorWin = window.open('pedagogicalPlanner.do','aWindow','width=' + authoring_width + ',height=' + screen.height + ',resizable,scrollbars'); + authorWin = window.open('pedagogicalPlanner.do','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable,scrollbars'); } else { @@ -84,7 +84,7 @@ } else { - authorWin = window.open('pedagogicalPlanner.do','aWindow','width=' + authoring_width + ',height=' + screen.height + ',resizable,scrollbars'); + authorWin = window.open('pedagogicalPlanner.do','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable,scrollbars'); authorWin.focus(); } } Index: lams_tool_notebook/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/language/lams/ApplicationResources.properties,v diff -u -r1.16 -r1.17 --- lams_tool_notebook/conf/language/lams/ApplicationResources.properties 19 Nov 2008 18:37:48 -0000 1.16 +++ lams_tool_notebook/conf/language/lams/ApplicationResources.properties 26 Jan 2009 18:33:46 -0000 1.17 @@ -110,5 +110,5 @@ message.contentInUseSet =Modification of content is not allowed since one or more learners has attempted the activity. message.alertContentEdit =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information. - +label.planner.editing.advice=Editing advice #======= End labels: Exported 103 labels for en AU ===== Index: lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.15 -r1.16 --- lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties 19 Nov 2008 18:37:48 -0000 1.15 +++ lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties 26 Jan 2009 18:33:46 -0000 1.16 @@ -110,5 +110,5 @@ message.contentInUseSet =Modification of content is not allowed since one or more learners has attempted the activity. message.alertContentEdit =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information. - +label.planner.editing.advice=Editing advice #======= End labels: Exported 103 labels for en AU ===== Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java,v diff -u -r1.18 -r1.19 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java 31 Oct 2008 01:41:51 -0000 1.18 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java 26 Jan 2009 18:33:46 -0000 1.19 @@ -375,8 +375,8 @@ notebook.setTitle(authForm.getTitle()); notebook.setInstructions(authForm.getInstructions()); if (mode.isAuthor()) { // Teacher cannot modify following - notebook.setOfflineInstructions(authForm.getOnlineInstruction()); - notebook.setOnlineInstructions(authForm.getOfflineInstruction()); + notebook.setOfflineInstructions(authForm.getOfflineInstruction()); + notebook.setOnlineInstructions(authForm.getOnlineInstruction()); notebook.setLockOnFinished(authForm.isLockOnFinished()); notebook.setAllowRichEditor(authForm.isAllowRichEditor()); Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java,v diff -u -r1.1 -r1.2 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java 9 Dec 2008 05:40:32 -0000 1.1 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java 26 Jan 2009 18:33:46 -0000 1.2 @@ -37,6 +37,7 @@ import org.lamsfoundation.lams.tool.notebook.model.Notebook; import org.lamsfoundation.lams.tool.notebook.service.INotebookService; import org.lamsfoundation.lams.tool.notebook.service.NotebookServiceProxy; +import org.lamsfoundation.lams.tool.notebook.util.NotebookConstants; import org.lamsfoundation.lams.tool.notebook.web.forms.NotebookPedagogicalPlannerForm; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; @@ -72,7 +73,7 @@ Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); Notebook notebook = getNotebookService().getNotebookByContentId(toolContentID); plannerForm.fillForm(notebook); - return mapping.findForward("success"); + return mapping.findForward(NotebookConstants.SUCCESS); } public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form, @@ -88,14 +89,22 @@ } else { saveErrors(request, errors); } - return mapping.findForward("success"); + return mapping.findForward(NotebookConstants.SUCCESS); } + public ActionForward getEditingAdvice(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws IOException { + Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); + Notebook notebook = getNotebookService().getNotebookByContentId(toolContentID); + String onlineInstructions = notebook.getOnlineInstructions(); + writeAJAXResponse(response, onlineInstructions); + return null; + } + private INotebookService getNotebookService() { if (notebookService == null) { notebookService = NotebookServiceProxy.getNotebookService(this.getServlet().getServletContext()); } return notebookService; } - } \ No newline at end of file Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java,v diff -u -r1.1 -r1.2 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java 9 Dec 2008 05:40:32 -0000 1.1 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java 26 Jan 2009 18:33:46 -0000 1.2 @@ -23,7 +23,9 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.notebook.web.forms; +import org.apache.commons.lang.StringUtils; import org.lamsfoundation.lams.tool.notebook.model.Notebook; +import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm; /** @@ -42,8 +44,9 @@ public void fillForm(Notebook notebook) { if (notebook != null) { - setInstructions(notebook.getInstructions()); + setInstructions(WebUtil.removeHTMLtags(notebook.getInstructions())); setToolContentID(notebook.getToolContentId()); + setEditingAdviceAvailable(!StringUtils.isEmpty(notebook.getOnlineInstructions())); } } } \ No newline at end of file Index: lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp 9 Dec 2008 05:40:32 -0000 1.1 +++ lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp 26 Jan 2009 18:33:46 -0000 1.2 @@ -5,16 +5,29 @@ + + + + <%@ include file="/common/messages.jsp"%> -

+ + + + + + + " + href="${tipUrl}" id="editingAdvice"> + - + \ No newline at end of file