From 3471b956c10d9105b1a0a0afcb009af1bcb9d645 Mon Sep 17 00:00:00 2001 From: Julian Tenney Date: Tue, 26 Jun 2012 09:49:35 +0000 Subject: [PATCH] git-svn-id: https://xerteonlinetoolkits.googlecode.com/svn/trunk@369 912cdd6b-5c7d-d5a7-a2ba-d0f0cdb91641 --- .../Nottingham/models/accNav.rlm | 2 +- .../Nottingham/models/buttonNav.rlm | 204 +----------------- .../Nottingham/models/columnPage.rlm | 97 +-------- .../Nottingham/models/imageViewer.rlm | 2 +- .../Nottingham/models/morphImages.rlm | 2 +- .../Nottingham/models/slideshow.rlm | 2 +- .../Nottingham/models/tabNav.rlm | 2 +- 7 files changed, 7 insertions(+), 304 deletions(-) diff --git a/modules/xerte/parent_templates/Nottingham/models/accNav.rlm b/modules/xerte/parent_templates/Nottingham/models/accNav.rlm index 66fefddc23..200ae868a2 100644 --- a/modules/xerte/parent_templates/Nottingham/models/accNav.rlm +++ b/modules/xerte/parent_templates/Nottingham/models/accNav.rlm @@ -1 +1 @@ - tempIndex){ acc.customButtons[i]._y = acc.customButtons[0]._y + tempY + 21*i-1; } }]]> \ No newline at end of file + tempIndex){ acc.customButtons[i]._y = acc.customButtons[0]._y + tempY + 21*i-1; } }]]> \ No newline at end of file diff --git a/modules/xerte/parent_templates/Nottingham/models/buttonNav.rlm b/modules/xerte/parent_templates/Nottingham/models/buttonNav.rlm index d186524bf9..c50d1d0e6b 100644 --- a/modules/xerte/parent_templates/Nottingham/models/buttonNav.rlm +++ b/modules/xerte/parent_templates/Nottingham/models/buttonNav.rlm @@ -1,203 +1 @@ - - - - - 3){ - icon.nextSibling.childNodes[1].duplicate(itemCount - 3); - } - - icon.attributes.built = 'true'; -} -icon.nextSibling.firstChild.attributes.rs = 'btn1'; -icon.nextSibling.lastChild.previousSibling.attributes.rs = 'initButton';]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 3){ icon.nextSibling.childNodes[1].duplicate(itemCount - 3); } icon.attributes.built = 'true'; } icon.nextSibling.firstChild.attributes.rs = 'btn1'; icon.nextSibling.lastChild.previousSibling.attributes.rs = 'initButton';]]> \ 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 3e9da00131..effef18be8 100644 --- a/modules/xerte/parent_templates/Nottingham/models/columnPage.rlm +++ b/modules/xerte/parent_templates/Nottingham/models/columnPage.rlm @@ -1,96 +1 @@ - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/modules/xerte/parent_templates/Nottingham/models/imageViewer.rlm b/modules/xerte/parent_templates/Nottingham/models/imageViewer.rlm index 754a5cd21e..9db8962cbe 100644 --- a/modules/xerte/parent_templates/Nottingham/models/imageViewer.rlm +++ b/modules/xerte/parent_templates/Nottingham/models/imageViewer.rlm @@ -1 +1 @@ - maskW*1.25){ graphic._xscale *= 0.8; graphic._yscale *= 0.8; graphic._x += (graphic._width*1.25 - graphic._width) / 2; graphic._y += (graphic._height*1.25 - graphic._height) / 2; if (graphic._x > maskX){ graphic._x = maskX; } if (graphic._y > maskY){ graphic._y = maskY; } if (graphic._x + graphic._width < maskX + maskW){ graphic._x = maskX + maskW - graphic._width; } if (graphic._y + graphic._height < maskY + maskH){ graphic._y = maskY + maskH - graphic._height; } }]]> maskW * 1.25){ if (graphic._width > maskW * 1.25){ graphic._xscale *= 0.8; graphic._yscale *= 0.8; graphic._x += (graphic._width*1.25 - graphic._width) / 2; graphic._y += (graphic._height*1.25 - graphic._height) / 2; if (graphic._x > maskX){ graphic._x = maskX; } if (graphic._y > maskY){ graphic._y = maskY; } if (graphic._x + graphic._width < maskX + maskW){ graphic._x = maskX + maskW - graphic._width; } if (graphic._y + graphic._height < maskY + maskH){ graphic._y = maskY + maskH - graphic._height; } } } else if (mode == 'select'){ selecting = true; mouseX = mask._xmouse; mouseY = mask._ymouse; } ]]> 50 && Math.abs(mouseY - mask._ymouse) > 50){ scaleFactor = maskW / Math.abs(mask._xmouse - mouseX); graphic._x = maskX - (mouseX - graphic._x) * scaleFactor; graphic._y = maskY - (mouseY - graphic._y) * scaleFactor; //scale the image by maskW / selectW graphic._xscale *= scaleFactor; graphic._yscale *= scaleFactor; } } ]]> 50 && Math.abs(mouseY - mask._ymouse) > 50){ scaleFactor = maskW / Math.abs(mask._xmouse - mouseX); graphic._x = maskX - (mouseX - graphic._x) * scaleFactor; graphic._y = maskY - (mouseY - graphic._y) * scaleFactor; //scale the image by maskW / selectW graphic._xscale *= scaleFactor; graphic._yscale *= scaleFactor; } }]]> \ No newline at end of file + maskW * 1.25){ if (graphic._width > maskW * 1.25){ graphic._xscale *= 0.8; graphic._yscale *= 0.8; graphic._x += (graphic._width*1.25 - graphic._width) / 2; graphic._y += (graphic._height*1.25 - graphic._height) / 2; if (graphic._x > maskX){ graphic._x = maskX; } if (graphic._y > maskY){ graphic._y = maskY; } if (graphic._x + graphic._width < maskX + maskW){ graphic._x = maskX + maskW - graphic._width; } if (graphic._y + graphic._height < maskY + maskH){ graphic._y = maskY + maskH - graphic._height; } } } else if (mode == 'select'){ selecting = true; mouseX = mask._xmouse; mouseY = mask._ymouse; } ]]> 50 && Math.abs(mouseY - mask._ymouse) > 50){ scaleFactor = maskW / Math.abs(mask._xmouse - mouseX); graphic._x = maskX - (mouseX - graphic._x) * scaleFactor; graphic._y = maskY - (mouseY - graphic._y) * scaleFactor; //scale the image by maskW / selectW graphic._xscale *= scaleFactor; graphic._yscale *= scaleFactor; } } ]]> 50 && Math.abs(mouseY - mask._ymouse) > 50){ scaleFactor = maskW / Math.abs(mask._xmouse - mouseX); graphic._x = maskX - (mouseX - graphic._x) * scaleFactor; graphic._y = maskY - (mouseY - graphic._y) * scaleFactor; //scale the image by maskW / selectW graphic._xscale *= scaleFactor; graphic._yscale *= scaleFactor; } }]]> mask._y + mask._height) { graphic._y -= 20; } } if (Key.isDown(Key.UP)){ if (graphic._y <= mask._y){ graphic._y += 20; } } if (Key.isDown(Key.LEFT)){ if (graphic._x < maskX){ graphic._x += 20; } } if (Key.isDown(Key.RIGHT)){ if (graphic._x + graphic._width > mask._x + mask._width){ graphic._x -= 20; } }]]> maskW*1.25){ graphic._xscale *= 0.8; graphic._yscale *= 0.8; graphic._x += (graphic._width*1.25 - graphic._width) / 2; graphic._y += (graphic._height*1.25 - graphic._height) / 2; if (graphic._x > maskX){ graphic._x = maskX; } if (graphic._y > maskY){ graphic._y = maskY; } if (graphic._x + graphic._width < maskX + maskW){ graphic._x = maskX + maskW - graphic._width; } if (graphic._y + graphic._height < maskY + maskH){ graphic._y = maskY + maskH - graphic._height; } }]]> \ No newline at end of file diff --git a/modules/xerte/parent_templates/Nottingham/models/morphImages.rlm b/modules/xerte/parent_templates/Nottingham/models/morphImages.rlm index 069f5b0135..606c27315a 100644 --- a/modules/xerte/parent_templates/Nottingham/models/morphImages.rlm +++ b/modules/xerte/parent_templates/Nottingham/models/morphImages.rlm @@ -1 +1 @@ - \ No newline at end of file + \ 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 f80ec4de13..0addcc698e 100644 --- a/modules/xerte/parent_templates/Nottingham/models/slideshow.rlm +++ b/modules/xerte/parent_templates/Nottingham/models/slideshow.rlm @@ -1 +1 @@ - ' + beforeSlideStat + ' ' + (slideFW.currentPage + 1) + ' ' + betweenSlideStat + ' ' + slideFW.pageCount + ' ' + afterSlideStat + ''); } else { orientation.setText('' + beforeSlideStat + ' ' + slideFW.pageCount + ' ' + betweenSlideStat + ' ' + (slideFW.currentPage + 1) + ' ' + afterSlideStat + ''); } ]]> ' + beforeSlideStat + ' ' + (slideFW.currentPage + 1) + ' ' + betweenSlideStat + ' ' + slideFW.pageCount + ' ' + afterSlideStat + ''); } else { orientation.setText('' + beforeSlideStat + ' ' + slideFW.pageCount + ' ' + betweenSlideStat + ' ' + (slideFW.currentPage + 1) + ' ' + afterSlideStat + ''); } ]]> ' + pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].name + '
' + pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].text}]]>
\ No newline at end of file + ' + beforeSlideStat + ' ' + (slideFW.currentPage + 1) + ' ' + betweenSlideStat + ' ' + slideFW.pageCount + ' ' + afterSlideStat + ''); } else { orientation.setText('' + beforeSlideStat + ' ' + slideFW.pageCount + ' ' + betweenSlideStat + ' ' + (slideFW.currentPage + 1) + ' ' + afterSlideStat + ''); } ]]> ' + beforeSlideStat + ' ' + (slideFW.currentPage + 1) + ' ' + betweenSlideStat + ' ' + slideFW.pageCount + ' ' + afterSlideStat + ''); } else { orientation.setText('' + beforeSlideStat + ' ' + slideFW.pageCount + ' ' + betweenSlideStat + ' ' + (slideFW.currentPage + 1) + ' ' + afterSlideStat + ''); } ]]> ' + pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].name + '
' + pageIcon.templateData.slideshow[projPI].nestedPage[icon.parentNode.index() - 1].text}]]>
\ No newline at end of file diff --git a/modules/xerte/parent_templates/Nottingham/models/tabNav.rlm b/modules/xerte/parent_templates/Nottingham/models/tabNav.rlm index 083e55fd60..9462d48459 100644 --- a/modules/xerte/parent_templates/Nottingham/models/tabNav.rlm +++ b/modules/xerte/parent_templates/Nottingham/models/tabNav.rlm @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file