From 11e2777d5503e23a0ea059b621011dd1c86977e3 Mon Sep 17 00:00:00 2001
From: Julian Tenney <julian.tenney@nottingham.ac.uk>
Date: Tue, 16 Oct 2012 14:30:14 +0000
Subject: [PATCH] Incorrect paths in the navigators for handling initObjects
 and custom flash movies.

git-svn-id: https://xerteonlinetoolkits.googlecode.com/svn/trunk@452 912cdd6b-5c7d-d5a7-a2ba-d0f0cdb91641
---
 modules/xerte/parent_templates/Nottingham/models/accNav.rlm     | 2 +-
 modules/xerte/parent_templates/Nottingham/models/columnPage.rlm | 2 +-
 modules/xerte/parent_templates/Nottingham/models/slideshow.rlm  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/xerte/parent_templates/Nottingham/models/accNav.rlm b/modules/xerte/parent_templates/Nottingham/models/accNav.rlm
index 4ae0c2dd0b..f35d53a231 100644
--- a/modules/xerte/parent_templates/Nottingham/models/accNav.rlm
+++ b/modules/xerte/parent_templates/Nottingham/models/accNav.rlm
@@ -1 +1 @@
-	<PG title="Accordion Navigator" name="accNav">
		<SCR name="getPageID"><![CDATA[pageIcon = icon.parentNode.clip();

if (rootIcon.projMode == "dev"){ 
  // Page Wizard
  pageIcon.templateData = pageIcon.extXML.toObject();
  pageIcon.templateData = pageIcon.templateData.pageWizard[0];
} else {
  // Toolkits
  myXML = new XML(extXML.firstChild.childNodes[rootIcon.getPageIndex() - pgOffset]);
  pageIcon.templateData = myXML.toObject();

}
  rootIcon.setTitleText(templateData.learningObject[0].name);

// handle multiple page data definitions in a project 
if (rootIcon.projectPageIndex == undefined){  
   rootIcon.projectPageIndex = 0;
}
// check if this page has a definition for the current project index and default to 0 if not
if (pageIcon.templateData.accNav[rootIcon.projectPageIndex].name == undefined){
  projPI = 0;
} else {
  projPI = rootIcon.projectPageIndex; 
}  

itemCount = pageIcon.templateData.accNav[projPI].nestedPage.length);


panelWidth = pageIcon.templateData.accNav[projPI].panelWidth;
if (panelWidth == "Small"){
  panelW = 300;
  textW = 440;
} else if (panelWidth == "Medium"){
  panelW = 450;
  textW = 290;
} else if (panelWidth == "Large"){
  panelW = 600;
  textW = 150;
} else {
  panelW = 760;
  textW = 0;
}

if (pageIcon.templateData.accNav[projPI].narration != undefined){
  narration = pageIcon.templateData.accNav[projPI].narration;
  rootIcon.broadcast('showAudio');
}

]]></SCR>
		<SCR isFunc="1" name="fTogglePanes"><![CDATA[tempIndex = icon.parentNode.index();
tempY = panel._height - itemCount * 21;

for (i = 0; i < acc.customButtons.length; i++){
  if (i <= tempIndex){
    acc.customButtons[i]._y = acc.customButtons[0]._y + 21*i
  }
  if (i > tempIndex){
    acc.customButtons[i]._y = acc.customButtons[0]._y + tempY + 21*i-1;
  }
}
]]></SCR>
		<DIS initObject="{_alpha: subPageAccess == true ? 20 : 100}" h="475" w="panelW" tabIndex="-1" id="panel" name="panel" x="780 - panelW" y="20" type="ext" url="templatePath + 'common/whitePanel.swf'"><![CDATA[]]></DIS>
		<DIS scrolling="auto" id="textBlock" h="480" name="text" x="20" y="20" w="textW" type="text"><![CDATA[{pageIcon.templateData.accNav[projPI].text}]]></DIS>
		<SCR name="makeTabs"><![CDATA[if (icon.attributes.built != 'true'){
  icon.nextSibling.firstChild.duplicate(itemCount - 1);
  icon.attributes.built = 'true';
}
icon.nextSibling.firstChild.attributes.rs = 'btn1';
icon.nextSibling.lastChild.previousSibling.attributes.rs = 'initButton';]]></SCR>
		<INT id="acc" name="accInteraction" perpetual="0">
			<RES w="panelW" swf="templatePath + 'common/accordion.swf'" name="protoPane" type="button" x="panel._x" y="panel._y + icon.index() * 22" label="{pageIcon.templateData.accNav[projPI].nestedPage[icon.index()].name}" erase="1" exit="0">
				<SCR name="togglePanes"><![CDATA[fTogglePanes();
btn = icon.parentNode.getMovieClip();

if (subPageAccess == true){
  icon.nextSibling.attributes.textColour = STYLES.defaultColour;
} else {
  icon.nextSibling.attributes.textColour = '#333333';
}

gIcon = icon.parentNode.getChildByName('graphic');
if (pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].url != undefined){  
  if (pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].controls == 'Control Bar'){
    gIcon.attributes.controls = '1';
  }
  if (pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].tip != undefined){
    gIcon.attributes.toolTip = pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].tip;
    gIcon.firstChild.nodeValue = '{' + pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].tip + '}';
  }
} else {
  gIcon.removeNode();
  icon.parentNode.getChildByName('loadGraphic&Resize').removeNode();
  textH = 413 - (22*(itemCount - 1));
}
  ]]></SCR>
				<DIS id="graphic" name="graphic" x="420" y="desc._y + desc._height + 20" type="ext" url="{pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].url}"><![CDATA[]]></DIS>
				<INT name="loadGraphic&Resize" perpetual="0">
					<RES name="onLoad" type="event" eventName="onLoad" icon="graphic" erase="1" exit="1">
						<SCR name="resize&Position"><![CDATA[graphic.constrain(panelW - 40, 300 - (22*(itemCount - 1)));
textH = 393 - (22*(itemCount - 1)) - graphic._height;

if (pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].initObject != undefined){
  obj = expression(pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].initObject, engine);
  graphic.clip.init(obj);
}
]]></SCR>
					</RES>
				</INT>
				<DIS scrolling="auto" textColour="#333333" id="desc" name="description" x="panel._x + 20" y="btn._y + 40" w="panelW - 40" h="textH" type="text"><![CDATA[{pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].text}]]></DIS>
				<SCR name="position"><![CDATA[if (pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].url != undefined){  
  if (pageIcon.templateData.accNav[projPI].nestedPage[acc.getPageIndex()].align == 'Bottom'){
    graphic._y = desc._y;
    desc._y = graphic._y + graphic._height + 20;
  } else {
    graphic._y = desc._y + desc._height + 20;
  }
  graphic._x = panel._x + panel._width / 2 - graphic._width / 2;
}
]]></SCR>
			</RES>
			<RES name="initialise" type="event" eventName="onLoad" icon="initButton" erase="1" exit="0">
				<INT name="wait" perpetual="0">
					<RES name="initButton" type="timeLimit" secs="0.1" reset="0" erase="1" exit="0">
						<SCR name="activatePaneOne"><![CDATA[btn1.swfFile.onRelease();]]></SCR>
					</RES>
				</INT>
			</RES>
		</INT>
	</PG>
\ No newline at end of file
+	<PG title="Accordion Navigator" name="accNav">
		<SCR name="getPageID"><![CDATA[pageIcon = icon.parentNode.clip();

if (rootIcon.projMode == "dev"){ 
  // Page Wizard
  pageIcon.templateData = pageIcon.extXML.toObject();
  pageIcon.templateData = pageIcon.templateData.pageWizard[0];
} else {
  // Toolkits
  myXML = new XML(extXML.firstChild.childNodes[rootIcon.getPageIndex() - pgOffset]);
  pageIcon.templateData = myXML.toObject();

}
  rootIcon.setTitleText(templateData.learningObject[0].name);

// handle multiple page data definitions in a project 
if (rootIcon.projectPageIndex == undefined){  
   rootIcon.projectPageIndex = 0;
}
// check if this page has a definition for the current project index and default to 0 if not
if (pageIcon.templateData.accNav[rootIcon.projectPageIndex].name == undefined){
  projPI = 0;
} else {
  projPI = rootIcon.projectPageIndex; 
}  

itemCount = pageIcon.templateData.accNav[projPI].nestedPage.length);


panelWidth = pageIcon.templateData.accNav[projPI].panelWidth;
if (panelWidth == "Small"){
  panelW = 300;
  textW = 440;
} else if (panelWidth == "Medium"){
  panelW = 450;
  textW = 290;
} else if (panelWidth == "Large"){
  panelW = 600;
  textW = 150;
} else {
  panelW = 760;
  textW = 0;
}

if (pageIcon.templateData.accNav[projPI].narration != undefined){
  narration = pageIcon.templateData.accNav[projPI].narration;
  rootIcon.broadcast('showAudio');
}

]]></SCR>
		<SCR isFunc="1" name="fTogglePanes"><![CDATA[tempIndex = icon.parentNode.index();
tempY = panel._height - itemCount * 21;

for (i = 0; i < acc.customButtons.length; i++){
  if (i <= tempIndex){
    acc.customButtons[i]._y = acc.customButtons[0]._y + 21*i
  }
  if (i > tempIndex){
    acc.customButtons[i]._y = acc.customButtons[0]._y + tempY + 21*i-1;
  }
}
]]></SCR>
		<DIS initObject="{_alpha: subPageAccess == true ? 20 : 100}" h="475" w="panelW" tabIndex="-1" id="panel" name="panel" x="780 - panelW" y="20" type="ext" url="templatePath + 'common/whitePanel.swf'"><![CDATA[]]></DIS>
		<DIS scrolling="auto" id="textBlock" h="480" name="text" x="20" y="20" w="textW" type="text"><![CDATA[{pageIcon.templateData.accNav[projPI].text}]]></DIS>
		<SCR name="makeTabs"><![CDATA[if (icon.attributes.built != 'true'){
  icon.nextSibling.firstChild.duplicate(itemCount - 1);
  icon.attributes.built = 'true';
}
icon.nextSibling.firstChild.attributes.rs = 'btn1';
icon.nextSibling.lastChild.previousSibling.attributes.rs = 'initButton';]]></SCR>
		<INT id="acc" name="accInteraction" perpetual="0">
			<RES w="panelW" swf="templatePath + 'common/accordion.swf'" name="protoPane" type="button" x="panel._x" y="panel._y + icon.index() * 22" label="{pageIcon.templateData.accNav[projPI].nestedPage[icon.index()].name}" erase="1" exit="0">
				<SCR name="togglePanes"><![CDATA[fTogglePanes();
btn = icon.parentNode.getMovieClip();

if (subPageAccess == true){
  icon.nextSibling.attributes.textColour = STYLES.defaultColour;
} else {
  icon.nextSibling.attributes.textColour = '#333333';
}

gIcon = icon.parentNode.getChildByName('graphic');
if (pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].url != undefined){  
  if (pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].controls == 'Control Bar'){
    gIcon.attributes.controls = '1';
  }
  if (pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].tip != undefined){
    gIcon.attributes.toolTip = pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].tip;
    gIcon.firstChild.nodeValue = '{' + pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].tip + '}';
  }
} else {
  gIcon.removeNode();
  icon.parentNode.getChildByName('loadGraphic&Resize').removeNode();
  textH = 413 - (22*(itemCount - 1));
}
  ]]></SCR>
				<DIS id="graphic" name="graphic" x="420" y="desc._y + desc._height + 20" type="ext" url="{pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].url}"><![CDATA[]]></DIS>
				<INT name="loadGraphic&Resize" perpetual="0">
					<RES name="onLoad" type="event" eventName="onLoad" icon="graphic" erase="1" exit="1">
						<SCR name="resize&Position"><![CDATA[graphic.constrain(panelW - 40, 300 - (22*(itemCount - 1)));
textH = 393 - (22*(itemCount - 1)) - graphic._height;

if (pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.parentNode.parentNode.index()].initObject != undefined){
  obj = expression(pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.parentNode.parentNode.index()].initObject, engine);
  graphic.clip.init(obj);
}
]]></SCR>
					</RES>
				</INT>
				<DIS scrolling="auto" textColour="#333333" id="desc" name="description" x="panel._x + 20" y="btn._y + 40" w="panelW - 40" h="textH" type="text"><![CDATA[{pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].text}]]></DIS>
				<SCR name="position"><![CDATA[if (pageIcon.templateData.accNav[projPI].nestedPage[icon.parentNode.index()].url != undefined){  
  if (pageIcon.templateData.accNav[projPI].nestedPage[acc.getPageIndex()].align == 'Bottom'){
    graphic._y = desc._y;
    desc._y = graphic._y + graphic._height + 20;
  } else {
    graphic._y = desc._y + desc._height + 20;
  }
  graphic._x = panel._x + panel._width / 2 - graphic._width / 2;
}
]]></SCR>
			</RES>
			<RES name="initialise" type="event" eventName="onLoad" icon="initButton" erase="1" exit="0">
				<INT name="wait" perpetual="0">
					<RES name="initButton" type="timeLimit" secs="0.1" reset="0" erase="1" exit="0">
						<SCR name="activatePaneOne"><![CDATA[btn1.swfFile.onRelease();]]></SCR>
					</RES>
				</INT>
			</RES>
		</INT>
	</PG>
\ No newline at end of file
diff --git a/modules/xerte/parent_templates/Nottingham/models/columnPage.rlm b/modules/xerte/parent_templates/Nottingham/models/columnPage.rlm
index 9a62a9b4c7..ae20780887 100644
--- a/modules/xerte/parent_templates/Nottingham/models/columnPage.rlm
+++ b/modules/xerte/parent_templates/Nottingham/models/columnPage.rlm
@@ -1 +1 @@
-	<PG title="Column Page" name="columnPage">
		<SCR name="getPageID"><![CDATA[pageIcon = icon.parentNode.clip();

if (rootIcon.projMode == "dev"){ 
  // Page Wizard
  pageIcon.templateData = pageIcon.extXML.toObject();
  pageIcon.templateData = pageIcon.templateData.pageWizard[0];
} else {
  // Toolkits
  myXML = new XML(extXML.firstChild.childNodes[rootIcon.getPageIndex() - pgOffset]);
  pageIcon.templateData = myXML.toObject();

}

rootIcon.setTitleText(templateData.learningObject[0].name);

// handle multiple page data definitions in a project 
if (rootIcon.projectPageIndex == undefined){  
   rootIcon.projectPageIndex = 0;
}

// check if this page has a definition for the current project index and default to 0 if not
if (pageIcon.templateData.columnPage[rootIcon.projectPageIndex].name == undefined){
  projPI = 0;
} else {
  projPI = rootIcon.projectPageIndex; 
}  

colCount = pageIcon.templateData.columnPage[projPI].nestedPage.length;
colWidth = 780 / colCount;

if (pageIcon.templateData.columnPage[projPI].narration != undefined){
  narration = pageIcon.templateData.columnPage[projPI].narration;
  rootIcon.broadcast('showAudio');
}

]]></SCR>
		<SCR name="header"><![CDATA[if (pageIcon.templateData.columnPage[projPI].header == undefined && icon.built != 'true'){
  icon.nextSibling.removeNode();
  icon.built = 'true';
}]]></SCR>
		<DIS id="header" name="header" x="20" y="20" w="760" h="10" type="text"><![CDATA[{pageIcon.templateData.columnPage[projPI].header}]]></DIS>
		<SCR name="getHeaderHeight"><![CDATA[if (pageIcon.templateData.columnPage[projPI].header == undefined){
  headerHeight = 0;
} else {
  headerHeight = header._height + 20;
}

if (icon.built != "true"){
  icon.nextSibling.firstChild.duplicate(colCount - 1);
  icon.built = "true";
}
]]></SCR>
		<DEC id="columns" name="columns" repeat="all" branch="sequence" pause="0" erase="0" eraseOnExit="0">
			<PG name="protoColumn">
				<SCR name="deleteLoader"><![CDATA[col = icon.parentNode.clip();
textH = 480 - headerHeight;

if (pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].url != undefined){  

  if (pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].controls == 'Control Bar'){
    icon.nextSibling.attributes.controls = '1';
  }
  if (pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].tip != undefined){
    icon.nextSibling.attributes.toolTip = pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].tip;
    icon.nextSibling.firstChild.nodeValue = '{"' + pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].tip + '"}';
  }
  
} else { //no graphic

  icon.parentNode.getChildByName('graphic').removeNode();
  icon.parentNode.getChildByName('loader').removeNode();
}



]]></SCR>
				<DIS id="graphic" name="graphic" x="20 + (colWidth * icon.parentNode.index())" y="colText._y + colText._height + 20" type="ext" url="{pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].url}"><![CDATA[]]></DIS>
				<INT name="loader" perpetual="0">
					<RES name="onLoad" type="event" eventName="onLoad" icon="graphic" erase="1" exit="1">
						<SCR name="resize"><![CDATA[graphic.constrain(colWidth - 20, 300);
textH = 480 - headerHeight - graphic._height - 20;

if (pageIcon.templateData.columnPage[projPI].nestedPage[columns.getPageIndex()].initObject != undefined){
  obj = expression(pageIcon.templateData.accNav[0].nestedPage[icon.parentNode.index()].initObject, engine);
  graphic.clip.init(obj);
}

]]></SCR>
					</RES>
				</INT>
				<DIS id="colText" scrolling="auto" name="text" x="20 + (colWidth * icon.parentNode.index())" y="20 + headerHeight" w="colWidth - 20" h="textH" type="text"><![CDATA[{pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].text}]]></DIS>
				<SCR name="position"><![CDATA[colText._y = 20 + headerHeight;

if (pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].url != undefined){  
  
  if (pageIcon.templateData.columnPage[projPI].nestedPage[columns.getPageIndex()].align == 'Top'){
    colText._y = 20 + headerHeight;
    graphic._y = 20 + headerHeight + textH + 20;
  
  } else {
  
    colText._y = 20 + graphic._height + 20 + headerHeight;
    graphic._y = 20 + headerHeight; 
  }

} else { //no graphic

}]]></SCR>
			</PG>
		</DEC>
	</PG>
\ No newline at end of file
+	<PG title="Column Page" name="columnPage">
		<SCR name="getPageID"><![CDATA[pageIcon = icon.parentNode.clip();

if (rootIcon.projMode == "dev"){ 
  // Page Wizard
  pageIcon.templateData = pageIcon.extXML.toObject();
  pageIcon.templateData = pageIcon.templateData.pageWizard[0];
} else {
  // Toolkits
  myXML = new XML(extXML.firstChild.childNodes[rootIcon.getPageIndex() - pgOffset]);
  pageIcon.templateData = myXML.toObject();

}

rootIcon.setTitleText(templateData.learningObject[0].name);

// handle multiple page data definitions in a project 
if (rootIcon.projectPageIndex == undefined){  
   rootIcon.projectPageIndex = 0;
}

// check if this page has a definition for the current project index and default to 0 if not
if (pageIcon.templateData.columnPage[rootIcon.projectPageIndex].name == undefined){
  projPI = 0;
} else {
  projPI = rootIcon.projectPageIndex; 
}  

colCount = pageIcon.templateData.columnPage[projPI].nestedPage.length;
colWidth = 780 / colCount;

if (pageIcon.templateData.columnPage[projPI].narration != undefined){
  narration = pageIcon.templateData.columnPage[projPI].narration;
  rootIcon.broadcast('showAudio');
}

]]></SCR>
		<SCR name="header"><![CDATA[if (pageIcon.templateData.columnPage[projPI].header == undefined && icon.built != 'true'){
  icon.nextSibling.removeNode();
  icon.built = 'true';
}]]></SCR>
		<DIS id="header" name="header" x="20" y="20" w="760" h="10" type="text"><![CDATA[{pageIcon.templateData.columnPage[projPI].header}]]></DIS>
		<SCR name="getHeaderHeight"><![CDATA[if (pageIcon.templateData.columnPage[projPI].header == undefined){
  headerHeight = 0;
} else {
  headerHeight = header._height + 20;
}

if (icon.built != "true"){
  icon.nextSibling.firstChild.duplicate(colCount - 1);
  icon.built = "true";
}
]]></SCR>
		<DEC id="columns" name="columns" repeat="all" branch="sequence" pause="0" erase="0" eraseOnExit="0">
			<PG name="protoColumn">
				<SCR name="deleteLoader"><![CDATA[col = icon.parentNode.clip();
textH = 480 - headerHeight;

if (pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].url != undefined){  

  if (pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].controls == 'Control Bar'){
    icon.nextSibling.attributes.controls = '1';
  }
  if (pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].tip != undefined){
    icon.nextSibling.attributes.toolTip = pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].tip;
    icon.nextSibling.firstChild.nodeValue = '{"' + pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].tip + '"}';
  }
  
} else { //no graphic

  icon.parentNode.getChildByName('graphic').removeNode();
  icon.parentNode.getChildByName('loader').removeNode();
}



]]></SCR>
				<DIS id="graphic" name="graphic" x="20 + (colWidth * icon.parentNode.index())" y="colText._y + colText._height + 20" type="ext" url="{pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].url}"><![CDATA[]]></DIS>
				<INT name="loader" perpetual="0">
					<RES name="onLoad" type="event" eventName="onLoad" icon="graphic" erase="1" exit="1">
						<SCR name="resize"><![CDATA[graphic.constrain(colWidth - 20, 300);
textH = 480 - headerHeight - graphic._height - 20;

if (pageIcon.templateData.columnPage[projPI].nestedPage[columns.getPageIndex()].initObject != undefined){
  obj = expression(pageIcon.templateData.accNav[0].nestedPage[icon.parentNode.parentNode.parentNode.index()].initObject, engine);
  graphic.clip.init(obj);
}

]]></SCR>
					</RES>
				</INT>
				<DIS id="colText" scrolling="auto" name="text" x="20 + (colWidth * icon.parentNode.index())" y="20 + headerHeight" w="colWidth - 20" h="textH" type="text"><![CDATA[{pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].text}]]></DIS>
				<SCR name="position"><![CDATA[colText._y = 20 + headerHeight;

if (pageIcon.templateData.columnPage[projPI].nestedPage[icon.parentNode.index()].url != undefined){  
  
  if (pageIcon.templateData.columnPage[projPI].nestedPage[columns.getPageIndex()].align == 'Top'){
    colText._y = 20 + headerHeight;
    graphic._y = 20 + headerHeight + textH + 20;
  
  } else {
  
    colText._y = 20 + graphic._height + 20 + headerHeight;
    graphic._y = 20 + headerHeight; 
  }

} else { //no graphic

}]]></SCR>
			</PG>
		</DEC>
	</PG>
\ No newline at end of file
diff --git a/modules/xerte/parent_templates/Nottingham/models/slideshow.rlm b/modules/xerte/parent_templates/Nottingham/models/slideshow.rlm
index 01074303ec..8210adc5d8 100644
--- a/modules/xerte/parent_templates/Nottingham/models/slideshow.rlm
+++ b/modules/xerte/parent_templates/Nottingham/models/slideshow.rlm
@@ -1 +1 @@
-	<PG title="Slideshow" name="slideshow">
		<SCR name="getPageID"><![CDATA[pageIcon = icon.parentNode.clip();

if (rootIcon.projMode == "dev"){ 
  // Page Wizard
  pageIcon.templateData = pageIcon.extXML.toObject();
  pageIcon.templateData = pageIcon.templateData.pageWizard[0];
} else {
  // Toolkits
  myXML = new XML(extXML.firstChild.childNodes[rootIcon.getPageIndex() - pgOffset]);
  pageIcon.templateData = myXML.toObject();

}
  rootIcon.setTitleText(templateData.learningObject[0].name);
  
// handle multiple page data definitions in a project 
if (rootIcon.projectPageIndex == undefined){  
   rootIcon.projectPageIndex = 0;
}
// check if this page has a definition for the current project index and default to 0 if not
if (pageIcon.templateData.slideshow[rootIcon.projectPageIndex].name == undefined){
  projPI = 0;
} else {
  projPI = rootIcon.projectPageIndex; 
}  


// set up text strings
if (pageIcon.templateData.slideshow[projPI].nextBtnTip != undefined){
  nextBtnTip = pageIcon.templateData.slideshow[projPI].nextBtnTip;
} else {
  nextBtnTip = "Next Slide";
}
if (pageIcon.templateData.slideshow[projPI].priorBtnTip != undefined){
  priorBtnTip = pageIcon.templateData.slideshow[projPI].priorBtnTip;
} else {
  priorBtnTip = "Previous Slide";
}

if (pageIcon.templateData.slideshow[projPI].slideCount != undefined){
  slideCount = pageIcon.templateData.slideshow[projPI].slideCount;
} else {
  slideCount = "Slide {i} of {n}";
}

itemCount = pageIcon.templateData.slideshow[projPI].nestedPage.length);

panelWidth = pageIcon.templateData.slideshow[projPI].panelWidth;
if (panelWidth == "Small"){
  panelW = 300;
  textW = 440;
} else if (panelWidth == "Medium"){
  panelW = 450;
  textW = 290;
} else if (panelWidth == "Large"){
  panelW = 600;
  textW = 150;
} else {
  panelW = 760;
  textW = 0;
}

if (pageIcon.templateData.slideshow[projPI].narration != undefined){
  narration = pageIcon.templateData.slideshow[projPI].narration;
  rootIcon.broadcast('showAudio');
}


]]></SCR>
		<DIS initObject="{_alpha: subPageAccess == true ? 20 : 100}" h="474" w="panelW" tabIndex="-1" id="panel" name="panel" x="780 - panelW" 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="calculate"><![CDATA[//ok to move on



]]></SCR>
			</RES>
		</INT>
		<DIS scrolling="auto" id="textBlock" h="480" name="text" x="20" y="20" w="textW" type="text"><![CDATA[{pageIcon.templateData.slideshow[projPI].text}]]></DIS>
		<SCR name="makePages"><![CDATA[if (icon.attributes.built != 'true'){
  icon.nextSibling.childNodes[1].duplicate(itemCount - 1);
  icon.attributes.built = 'true';
}
icon.nextSibling.firstChild.attributes.rs = 'initButton';]]></SCR>
		<FW id="slideFW" name="slideFW">
			<FW_ENT name="controls">
				<SCR name="subPageAccess"><![CDATA[if (subPageAccess == true){
  icon.nextSibling.attributes.textColour = STYLES.defaultColour;
} else {
  icon.nextSibling.attributes.textColour = '#333333';
}]]></SCR>
				<DIS textColour="#333333" id="orientation" name="orientation" x="panel._x + 20" y="panel._y + panel._height - 25" w="panel._width - 60" h="10" type="text"><![CDATA[]]></DIS>
				<SCR name="[Untitled]"><![CDATA[slideLabel = slideCount;
slideLabel = replace(slideLabel, "{i}", slideFW.currentPage + 1);
slideLabel = replace(slideLabel, "{n}", slideFW.pageCount);
orientation.setText('<b>' + slideLabel + '</b>');  
]]></SCR>
				<INT id="tabs" name="tabInteraction" perpetual="0">
					<RES toolTip="{priorBtnTip}" swf="templatePath + 'common/leftButton.swf'" name="back" type="button" x="725" y="470" label="previous slide" erase="1" exit="0">
						<SCR name="[Untitled]"><![CDATA[slideFW.prevPage();
]]></SCR>
					</RES>
					<RES toolTip="{nextBtnTip}" swf="templatePath + 'common/rightButton.swf'" name="next" type="button" x="750" y="470" label="next" erase="1" exit="0">
						<SCR name="[Untitled]"><![CDATA[slideFW.nextPage();]]></SCR>
					</RES>
					<RES name="[Untitled]" type="event" eventName="onOpenPage" icon="slideFW" erase="1" exit="0">
						<SCR name="[Untitled]"><![CDATA[slideLabel = slideCount;
slideLabel = replace(slideLabel, "{i}", slideFW.currentPage + 1);
slideLabel = replace(slideLabel, "{n}", slideFW.pageCount);
orientation.setText('<b>' + slideLabel + '</b>');  ]]></SCR>
					</RES>
				</INT>
			</FW_ENT>
			<PG name="protoPage">
				<SCR name="setSize"><![CDATA[if (pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].url != undefined){
  
  gIcon = icon.parentNode.getChildByName('graphic'); 
  
  if (pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].controls == 'Control Bar'){
    gIcon.attributes.controls = '1';  
  }
  if (pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].tip != undefined){
    gIcon.attributes.toolTip = pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].tip;
    gIcon.firstChild.nodeValue = '{' + pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].tip + '}';
  }
  
} else { //no graphic

  icon.parentNode.getChildByName('protoGraphic').removeNode();
  icon.parentNode.getChildByName('loadGraphic&Resize').removeNode();
  textH = 413;
}


if (subPageAccess == true){
  icon.nextSibling.attributes.textColour = STYLES.defaultColour;
} else {
  icon.nextSibling.attributes.textColour = '#333333';
}

]]></SCR>
				<DIS toolTip="{pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].tip}" id="graphic" name="protoGraphic" x="0" y="40" type="ext" url="{pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].url}"><![CDATA[]]></DIS>
				<INT name="loadGraphic&Resize" perpetual="0">
					<RES name="onLoad" type="event" eventName="onLoad" icon="graphic" erase="1" exit="1">
						<SCR name="resize&Position"><![CDATA[graphic.constrain(panelW - 40, 300);
textH = 393 - graphic._height;

if (slideshow[projPI].nestedPage[icon.parentNode.index() - 1].initObject != undefined){
  obj = expression(slideshow[projPI].nestedPage[icon.parentNode.index() - 1].initObject, engine);
  graphic.clip.init(obj);
}


]]></SCR>
					</RES>
				</INT>
				<DIS scrolling="auto" textColour="#333333" id="desc" name="protoText" x="panel._x + 20" y="40" w="panelW - 40" h="textH" type="text"><![CDATA[{'<b>' + pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].name + '</b><br>' + pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].text}]]></DIS>
				<SCR name="pos"><![CDATA[if (pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].url != undefined){  
  if (pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].align == 'Bottom'){
    desc._y = 40 + graphic._height + 20;
    graphic._y = 40;
  } else {
    graphic._y = desc._y + desc._height + 20;
  }
  graphic._x = panel._x + panel._width / 2 - graphic._width / 2;
}
]]></SCR>
			</PG>
		</FW>
	</PG>
\ No newline at end of file
+	<PG title="Slideshow" name="slideshow">
		<SCR name="getPageID"><![CDATA[pageIcon = icon.parentNode.clip();

if (rootIcon.projMode == "dev"){ 
  // Page Wizard
  pageIcon.templateData = pageIcon.extXML.toObject();
  pageIcon.templateData = pageIcon.templateData.pageWizard[0];
} else {
  // Toolkits
  myXML = new XML(extXML.firstChild.childNodes[rootIcon.getPageIndex() - pgOffset]);
  pageIcon.templateData = myXML.toObject();

}
  rootIcon.setTitleText(templateData.learningObject[0].name);
  
// handle multiple page data definitions in a project 
if (rootIcon.projectPageIndex == undefined){  
   rootIcon.projectPageIndex = 0;
}
// check if this page has a definition for the current project index and default to 0 if not
if (pageIcon.templateData.slideshow[rootIcon.projectPageIndex].name == undefined){
  projPI = 0;
} else {
  projPI = rootIcon.projectPageIndex; 
}  


// set up text strings
if (pageIcon.templateData.slideshow[projPI].nextBtnTip != undefined){
  nextBtnTip = pageIcon.templateData.slideshow[projPI].nextBtnTip;
} else {
  nextBtnTip = "Next Slide";
}
if (pageIcon.templateData.slideshow[projPI].priorBtnTip != undefined){
  priorBtnTip = pageIcon.templateData.slideshow[projPI].priorBtnTip;
} else {
  priorBtnTip = "Previous Slide";
}

if (pageIcon.templateData.slideshow[projPI].slideCount != undefined){
  slideCount = pageIcon.templateData.slideshow[projPI].slideCount;
} else {
  slideCount = "Slide {i} of {n}";
}

itemCount = pageIcon.templateData.slideshow[projPI].nestedPage.length);

panelWidth = pageIcon.templateData.slideshow[projPI].panelWidth;
if (panelWidth == "Small"){
  panelW = 300;
  textW = 440;
} else if (panelWidth == "Medium"){
  panelW = 450;
  textW = 290;
} else if (panelWidth == "Large"){
  panelW = 600;
  textW = 150;
} else {
  panelW = 760;
  textW = 0;
}

if (pageIcon.templateData.slideshow[projPI].narration != undefined){
  narration = pageIcon.templateData.slideshow[projPI].narration;
  rootIcon.broadcast('showAudio');
}


]]></SCR>
		<DIS initObject="{_alpha: subPageAccess == true ? 20 : 100}" h="474" w="panelW" tabIndex="-1" id="panel" name="panel" x="780 - panelW" 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="calculate"><![CDATA[//ok to move on



]]></SCR>
			</RES>
		</INT>
		<DIS scrolling="auto" id="textBlock" h="480" name="text" x="20" y="20" w="textW" type="text"><![CDATA[{pageIcon.templateData.slideshow[projPI].text}]]></DIS>
		<SCR name="makePages"><![CDATA[if (icon.attributes.built != 'true'){
  icon.nextSibling.childNodes[1].duplicate(itemCount - 1);
  icon.attributes.built = 'true';
}
icon.nextSibling.firstChild.attributes.rs = 'initButton';]]></SCR>
		<FW id="slideFW" name="slideFW">
			<FW_ENT name="controls">
				<SCR name="subPageAccess"><![CDATA[if (subPageAccess == true){
  icon.nextSibling.attributes.textColour = STYLES.defaultColour;
} else {
  icon.nextSibling.attributes.textColour = '#333333';
}]]></SCR>
				<DIS textColour="#333333" id="orientation" name="orientation" x="panel._x + 20" y="panel._y + panel._height - 25" w="panel._width - 60" h="10" type="text"><![CDATA[]]></DIS>
				<SCR name="[Untitled]"><![CDATA[slideLabel = slideCount;
slideLabel = replace(slideLabel, "{i}", slideFW.currentPage + 1);
slideLabel = replace(slideLabel, "{n}", slideFW.pageCount);
orientation.setText('<b>' + slideLabel + '</b>');  
]]></SCR>
				<INT id="tabs" name="tabInteraction" perpetual="0">
					<RES toolTip="{priorBtnTip}" swf="templatePath + 'common/leftButton.swf'" name="back" type="button" x="725" y="470" label="previous slide" erase="1" exit="0">
						<SCR name="[Untitled]"><![CDATA[slideFW.prevPage();
]]></SCR>
					</RES>
					<RES toolTip="{nextBtnTip}" swf="templatePath + 'common/rightButton.swf'" name="next" type="button" x="750" y="470" label="next" erase="1" exit="0">
						<SCR name="[Untitled]"><![CDATA[slideFW.nextPage();]]></SCR>
					</RES>
					<RES name="[Untitled]" type="event" eventName="onOpenPage" icon="slideFW" erase="1" exit="0">
						<SCR name="[Untitled]"><![CDATA[slideLabel = slideCount;
slideLabel = replace(slideLabel, "{i}", slideFW.currentPage + 1);
slideLabel = replace(slideLabel, "{n}", slideFW.pageCount);
orientation.setText('<b>' + slideLabel + '</b>');  ]]></SCR>
					</RES>
				</INT>
			</FW_ENT>
			<PG name="protoPage">
				<SCR name="setSize"><![CDATA[if (pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].url != undefined){

  gIcon = icon.parentNode.getChildByName('graphic'); 
  
  if (pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].controls == 'Control Bar'){
    gIcon.attributes.controls = '1';  
  }
  if (pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].tip != undefined){
    gIcon.attributes.toolTip = pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].tip;
    gIcon.firstChild.nodeValue = '{' + pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].tip + '}';
  }
  
} else { //no graphic

  icon.parentNode.getChildByName('protoGraphic').removeNode();
  icon.parentNode.getChildByName('loadGraphic&Resize').removeNode();
  textH = 413;
}


if (subPageAccess == true){
  icon.nextSibling.attributes.textColour = STYLES.defaultColour;
} else {
  icon.nextSibling.attributes.textColour = '#333333';
}

]]></SCR>
				<DIS toolTip="{pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].tip}" id="graphic" name="protoGraphic" x="0" y="40" type="ext" url="{pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].url}"><![CDATA[]]></DIS>
				<INT name="loadGraphic&Resize" perpetual="0">
					<RES name="onLoad" type="event" eventName="onLoad" icon="graphic" erase="1" exit="1">
						<SCR name="resize&Position"><![CDATA[graphic.constrain(panelW - 40, 300);
textH = 393 - graphic._height;

if (pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.parentNode.parentNode.index() - 1].initObject != undefined){
  obj = expression(pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.parentNode.parentNode.index() - 1].initObject, engine);
  graphic.clip.init(obj);
}


]]></SCR>
					</RES>
				</INT>
				<DIS scrolling="auto" textColour="#333333" id="desc" name="protoText" x="panel._x + 20" y="40" w="panelW - 40" h="textH" type="text"><![CDATA[{'<b>' + pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].name + '</b><br>' + pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].text}]]></DIS>
				<SCR name="pos"><![CDATA[if (pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].url != undefined){  
  if (pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].align == 'Bottom'){
    desc._y = 40 + graphic._height + 20;
    graphic._y = 40;
  } else {
    graphic._y = desc._y + desc._height + 20;
  }
  graphic._x = panel._x + panel._width / 2 - graphic._width / 2;
}
]]></SCR>
			</PG>
		</FW>
	</PG>
\ No newline at end of file