From 6ffd8f9af9edf6cfc1362e30901448a8e923f83a Mon Sep 17 00:00:00 2001 From: Fay Cross Date: Wed, 21 Mar 2012 12:01:23 +0000 Subject: [PATCH] Bug fix - text / image height problem on subpages git-svn-id: https://xerteonlinetoolkits.googlecode.com/svn/trunk@286 912cdd6b-5c7d-d5a7-a2ba-d0f0cdb91641 --- .../xerte/parent_templates/Nottingham/models/tabNavExtra.rlm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/xerte/parent_templates/Nottingham/models/tabNavExtra.rlm b/modules/xerte/parent_templates/Nottingham/models/tabNavExtra.rlm index 1b2aa1e106..65c42edba0 100644 --- a/modules/xerte/parent_templates/Nottingham/models/tabNavExtra.rlm +++ b/modules/xerte/parent_templates/Nottingham/models/tabNavExtra.rlm @@ -1 +1 @@ - scaleH) { scale = scaleH; } graphic._xscale = scale; graphic._yscale = scale; } if (graphic._width < maxW) { xDif = (maxW - graphic._width) / 2; graphic._x = panel._x + xDif + 10; } else { graphic._x = panel._x + 10; } panelTxt._y = graphic._y + graphic._height + 10;]]> " + pageInfo.topic[icon.parentNode.index()].name + ""); framework.firstChild.childNodes[icon.parentNode.index()].clip().enabled = false; if (rememberTab == false) { currentTab = 0; currentPage = 0; } } mainFW.gotoPage(icon.parentNode.index()); topicHighlight.clear(); topicHighlight.beginFill(0xFFFFFF, 60);410, 5); topicHighlight.drawRect(framework.firstChild.childNodes[mainFW.currentPage].clip()._x-5, framework.firstChild.childNodes[mainFW.currentPage].clip()._y-2, framework.firstChild.childNodes[mainFW.currentPage].clip()._width+10, framework.firstChild.childNodes[mainFW.currentPage].clip()._height+4, 5); topicHighlight.endFill();]]> " + pageInfo.topic[mainFW.currentPage].name + ""); framework.firstChild.childNodes[mainFW.currentPage].clip().enabled = false; topicHighlight.clear(); topicHighlight.beginFill(0xFFFFFF, 60); topicHighlight.drawRect(framework.firstChild.childNodes[mainFW.currentPage].clip()._x-5, framework.firstChild.childNodes[mainFW.currentPage].clip()._y-2, framework.firstChild.childNodes[mainFW.currentPage].clip()._width+10, framework.firstChild.childNodes[mainFW.currentPage].clip()._height+4, 5); topicHighlight.endFill();]]> " + pageInfo.topic[icon.parentNode.parentNode.parentNode.index()-1].nestedTab[icon.parentNode.index()].nestedPage[icon.index()].name + ""}]]> " + pageInfo.topic[currentTopic].nestedTab[currentTab].nestedPage[currentPage].name + ""); currentPage = icon.parentNode.index(); icon.findParentByName('protoTab').childNodes[currentPage].clip().setText("" + pageInfo.topic[currentTopic].nestedTab[currentTab].nestedPage[currentPage].name + ""); icon.findParentByName('protoTab').childNodes[currentPage].clip().enabled = false; panelTxt.setText(pageInfo.topic[currentTopic].nestedTab[currentTab].nestedPage[currentPage].text); newImg = pageInfo.topic[currentTopic].nestedTab[currentTab].nestedPage[currentPage].url; if (oldImg != newImg) { graphic.loadImage(expression(newImg,this)); } }]]> 1) { icon.findParentByName('protoTab').childNodes[currentPage].clip().setText("" + pageInfo.topic[currentTopic].nestedTab[currentTab].nestedPage[currentPage].name + ""); icon.findParentByName('protoTab').childNodes[currentPage].clip().enabled = false; // highlight nested page title } if (pageInfo.topic[currentTopic].nestedTab[currentTab].nestedPage[currentPage].url == undefined) { icon.parentNode.getChildByName('graphicLoader').attributes.perpetual = 1; } else if (pageInfo.topic[currentTopic].nestedTab[currentTab].nestedPage[currentPage].tip != undefined) { icon.nextSibling.attributes.toolTip = pageInfo.topic[currentTopic].nestedTab[currentTab].nestedPage[currentPage].tip; }]]> \ No newline at end of file + " + pageInfo.topic[icon.parentNode.index()].name + ""); framework.firstChild.childNodes[icon.parentNode.index()].clip().enabled = false; if (rememberTab != "true") { currentTab = 0; currentPage = 0; } } mainFW.gotoPage(icon.parentNode.index()); topicHighlight.clear(); topicHighlight.beginFill(0xFFFFFF, 60);410, 5); topicHighlight.drawRect(framework.firstChild.childNodes[mainFW.currentPage].clip()._x-5, framework.firstChild.childNodes[mainFW.currentPage].clip()._y-2, framework.firstChild.childNodes[mainFW.currentPage].clip()._width+10, framework.firstChild.childNodes[mainFW.currentPage].clip()._height+4, 5); topicHighlight.endFill();]]> " + pageInfo.topic[mainFW.currentPage].name + ""); framework.firstChild.childNodes[mainFW.currentPage].clip().enabled = false; topicHighlight.clear(); topicHighlight.beginFill(0xFFFFFF, 60); topicHighlight.drawRect(framework.firstChild.childNodes[mainFW.currentPage].clip()._x-5, framework.firstChild.childNodes[mainFW.currentPage].clip()._y-2, framework.firstChild.childNodes[mainFW.currentPage].clip()._width+10, framework.firstChild.childNodes[mainFW.currentPage].clip()._height+4, 5); topicHighlight.endFill();]]> " + pageInfo.topic[icon.parentNode.parentNode.parentNode.index()-1].nestedTab[icon.parentNode.index()].nestedPage[icon.index()].name + ""}]]> " + pageInfo.topic[currentTopic].nestedTab[currentTab].nestedPage[currentPage].name + ""); currentPage = icon.parentNode.index(); icon.findParentByName('protoTab').childNodes[currentPage].clip().setText("" + pageInfo.topic[currentTopic].nestedTab[currentTab].nestedPage[currentPage].name + ""); icon.findParentByName('protoTab').childNodes[currentPage].clip().enabled = false; tabFW.gotoPage(currentPage); }]]> 1) { icon.findParentByName('protoTab').childNodes[currentPage].clip().setText("" + pageInfo.topic[currentTopic].nestedTab[currentTab].nestedPage[currentPage].name + ""); icon.findParentByName('protoTab').childNodes[currentPage].clip().enabled = false; // highlight nested page title }]]> scaleH) { scale = scaleH; } graphic._xscale = scale; graphic._yscale = scale; } if (graphic._width < maxW) { xDif = (maxW - graphic._width) / 2; graphic._x = panel._x + xDif + 10; } else { graphic._x = panel._x + 10; }]]> \ No newline at end of file