Index: lams_tool_lamc/build.xml =================================================================== diff -u -r095d84cd64c174e6d15280be776375a2d1eb56f6 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/build.xml (.../build.xml) (revision 095d84cd64c174e6d15280be776375a2d1eb56f6) +++ lams_tool_lamc/build.xml (.../build.xml) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -257,6 +257,7 @@ + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== diff -u -rc68cf6aaed1c830c53afaf8838133b2dbd6647ee -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision c68cf6aaed1c830c53afaf8838133b2dbd6647ee) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -302,4 +302,5 @@ public static final String USER_EXCEPTION_PASSMARK_GREATER100 ="userExceptionPassmarkGreater100"; public static final String USER_EXCEPTION_FILENAME_EMPTY ="userExceptionFilenameEmpty"; public static final String USER_EXCEPTION_WEIGHT_MUST_EQUAL100 ="userExceptionWeightMustEqual100"; + public static final String USER_EXCEPTION_SINGLE_OPTION ="userExceptionSingleOption"; } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties =================================================================== diff -u -re8579f8f7b5afa49dc060d9534683cdaa649cb2b -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties (.../McResources.properties) (revision e8579f8f7b5afa49dc060d9534683cdaa649cb2b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties (.../McResources.properties) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -121,6 +121,8 @@ label.outof =out of label.mustGet =Must get at least label.toFinish =to finish +label.save =Save +label.cancel =Cancel feedback =Please address the following issues before submit.
error.default.content.notSetup =The tool initialization error: The tool default content has not been set up properly. @@ -133,6 +135,7 @@ error.question.weight.total =Please correct this: The total question weight:100 has been reached. error.answers.duplicate =Please correct this: The candidate answers must be unique. error.emptyQuestion =Please enter the question text. The chosen question can not be empty. +error.singleOption =Please correct this: There must be at least 2 candidate answers. error.emptyWeight =Sorry, the question can not be added without a weight. error.title =Please correct this: The field "Title" is mandatory.
error.instructions =Please correct this: The field "Instructions" is mandatory.
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java =================================================================== diff -u -rc68cf6aaed1c830c53afaf8838133b2dbd6647ee -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision c68cf6aaed1c830c53afaf8838133b2dbd6647ee) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -781,5 +781,6 @@ request.getSession().removeAttribute(USER_EXCEPTION_PASSMARK_GREATER100); request.getSession().removeAttribute(USER_EXCEPTION_FILENAME_EMPTY); request.getSession().removeAttribute(USER_EXCEPTION_WEIGHT_MUST_EQUAL100); + request.getSession().removeAttribute(USER_EXCEPTION_SINGLE_OPTION); } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java =================================================================== diff -u -re8579f8f7b5afa49dc060d9534683cdaa649cb2b -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision e8579f8f7b5afa49dc060d9534683cdaa649cb2b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -1388,6 +1388,26 @@ Map mapOptionsContent=AuthoringUtil.repopulateMap(request, "optionContent"); logger.debug("mapOptionsContent after shrinking: " + mapOptionsContent); + + if (mapOptionsContent.size() == 1) + { + logger.debug("mapOptionsContent size is 1)"); + ActionMessages errors= new ActionMessages(); + request.getSession().setAttribute(USER_EXCEPTION_SINGLE_OPTION, new Boolean(true).toString()); + errors.add(Globals.ERROR_KEY,new ActionMessage("error.singleOption")); + logger.debug("add error.singleOption to ActionMessages"); + saveErrors(request,errors); + mcAuthoringForm.resetUserAction(); + logger.debug("return to destination to fix error."); + + request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(1)); + logger.debug("setting EDIT_OPTIONS_MODE to 1"); + + McUtils.debugMaps(request); + return (mapping.findForward(destination)); + } + + request.getSession().setAttribute(MAP_OPTIONS_CONTENT, mapOptionsContent); logger.debug("final done MAP_OPTIONS_CONTENT: " + mapOptionsContent); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java =================================================================== diff -u -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -32,7 +32,8 @@ */ public class McAuthoringForm extends McLearningForm implements McAppConstants { /* form controllers */ - protected String addOptionContent; + protected String addOptionContent; + protected String currentTab; protected String questionIndex; protected String optionIndex; @@ -65,12 +66,16 @@ protected String choiceAdvanced; protected String choiceInstructions; + protected String submit; + /* basic content */ protected String title; protected String instructions; protected String isRemoveContent; protected String toolContentId; + protected String toolContentID; + /* instructions content */ protected String onlineInstructions; protected String offlineInstructions; @@ -125,6 +130,7 @@ this.editActivityMonitoring=null; this.statsMonitoring=null; this.edit=null; + this.submit=null; } public void reset() @@ -161,6 +167,7 @@ this.deletableOptionIndex=null; this.isRemoveContent=null; this.toolContentId=null; + this.toolContentID=null; this.onlineInstructions=null; this.offlineInstructions=null; @@ -183,6 +190,7 @@ this.editActivityMonitoring=null; this.statsMonitoring=null; this.edit=null; + this.submit=null; } public void resetRadioBoxes() @@ -775,4 +783,42 @@ public void setUuid(String uuid) { this.uuid = uuid; } + /** + * @return Returns the currentTab. + */ + public String getCurrentTab() { + return currentTab; + } + /** + * @param currentTab The currentTab to set. + */ + public void setCurrentTab(String currentTab) { + this.currentTab = currentTab; + } + /** + * @return Returns the toolContentID. + */ + public String getToolContentID() { + return toolContentID; + } + /** + * @param toolContentID The toolContentID to set. + */ + public void setToolContentID(String toolContentID) { + this.toolContentID = toolContentID; + } + + /** + * @return Returns the submit. + */ + public String getSubmit() { + return submit; + } + /** + * @param submit The submit to set. + */ + public void setSubmit(String submit) { + this.submit = submit; + } + } Index: lams_tool_lamc/web/McErrorBox.jsp =================================================================== diff -u -r61a2088821a0175b973f9d8354f7432f5fcdc566 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/web/McErrorBox.jsp (.../McErrorBox.jsp) (revision 61a2088821a0175b973f9d8354f7432f5fcdc566) +++ lams_tool_lamc/web/McErrorBox.jsp (.../McErrorBox.jsp) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -191,6 +191,12 @@ + + + + + + Index: lams_tool_lamc/web/WEB-INF/lams.tld =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/web/WEB-INF/lams.tld (.../lams.tld) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/web/WEB-INF/lams.tld (.../lams.tld) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -1,53 +1,81 @@ - - + - 1.0 - 1.1 - lams + 1.0 + lams - + LAMSTags + + Output the Server URL as defined in the lams.xml configuration file. + LAMS URL + + LAMSURL - org.lamsfoundation.lams.web.tag.LAMSURLTag - + org.lamsfoundation.lams.web.tag.LAMSURLTag + empty + Output details from the shared session UserDTO object + user details + + user - org.lamsfoundation.lams.web.tag.UserTag - + org.lamsfoundation.lams.web.tag.UserTag + empty property true - true + true + + Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/ + Base URL for the current web app + + WebAppURL - org.lamsfoundation.lams.web.tag.WebAppURLTag - + org.lamsfoundation.lams.web.tag.WebAppURLTag + empty + Output stylesheet based on the user preferences. + User's chosen stylesheet + + css - org.lamsfoundation.lams.web.tag.CssTag - + org.lamsfoundation.lams.web.tag.CssTag + empty + + localLink + false + + true + + + STRUTS-textarea org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag + empty accesskey false @@ -224,5 +252,25 @@ true + + Tab + /WEB-INF/tags/Tab.tag + + + Tabs + /WEB-INF/tags/Tabs.tag + + + TabBody + /WEB-INF/tags/TabBody.tag + + + HTMLEditor + /WEB-INF/tags/HTMLEditor.tag + + + SetEditor + /WEB-INF/tags/SetEditor.tag + Fisheye: Tag bcdadd4703b87778089f05c0f9bc91a80d7edfbf refers to a dead (removed) revision in file `lams_tool_lamc/web/author_page/css/aqua.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bcdadd4703b87778089f05c0f9bc91a80d7edfbf refers to a dead (removed) revision in file `lams_tool_lamc/web/author_page/css/base.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/author_page/css/fckeditor_style.css =================================================================== diff -u --- lams_tool_lamc/web/author_page/css/fckeditor_style.css (revision 0) +++ lams_tool_lamc/web/author_page/css/fckeditor_style.css (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -0,0 +1,55 @@ +.previewPanel{ + width: 700px; + height: 220px; + border-style: none; + border-width: 1px; + padding: 5px; + + overflow: auto; +} + +.textareaPanel{ + width: 700px; + height: 220px; +} + + +.smallPreviewPanel{ + width: 700px; + height: 120px; + border-style: none; + border-width: 1px; + padding: 5px; +} + +.smallTextareaPanel{ + width: 700px; + height: 120px; +} + +#wyswygEditor{ + /*position the wyswygEditor in the centre*/ + position: absolute; + /*top: 15%; + left: 50%; + margin-left: -400px; + margin-top: -260px;*/ + + width: 100%; + height: 100%; + + + /*border-style: solid; + border-width: 3px;*/ +} + +#wyswygEditorScreen{ + position: absolute; + + width: 700px; + height: 220px; + + padding: 0px; + margin: 0px; +} + Fisheye: Tag bcdadd4703b87778089f05c0f9bc91a80d7edfbf refers to a dead (removed) revision in file `lams_tool_lamc/web/author_page/css/tool_custom.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bcdadd4703b87778089f05c0f9bc91a80d7edfbf refers to a dead (removed) revision in file `lams_tool_lamc/web/author_page/css/xp.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/author_page/images/Thumbs.db =================================================================== diff -u Binary files differ Index: lams_tool_lamc/web/author_page/images/aqua_tab_centre.gif =================================================================== diff -u -rd2db4f7a3d5cb640c060912cf07bedc19eecf2b8 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 Binary files differ Index: lams_tool_lamc/web/author_page/images/aqua_tab_i_centre.gif =================================================================== diff -u Binary files differ Index: lams_tool_lamc/web/author_page/images/aqua_tab_i_left.gif =================================================================== diff -u Binary files differ Index: lams_tool_lamc/web/author_page/images/aqua_tab_i_right.gif =================================================================== diff -u Binary files differ Index: lams_tool_lamc/web/author_page/images/aqua_tab_left.gif =================================================================== diff -u -rd2db4f7a3d5cb640c060912cf07bedc19eecf2b8 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 Binary files differ Index: lams_tool_lamc/web/author_page/images/aqua_tab_right.gif =================================================================== diff -u -rd2db4f7a3d5cb640c060912cf07bedc19eecf2b8 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 Binary files differ Index: lams_tool_lamc/web/author_page/images/aqua_tab_s_centre.gif =================================================================== diff -u -rd2db4f7a3d5cb640c060912cf07bedc19eecf2b8 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 Binary files differ Index: lams_tool_lamc/web/author_page/images/aqua_tab_s_left.gif =================================================================== diff -u -rd2db4f7a3d5cb640c060912cf07bedc19eecf2b8 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 Binary files differ Index: lams_tool_lamc/web/author_page/images/aqua_tab_s_right.gif =================================================================== diff -u -rd2db4f7a3d5cb640c060912cf07bedc19eecf2b8 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 Binary files differ Index: lams_tool_lamc/web/author_page/js/fckcontroller.js =================================================================== diff -u --- lams_tool_lamc/web/author_page/js/fckcontroller.js (revision 0) +++ lams_tool_lamc/web/author_page/js/fckcontroller.js (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -0,0 +1,212 @@ +var activeEditorIndex = 0; +var oFCKeditor; + +//whether to initialise the editor in textarea mode or preview mode +function initEditor(index){ + var textareaElement = document.getElementById("tx" + index + ".textarea") + if(textareaElement == null) + return; + var text = textareaElement.value; + + if(containsHTML(text)){ + var previewTextElement = document.getElementById("preview" + index + ".text"); + var previewText = document.getElementById("tx" + index + ".textarea").value; + previewTextElement.innerHTML = previewText; + + hideElementById("tx"+index); + showElementById("preview"+index); + } + else{ + hideElementById("preview"+index); + showElementById("tx"+index); + } +} + +// FCKeditor_OnComplete is a special function that is called when an editor +// instance is loaded ad available to the API. It must be named exactly in +// this way. +function FCKeditor_OnComplete( editorInstance ) +{ + //hideElementById("wyswygEditorScreen"); +} + + +function SetContents(content) +{ + // Get the editor instance that we want to interact with. + var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ; + + // Set the editor contents (replace the actual one). + oEditor.SetHTML(content) ; +} + + +function doWYSWYGEdit(index, size){ + + var oEditor; + try { + oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ; + } + catch(error) { + //browsers like opera can't resolve the FCKeditorAPI classes + alert("The browser you are using doesn't support Rich Text Editor, Please use a supported browser instead."); + return; + } + + if(activeEditorIndex != index && activeEditorIndex != 0){ + saveWYSWYGEdittedText(activeEditorIndex); //save the existing content + doPreview(activeEditorIndex); //update preview panel + } + + activeEditorIndex = index; + + //hide html editor + doPreview(index); + + var previewElement = document.getElementById("preview" + index + ".text"); + var posX = findPosX(previewElement); + var posY = findPosY(previewElement); + + var text = document.getElementById("tx" + index + ".textarea").value; + + oEditor.SetHTML(text) ; + + wyswygEditorScreenElement = document.getElementById("wyswygEditorScreen"); + wyswygEditorScreenElement.style.top = posY + "px"; + wyswygEditorScreenElement.style.left = posX + "px"; + + //resize the fck editor + fckFrameElement = document.getElementById("FCKeditor1___Frame"); + if (size == "small") { + fckFrameElement.style.height = "100px"; + wyswygEditorScreenElement.style.height = "120px"; + } else { + fckFrameElement.style.height = "200px"; + wyswygEditorScreenElement.style.height = "220px"; + } + + showElementById("wyswygEditorScreen"); + + + showElementById("wyswygEditorScreen"); +} + +//convert the text to HTML first, +function doTextToHTML(index){ + var textareaElement = document.getElementById("tx" + index + ".textarea"); + var text = covertTextToHTML(textareaElement.value); + textareaElement.value = text; +} + +function saveWYSWYGEdittedText(index){ + var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ; + var text = oEditor.GetXHTML( true ) + + + var htmlEditorElement = document.getElementById("tx" + index + ".textarea"); + htmlEditorElement.value = text; + +} + +function doEdit(index){ + hideElementById("wyswygEditorScreen"); + hideElementById("preview"+index); + showElementById("tx"+index); +} + +function doPreview(index){ + var previewTextElement = document.getElementById("preview" + index + ".text"); + var previewText = document.getElementById("tx" + index + ".textarea").value; + previewTextElement.innerHTML = previewText; + + hideElementById("wyswygEditorScreen"); + hideElementById("tx"+index); + showElementById("preview"+index); +} + + +/*** show/hide Elements ***/ +function showElement(element) { + element.style.visibility = 'visible'; + element.style.display = "block"; +} +function hideElement(element) { + element.style.visibility = 'hidden'; + element.style.display = "none"; +} + +function showElementById(id) { + var element = document.getElementById(id); + showElement(element); +} + +function hideElementById(id) { + var element = document.getElementById(id); + hideElement(element); +} + + +/*** findPosX and findPoxY functions are use to locate the x,y location of an element ***/ +function findPosX(obj) { + var curleft = 0; + if(obj.offsetParent) + while(1) + { + curleft += obj.offsetLeft; + if(!obj.offsetParent) + break; + obj = obj.offsetParent; + } + else if(obj.x) + curleft += obj.x; + return curleft; +} + +function findPosY(obj) { + var curtop = 0; + if(obj.offsetParent) + while(1) + { + curtop += obj.offsetTop; + if(!obj.offsetParent) + break; + obj = obj.offsetParent; + } + else if(obj.y) + curtop += obj.y; + return curtop; +} + +/**** Using the regular expressions defined below to convert Text to HTML ****/ +var NEWLINE = "
"; +var GREATER = ">"; +var LESSER = "<"; +//var SPACE = " "; + +var RE_ESCAPE_NEWLINE = new RegExp("\n", "g"); +var RE_ESCAPE_GREATER = new RegExp(">", "g"); +var RE_ESCAPE_LESSER = new RegExp("<", "g"); +//var RE_ESCAPE_SPACE = new RegExp(" ", "g"); + +var RE_HTML_TAG = new RegExp("<.*>|" + LESSER + "|" + GREATER); + +function covertTextToHTML(str){ + return str.replace(RE_ESCAPE_GREATER, GREATER) + .replace(RE_ESCAPE_LESSER, LESSER) + .replace(RE_ESCAPE_NEWLINE, NEWLINE); + + //.replace(RE_ESCAPE_SPACE, SPACE) +} + +/**** Detect whether HTML was used */ +function containsHTML(str){ + return (str.match(RE_HTML_TAG) != null)? true:false; +} + + + +/*** implement the event onSelectTab() which gets trigger when tabs is changed ***/ +function onSelectTab(tabID){ + //hide all active editors + doPreview(activeEditorIndex); +} \ No newline at end of file Fisheye: Tag f93b28e84d3d44e2d8ee3c5d873b87fe6063a12f refers to a dead (removed) revision in file `lams_tool_lamc/web/author_page/js/tabcontroller.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -32,7 +32,7 @@ - +
- @@ -112,11 +110,9 @@ : - @@ -127,18 +123,6 @@ - - - -
@@ -97,11 +97,9 @@ : + - - - +
+ - - - +
-    - - - - - - -
\ No newline at end of file Index: lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp =================================================================== diff -u -r61a2088821a0175b973f9d8354f7432f5fcdc566 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 61a2088821a0175b973f9d8354f7432f5fcdc566) +++ lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -19,6 +19,7 @@ http://www.gnu.org/licenses/gpl.txt --%> +<%@ include file="../sharing/share.jsp" %> <%@ taglib uri="tags-bean" prefix="bean"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> @@ -28,43 +29,49 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> +<%@ page import="java.util.LinkedHashSet" %> +<%@ page import="java.util.Set" %> + + <% + Set tabs = new LinkedHashSet(); + tabs.add("label.basic"); + tabs.add("label.advanced"); + tabs.add("label.instructions"); + pageContext.setAttribute("tabs", tabs); + + %> + - + <bean:message key="label.authoring"/> + author_page/css/aqua.css" rel="stylesheet" type="text/css"> - - + + + css/tool_custom.css" rel="stylesheet" type="text/css"> - + + + - + - - - - - - + + -
- -

- - - - - - - -
- - images/success.gif" align="left" width=20 height=20> - - - -
- -
- -
- - - - - - -
- - - - -
- - -
-
+ + + + + + + + + + + +
-
-

- - - -
- -
+ + + + + + + -
- -
-
- -
-

- - - -
- -
+ + + + -
- -
-
+ + Index: lams_tool_lamc/web/authoring/Basic.jsp =================================================================== diff -u --- lams_tool_lamc/web/authoring/Basic.jsp (revision 0) +++ lams_tool_lamc/web/authoring/Basic.jsp (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -0,0 +1,39 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-logic-el" prefix="logic-el" %> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + + + + Index: lams_tool_lamc/web/authoring/BasicContent.jsp =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -31,26 +31,43 @@ - + +

+ + +
+ + + + +
+ + images/success.gif" align="left" width=20 height=20> + + + +
+ +
+ + + + - - @@ -254,9 +271,15 @@ Index: lams_tool_lamc/web/authoring/InstructionsContent.jsp =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/web/authoring/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/web/authoring/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -31,17 +31,21 @@ +
: - - - + +
: - - - + +
- - - +

+ + + + + + +

+ +
+ +
+ - @@ -105,10 +109,8 @@ - @@ -177,16 +179,4 @@ - - - - -
: - - - + +
- - - + +
- - - - - - -
Index: lams_tool_lamc/web/authoring/OptionsContent.jsp =================================================================== diff -u -r94789b14d5f0b1d8bf8e680bb6ef66742e5a27ec -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 --- lams_tool_lamc/web/authoring/OptionsContent.jsp (.../OptionsContent.jsp) (revision 94789b14d5f0b1d8bf8e680bb6ef66742e5a27ec) +++ lams_tool_lamc/web/authoring/OptionsContent.jsp (.../OptionsContent.jsp) (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -175,9 +175,7 @@ - - - + @@ -188,9 +186,7 @@ - - - + Index: lams_tool_lamc/web/images/Thumbs.db =================================================================== diff -u -r4e9626d2bb99707b3788e69ece75a0b68e47022b -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 Binary files differ Index: lams_tool_lamc/web/includes/javascript/xmlrequest.js =================================================================== diff -u --- lams_tool_lamc/web/includes/javascript/xmlrequest.js (revision 0) +++ lams_tool_lamc/web/includes/javascript/xmlrequest.js (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -0,0 +1,56 @@ +// global request and XML document objects +var req; + +// retrieve XML document (reusable generic function); +// parameter is URL string (relative or complete) to +// an .xml file whose Content-Type is a valid XML +// type, such as text/xml; XML source must be from +// same domain as HTML file +function loadXMLDoc(url,target) { + // branch for native XMLHttpRequest object + if (window.XMLHttpRequest) { + req = new XMLHttpRequest(); + req.onreadystatechange = function(){ + processReqChange(target); + } + req.open("GET", url, true); + req.send(null); + // branch for IE/Windows ActiveX version + } else if (window.ActiveXObject) { + req = new ActiveXObject("Microsoft.XMLHTTP"); + if (req) { + req.onreadystatechange = function(){ + processReqChange(target); + } + req.open("GET", url, true); + req.send(); + } + } +} + + +// handle onreadystatechange event of req object +function processReqChange(target) { + // only if req shows "loaded" + if (req.readyState == 4) { + // only if "OK" + if (req.status == 200) { + var select = document.getElementById(target); + select.innerHTML = req.responseText; + } else { + alert("There was a problem retrieving the XML data:\n" + + req.statusText); + } + } +} +//main function, will call loadXMLDoc() directly, but catch any exception and alert. +function loadDoc(url,target) { + try { + loadXMLDoc(url, target); + } + catch(e) { + var msg = (typeof e == "string") ? e : ((e.message) ? e.message : "Unknown Error"); + alert("Unable to get XML data:\n" + msg); + return; + } +} \ No newline at end of file Index: lams_tool_lamc/web/sharing/share.jsp =================================================================== diff -u --- lams_tool_lamc/web/sharing/share.jsp (revision 0) +++ lams_tool_lamc/web/sharing/share.jsp (revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4) @@ -0,0 +1,11 @@ + +<%@ page language="java"%> + +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> + +<% + String LAMS_WEB_ROOT="/lams"; +%>