git-svn-id: https://xerteonlinetoolkits.googlecode.com/svn/trunk@62 9…

…12cdd6b-5c7d-d5a7-a2ba-d0f0cdb91641
thexerteproject · Jul 20, 2011 · 39bc52b · 39bc52b
1 parent b5b7c33
commit 39bc52b
Show file tree

Hide file tree

Showing 85 changed files with 1,700 additions and 2 deletions.
diff --git a/JMolViewer/jmol.htm b/JMolViewer/jmol.htm
@@ -0,0 +1,20 @@
+<head>
+  <title>JMol Example</title>
+  <script src="jmol/Jmol.js" type="text/javascript"></script> <!--  Use your own path here {#1} -->
+</head>
+
+
+
+<body  style="width:100%; height:100%; min-height:100%; background-color:'#87CEEB'">
+
+    <script type="text/javascript">
+
+	var str = document.location.search.substr(1,document.location.search.length);
+	var xyzFile = str.split('xyz=')[1];
+
+      	jmolInitialize("jmol", false);
+	jmolSetAppletColor('#87CEEB');
+      	jmolApplet([360, 360], "load " + xyzFile);
+
+    </script>
+</body>
diff --git a/JMolViewer/jmol/Jmol.js b/JMolViewer/jmol/Jmol.js
diff --git a/JMolViewer/jmol/JmolApplet0.jar b/JMolViewer/jmol/JmolApplet0.jar
diff --git a/JMolViewer/jmol/JmolApplet0_Console.jar b/JMolViewer/jmol/JmolApplet0_Console.jar
diff --git a/JMolViewer/jmol/JmolApplet0_Minimize.jar b/JMolViewer/jmol/JmolApplet0_Minimize.jar
diff --git a/JMolViewer/jmol/JmolApplet0_Popup.jar b/JMolViewer/jmol/JmolApplet0_Popup.jar
diff --git a/JMolViewer/jmol/JmolApplet0_ReadersCifPdb.jar b/JMolViewer/jmol/JmolApplet0_ReadersCifPdb.jar
diff --git a/JMolViewer/jmol/JmolApplet0_ReadersMolXyz.jar b/JMolViewer/jmol/JmolApplet0_ReadersMolXyz.jar
diff --git a/JMolViewer/jmol/JmolApplet0_ReadersMore.jar b/JMolViewer/jmol/JmolApplet0_ReadersMore.jar
diff --git a/JMolViewer/jmol/JmolApplet0_ReadersQuantum.jar b/JMolViewer/jmol/JmolApplet0_ReadersQuantum.jar
diff --git a/JMolViewer/jmol/JmolApplet0_ReadersSimple.jar b/JMolViewer/jmol/JmolApplet0_ReadersSimple.jar
diff --git a/JMolViewer/jmol/JmolApplet0_ReadersXml.jar b/JMolViewer/jmol/JmolApplet0_ReadersXml.jar
diff --git a/JMolViewer/jmol/JmolApplet0_ReadersXtal.jar b/JMolViewer/jmol/JmolApplet0_ReadersXtal.jar
diff --git a/JMolViewer/jmol/JmolApplet0_ShapeBio.jar b/JMolViewer/jmol/JmolApplet0_ShapeBio.jar
diff --git a/JMolViewer/jmol/JmolApplet0_ShapeSpecial.jar b/JMolViewer/jmol/JmolApplet0_ShapeSpecial.jar
diff --git a/JMolViewer/jmol/JmolApplet0_ShapeSurface.jar b/JMolViewer/jmol/JmolApplet0_ShapeSurface.jar
diff --git a/JMolViewer/jmol/JmolApplet0_Smiles.jar b/JMolViewer/jmol/JmolApplet0_Smiles.jar
diff --git a/JMolViewer/jmol/JmolApplet0_Symmetry.jar b/JMolViewer/jmol/JmolApplet0_Symmetry.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_ar.jar b/JMolViewer/jmol/JmolApplet0_i18n_ar.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_ca.jar b/JMolViewer/jmol/JmolApplet0_i18n_ca.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_cs.jar b/JMolViewer/jmol/JmolApplet0_i18n_cs.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_da.jar b/JMolViewer/jmol/JmolApplet0_i18n_da.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_de.jar b/JMolViewer/jmol/JmolApplet0_i18n_de.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_el.jar b/JMolViewer/jmol/JmolApplet0_i18n_el.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_en_GB.jar b/JMolViewer/jmol/JmolApplet0_i18n_en_GB.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_es.jar b/JMolViewer/jmol/JmolApplet0_i18n_es.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_et.jar b/JMolViewer/jmol/JmolApplet0_i18n_et.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_fi.jar b/JMolViewer/jmol/JmolApplet0_i18n_fi.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_fr.jar b/JMolViewer/jmol/JmolApplet0_i18n_fr.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_hu.jar b/JMolViewer/jmol/JmolApplet0_i18n_hu.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_id.jar b/JMolViewer/jmol/JmolApplet0_i18n_id.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_it.jar b/JMolViewer/jmol/JmolApplet0_i18n_it.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_ko.jar b/JMolViewer/jmol/JmolApplet0_i18n_ko.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_nb.jar b/JMolViewer/jmol/JmolApplet0_i18n_nb.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_nl.jar b/JMolViewer/jmol/JmolApplet0_i18n_nl.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_oc.jar b/JMolViewer/jmol/JmolApplet0_i18n_oc.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_pl.jar b/JMolViewer/jmol/JmolApplet0_i18n_pl.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_pt.jar b/JMolViewer/jmol/JmolApplet0_i18n_pt.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_pt_BR.jar b/JMolViewer/jmol/JmolApplet0_i18n_pt_BR.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_ru.jar b/JMolViewer/jmol/JmolApplet0_i18n_ru.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_sl.jar b/JMolViewer/jmol/JmolApplet0_i18n_sl.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_sv.jar b/JMolViewer/jmol/JmolApplet0_i18n_sv.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_ta.jar b/JMolViewer/jmol/JmolApplet0_i18n_ta.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_tr.jar b/JMolViewer/jmol/JmolApplet0_i18n_tr.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_uk.jar b/JMolViewer/jmol/JmolApplet0_i18n_uk.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_zh_CN.jar b/JMolViewer/jmol/JmolApplet0_i18n_zh_CN.jar
diff --git a/JMolViewer/jmol/JmolApplet0_i18n_zh_TW.jar b/JMolViewer/jmol/JmolApplet0_i18n_zh_TW.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned.jar b/JMolViewer/jmol/JmolAppletSigned.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0.jar b/JMolViewer/jmol/JmolAppletSigned0.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_Console.jar b/JMolViewer/jmol/JmolAppletSigned0_Console.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_Minimize.jar b/JMolViewer/jmol/JmolAppletSigned0_Minimize.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_MultiTouch.jar b/JMolViewer/jmol/JmolAppletSigned0_MultiTouch.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_ar.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_ar.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_ca.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_ca.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_cs.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_cs.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_da.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_da.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_de.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_de.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_el.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_el.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_en_GB.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_en_GB.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_es.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_es.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_et.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_et.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_fi.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_fi.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_fr.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_fr.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_hu.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_hu.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_id.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_id.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_it.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_it.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_ko.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_ko.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_nb.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_nb.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_nl.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_nl.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_oc.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_oc.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_pl.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_pl.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_pt.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_pt.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_pt_BR.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_pt_BR.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_ru.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_ru.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_sl.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_sl.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_sv.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_sv.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_ta.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_ta.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_tr.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_tr.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_uk.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_uk.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_zh_CN.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_zh_CN.jar
diff --git a/JMolViewer/jmol/JmolAppletSigned0_i18n_zh_TW.jar b/JMolViewer/jmol/JmolAppletSigned0_i18n_zh_TW.jar
diff --git a/modules/xerte/parent_templates/Nottingham/Nottingham.rlt b/modules/xerte/parent_templates/Nottingham/Nottingham.rlt
@@ -1 +1 @@
-	<LO description="A flexible template for creating interactive learning objects" targetFolder="Nottingham" version="1.0" styleSheet="templatePath + 'common/styles.css'" inputColour="0xFFFFCC" selectableText="1" templateData="FileLocation + 'template.xml'" name="Xerte Online Toolkit">		<SCR name="makePages"><![CDATA[//loop through the xml and insert a page of the right type for each page typeifc = icon.nextSibling;linkIndex = -1;if (templateData.learningObject[0].navigation.indexOf('Menu') != -1 && templateData.learningObject[0].navigation != undefined ){  pgOffset = 2;  newXML = new XML('<PG model="templatePath + \'models/menu.rlm\'"/>');  newChild = newXML.firstChild;  newChild.attributes.title = 'Main Menu';  newChild.attributes.linkID = extXML.firstChild.childNodes[i].attributes.linkID;      ifc.appendChild(newChild);} else {  pgOffset = 1;}debug("-=" + templateData.learningObject[0].test);//custom interfaceif (templateData.learningObject[0].controller != undefined){  icon.nextSibling.attributes.swf = templateData.learningObject[0].controller;  icon.nextSibling.attributes.visuals = 0;}//help fileif (templateData.learningObject[0].nfo != undefined){  icon.nextSibling.attributes.helpfile = templateData.learningObject[0].nfo;}//default text sizeif (templateData.learningObject[0].textSize != undefined){  STYLES.defaultSize = templateData.learningObject[0].textSize;  STYLES.inputSize = templateData.learningObject[0].textSize;}for (i = 0; i < extXML.firstChild.childNodes.length; i++){  //build this file dynamically  modName = extXML.firstChild.childNodes[i].nodeName;    if (modName == 'xerteModel'){    newXML = new XML('<PG model="' + extXML.firstChild.childNodes[i].attributes.modelFile + '"/>');    //is there an initObject...?    if (extXML.firstChild.childNodes[i].attributes.initObject != undefined){      newXML.firstChild.attributes.initObject = extXML.firstChild.childNodes[i].attributes.initObject;    }  } else {    newXML = new XML('<PG model="templatePath + \'models/' + modName + '.rlm\'"/>');  }  newChild = newXML.firstChild;  newChild.attributes.title = extXML.firstChild.childNodes[i].attributes.name;  newChild.attributes.linkID = extXML.firstChild.childNodes[i].attributes.linkID;    if (extXML.firstChild.childNodes[i].attributes.linkID == _level0.linkID && extXML.firstChild.childNodes[i].attributes.linkID != undefined){    linkIndex = i;  }  ifc.appendChild(newChild);}]]></SCR>		<IFC name="interface" title="My Learning Object" visuals="1">			<FW_ENT id="entryFrame" name="background">				<DIS initObject="{_alpha:15}" h="515" w="800" tabIndex="-1" id="bgImage" name="background" x="0" y="1" type="ext" url="{templateData.learningObject[0].background}"><![CDATA[]]></DIS>				<SCR isFunc="1" name="navToPage"><![CDATA[for (i = 0; i < extXML.firstChild.childNodes.length; i++){  if (extXML.firstChild.childNodes[i].attributes.name == args[0]){    rootIcon.gotoPage(i);  }}]]></SCR>				<SCR name="setup"><![CDATA[rootIcon.loadIcon(expression(templateData.learningObject[0].ic, engine));if (templateData.learningObject[0].navigation.indexOf('Menu') != 0)[// || templateData.learningObject[0].navigation != undefined ){  icon.nextSibling.firstChild.removeNode();  } else {    if (templateData.learningObject[0].navigation == 'Menu'){    rootIcon.hideControls();    rootIcon.tocBtn._visible = true;    rootIcon.tocBtn._x = 740;        if (templateData.learningObject[0].nfo != undefined){      rootIcon.helpBtn._visible = true;      rootIcon.helpBtn._x = 690;    }    toc = rootIcon.tocBtn;  }  if (templateData.learningObject[0].navigation == 'Menu with Page Controls'){    rootIcon.hideControls();        rootIcon.backBtn._visible = true;    rootIcon.backBtn._x = 640;      rootIcon.tocBtn._visible = true;    rootIcon.tocBtn._x = 690;      rootIcon.nextBtn._visible = true;    rootIcon.nextBtn._x = 740;    toc = rootIcon.tocBtn;        if (templateData.learningObject[0].nfo != undefined){      rootIcon.helpBtn._visible = true;      rootIcon.helpBtn._x = 590;    }  }}]]></SCR>				<INT id="myInt" name="narrationHandlers" perpetual="1">					<RES name="mainMenu" type="event" eventName="onRelease" icon="rootIcon.tocBtn" erase="1" exit="0">						<SCR name="gotoMenu"><![CDATA[rootIcon.gotoPage(0);]]></SCR>					</RES>					<RES name="showAudio" type="event" eventName="showAudio" icon="rootIcon" erase="1" exit="0">						<SND id="nar" controls="25,0,975" name="narration" type="ext" url="{narration}" play="0" loop="0" wait="0" />						<SCR name="setup"><![CDATA[nar._y = -14;nar._x = 0;nar._yscale =  80;nar._xscale =  80;nar.clear();nar.beginFill(STYLES.titleBarColour,100);nar.drawRect(22,0,130,20);]]></SCR>						<INT name="handleAutoNaviagate" perpetual="0">							<RES name="onLoad" type="event" eventName="onLoad" icon="nar" erase="1" exit="0">								<SCR name="onLoad"><![CDATA[//play automatically?if (myXML.firstChild.attributes.playNarration == 'true'){  nar.play();}]]></SCR>							</RES>							<RES name="onSoundComplete" type="event" eventName="onSoundComplete" icon="nar" erase="1" exit="0">								<SCR name="moveOn"><![CDATA[if (myXML.firstChild.attributes.narrationNavigate == 'true'){  rootIcon.nextPage();}]]></SCR>							</RES>						</INT>					</RES>					<RES name="killYoutubePlayer" type="event" eventName="onClosePage" icon="rootIcon" erase="1" exit="0">						<SCR name="hideNarration"><![CDATA[if (engine[ytID] != undefined){    engine[ytID].destroy();  delete engine[ytID];}]]></SCR>					</RES>					<RES name="exitPreview" type="event" eventName="exitPreview" icon="rootIcon" erase="1" exit="0">						<SCR name="[Untitled]"><![CDATA[if (engine[ytID] != undefined){    engine[ytID].stopVideo();  engine[ytID].destroy();  engine[ytID].removeMovieClip());  delete engine[ytID];}]]></SCR>					</RES>				</INT>				<INT name="onInitHandler" perpetual="0">					<RES name="onInit" type="event" eventName="onInit" icon="rootIcon" erase="1" exit="0">						<SCR name="jump"><![CDATA[rootIcon.preloadMedia();if (templateData.learningObject[0].displayMode != undefined){  rootIcon.setDisplayMode(templateData.learningObject[0].displayMode);}if (linkIndex != -1){  rootIcon.gotoPage(linkIndex);}]]></SCR>					</RES>				</INT>			</FW_ENT>		</IFC>		<BIN myLongVarName="A variable for tracking the user" name="Deleted Items" />	</LO>
+	<LO description="A flexible template for creating interactive learning objects" targetFolder="Nottingham" version="1.0" styleSheet="templatePath + 'common/styles.css'" inputColour="0xFFFFCC" selectableText="1" templateData="FileLocation + 'template.xml'" name="Xerte Online Toolkit">		<SCR name="makePages"><![CDATA[//loop through the xml and insert a page of the right type for each page typeifc = icon.nextSibling;linkIndex = -1;if (templateData.learningObject[0].navigation.indexOf('Menu') != -1 && templateData.learningObject[0].navigation != undefined ){  pgOffset = 2;  newXML = new XML('<PG model="templatePath + \'models/menu.rlm\'"/>');  newChild = newXML.firstChild;  newChild.attributes.title = 'Main Menu';  newChild.attributes.linkID = extXML.firstChild.childNodes[i].attributes.linkID;      ifc.appendChild(newChild);} else {  pgOffset = 1;}//custom interfaceif (templateData.learningObject[0].controller != undefined){  icon.nextSibling.attributes.swf = templateData.learningObject[0].controller;  icon.nextSibling.attributes.visuals = 0;}//help fileif (templateData.learningObject[0].nfo != undefined){  icon.nextSibling.attributes.helpfile = templateData.learningObject[0].nfo;}//default text sizeif (templateData.learningObject[0].textSize != undefined){  STYLES.defaultSize = templateData.learningObject[0].textSize;  STYLES.inputSize = templateData.learningObject[0].textSize;}for (i = 0; i < extXML.firstChild.childNodes.length; i++){  //build this file dynamically  modName = extXML.firstChild.childNodes[i].nodeName;    if (modName == 'xerteModel'){    newXML = new XML('<PG model="' + extXML.firstChild.childNodes[i].attributes.modelFile + '"/>');    //is there an initObject...?    if (extXML.firstChild.childNodes[i].attributes.initObject != undefined){      newXML.firstChild.attributes.initObject = extXML.firstChild.childNodes[i].attributes.initObject;    }  } else {    newXML = new XML('<PG model="templatePath + \'models/' + modName + '.rlm\'"/>');  }  newChild = newXML.firstChild;  newChild.attributes.title = extXML.firstChild.childNodes[i].attributes.name;  newChild.attributes.linkID = extXML.firstChild.childNodes[i].attributes.linkID;    if (extXML.firstChild.childNodes[i].attributes.linkID == _level0.linkID && extXML.firstChild.childNodes[i].attributes.linkID != undefined){    linkIndex = i;  }  ifc.appendChild(newChild);}]]></SCR>		<IFC name="interface" title="My Learning Object" visuals="1">			<FW_ENT id="entryFrame" name="background">				<DIS initObject="{_alpha:15}" h="515" w="800" tabIndex="-1" id="bgImage" name="background" x="0" y="1" type="ext" url="{templateData.learningObject[0].background}"><![CDATA[]]></DIS>				<SCR isFunc="1" name="navToPage"><![CDATA[for (i = 0; i < extXML.firstChild.childNodes.length; i++){  if (extXML.firstChild.childNodes[i].attributes.name == args[0]){    rootIcon.gotoPage(i);  }}]]></SCR>				<SCR name="setup"><![CDATA[rootIcon.loadIcon(expression(templateData.learningObject[0].ic, engine));if (templateData.learningObject[0].navigation.indexOf('Menu') != 0)[// || templateData.learningObject[0].navigation != undefined ){  icon.nextSibling.firstChild.removeNode();  } else {    if (templateData.learningObject[0].navigation == 'Menu'){    rootIcon.hideControls();    rootIcon.tocBtn._visible = true;    rootIcon.tocBtn._x = 740;        if (templateData.learningObject[0].nfo != undefined){      rootIcon.helpBtn._visible = true;      rootIcon.helpBtn._x = 690;    }    toc = rootIcon.tocBtn;  }  if (templateData.learningObject[0].navigation == 'Menu with Page Controls'){    rootIcon.hideControls();        rootIcon.backBtn._visible = true;    rootIcon.backBtn._x = 640;      rootIcon.tocBtn._visible = true;    rootIcon.tocBtn._x = 690;      rootIcon.nextBtn._visible = true;    rootIcon.nextBtn._x = 740;    toc = rootIcon.tocBtn;        if (templateData.learningObject[0].nfo != undefined){      rootIcon.helpBtn._visible = true;      rootIcon.helpBtn._x = 590;    }  }}]]></SCR>				<INT id="myInt" name="narrationHandlers" perpetual="1">					<RES name="mainMenu" type="event" eventName="onRelease" icon="rootIcon.tocBtn" erase="1" exit="0">						<SCR name="gotoMenu"><![CDATA[rootIcon.gotoPage(0);]]></SCR>					</RES>					<RES name="showAudio" type="event" eventName="showAudio" icon="rootIcon" erase="1" exit="0">						<SND id="nar" controls="25,0,975" name="narration" type="ext" url="{narration}" play="0" loop="0" wait="0" />						<SCR name="setup"><![CDATA[nar._y = -14;nar._x = 0;nar._yscale =  80;nar._xscale =  80;nar.clear();nar.beginFill(STYLES.titleBarColour,100);nar.drawRect(22,0,130,20);]]></SCR>						<INT name="handleAutoNaviagate" perpetual="0">							<RES name="onLoad" type="event" eventName="onLoad" icon="nar" erase="1" exit="0">								<SCR name="onLoad"><![CDATA[//play automatically?if (myXML.firstChild.attributes.playNarration == 'true'){  nar.play();}]]></SCR>							</RES>							<RES name="onSoundComplete" type="event" eventName="onSoundComplete" icon="nar" erase="1" exit="0">								<SCR name="moveOn"><![CDATA[if (myXML.firstChild.attributes.narrationNavigate == 'true'){  rootIcon.nextPage();}]]></SCR>							</RES>						</INT>					</RES>					<RES name="killYoutubePlayer" type="event" eventName="onClosePage" icon="rootIcon" erase="1" exit="0">						<SCR name="hideNarration&killYouTube"><![CDATA[if (engine[ytID] != undefined){    engine[ytID].stopVideo();  //engine[ytID].destroy();  engine[ytID].removeMovieClip();  engine[ytID] = 6;  delete engine[ytID];}]]></SCR>					</RES>					<RES name="exitPreview" type="event" eventName="exitPreview" icon="rootIcon" erase="1" exit="0">						<SCR name="killYouTube"><![CDATA[if (engine[ytID] != undefined){    engine[ytID].stopVideo();  //engine[ytID].destroy();  engine[ytID].removeMovieClip(); // remove it  engine[ytID] = 6; //force it not to be a movieClip anymore - set it to something else  delete engine[ytID]; //this should kill it for good}]]></SCR>					</RES>				</INT>				<INT name="onInitHandler" perpetual="0">					<RES name="onInit" type="event" eventName="onInit" icon="rootIcon" erase="1" exit="0">						<SCR name="jump"><![CDATA[rootIcon.preloadMedia();if (templateData.learningObject[0].displayMode != undefined){  rootIcon.setDisplayMode(templateData.learningObject[0].displayMode);}if (linkIndex != -1){  rootIcon.gotoPage(linkIndex);}]]></SCR>					</RES>				</INT>			</FW_ENT>		</IFC>		<BIN myLongVarName="A variable for tracking the user" name="Deleted Items" />	</LO>

diff --git a/modules/xerte/parent_templates/Nottingham/data.xwd b/modules/xerte/parent_templates/Nottingham/data.xwd
@@ -58,6 +58,7 @@
 
 
       <links><![CDATA[<links name="Enter Page Title" text="Enter Page Text" cols="3" height="80"/>]]></links>
+ <jmol><![CDATA[<jmol name="New Window" text="Enter text for the page" xyz="Select an XYZ file" previewImage="Select a preview image" tip="Enter Tool Tip"/>]]></jmol>
       <perspectives><![CDATA[<perspectives name="Enter Page Title" />]]></perspectives>
       <xerteModel><![CDATA[<xerteModel name="Enter Page Title" modelFile="Select a Model"/>]]></xerteModel>
       <raptivity><![CDATA[<raptivity name="Enter Page Title" url="Select a Raptivity SWF File"/>]]></raptivity>
@@ -90,6 +91,21 @@
   </learningObject>
 
 
+
+  <!--JMOL VIewer--------------------------------------------------------------------->
+  <jmol menu="Media" menuItem="JMOL Viewer" icon="icAtom" remove="true" thumb="thumbs/jmol.jpg" hint="Provides a viewer for JMOL files">
+
+    <name type="TextInput" label="Page Title"/>
+    <text type="TextArea" height="150" label="Text"/>
+    <xyz type="Media" label="XYZ File"/>
+    <previewImage type="media" label="Preview Image"/>
+    <tip type="TextInput" label="Image Tooltip"/>
+
+    <htm type="textArea" label="HTML" height="150" optional="true"/>
+
+  </jmol>
+
+
   <!--NEW WINDOW--------------------------------------------------------------------->
   <newWindow menu="Navigators" menuItem="New Window" icon="icApplication" remove="true" thumb="thumbs/newWindow.jpg" hint="Allows the user to launch a new window to a url">
 
@@ -431,6 +447,8 @@
     <playNarration type="CheckBox" label="Auto-play narration" optional="true"/>
     <narration type="media" label="Narration" optional="true"/>
 
+    <feedback type="TextArea" height="40" label="Feedback" optional="true"/>
+
     <newNodes>
       <option><![CDATA[<option text="here is an option" feedback="feedback for this option" correct="false"/>]]></option>
     </newNodes>

diff --git a/modules/xerte/parent_templates/Nottingham/models/jmol.rlm b/modules/xerte/parent_templates/Nottingham/models/jmol.rlm
@@ -0,0 +1 @@
+	<PG name="newWindow">		<SCR name="getPageID"><![CDATA[pageIcon = icon.parentNode.clip();myXML = new XML(extXML.firstChild.childNodes[rootIcon.getPageIndex() - pgOffset]);pageIcon.templateData = myXML.toObject();rootIcon.setTitleText(templateData.learningObject[0].name);previewImage = pageIcon.templateData.jmol[0].previewImage;params = new Object();params.width = 400;params.height = 400;params.url = 'JMolViewer/jmol.htm?xyz=../' + expression(pageIcon.templateData.jmol[0].xyz, engine);if (pageIcon.templateData.jmol[0].narration != undefined){  narration = pageIcon.templateData.jmol[0].narration;  rootIcon.broadcast('showAudio');}]]></SCR>		<SCR isFunc="1" name="launchNewWindow"><![CDATA[callJS('openWindow', params);]]></SCR>		<DIS tabIndex="-1" id="panel" name="panel" x="-300" y="20" type="ext" url="templatePath + 'common/whitePanel.swf'"><![CDATA[]]></DIS>		<INT name="loadPanel" perpetual="0">			<RES name="onLoad" type="event" eventName="onLoad" icon="panel" erase="1" exit="1">				<SCR name="exit"><![CDATA[//ok to move on]]></SCR>			</RES>		</INT>		<DIS toolTip="{pageIcon.templateData.jmol[0].tip}" scrolling="auto" id="graphic" name="graphic" x="coded" y="30" type="ext" url="{previewImage}"><![CDATA[{pageIcon.templateData.jmol[0].tip}]]></DIS>		<INT name="loadImage" perpetual="0">			<RES name="onLoad" type="event" eventName="onLoad" icon="graphic" erase="1" exit="1">				<SCR name="calculate"><![CDATA[graphic.constrain(465,465);//resize the panel to the graphicpanel._width = graphic._width + 20;panel._height = graphic._height + 20;panel._x = stageWidth - panel._width - 20;graphic._x = panel._x + 10;textX = 20;textY = 20;textWidth = stageWidth - 80 - graphic._width;graphic.useHandCursor = true;]]></SCR>			</RES>		</INT>		<DIS scrolling="auto" id="textBlock" h="480" name="text" x="textX" y="textY" w="textWidth" type="text"><![CDATA[{pageIcon.templateData.jmol[0].text + '<br><br><a href="asfunction:_level0.engine.launchNewWindow">' + pageIcon.templateData.jmol[0].tip + '</a>}]]></DIS>		<INT name="launch" perpetual="0">			<RES name="onRelease" type="event" eventName="onRelease" icon="graphic" erase="1" exit="0">				<SCR name="calculate"><![CDATA[launchNewWindow();]]></SCR>			</RES>		</INT>	</PG>