diff --git a/Contrib/Modern UI 2/Readme.html b/Contrib/Modern UI 2/Readme.html index d4b0986c..99711a13 100644 --- a/Contrib/Modern UI 2/Readme.html +++ b/Contrib/Modern UI 2/Readme.html @@ -80,7 +80,7 @@ } .toggle { - display: none; + display: block; } .options { @@ -98,33 +98,25 @@ image_open.src = "images/open.gif"; var image_closed = new Image(); image_closed.src = "images/closed.gif"; - + + function GEBY(d, i) { return d.getElementById ? d.getElementById(i) : document.all ? document.all[i] : 0 } + function toggle(image, section) { - - if(document.all) { - if(document.all[section].style.display == "block") { - document.all[section].style.display = "none"; - document.all[image].src = image_closed.src; - } - else - { - document.all[section].style.display = "block"; - document.all[image].src = image_open.src; - } - } - else + + if (section = GEBY(document, section)) { - if(document.getElementById(section).style.display == "block") { - document.getElementById(section).style.display = "none"; - document.getElementById(image).src = image_closed.src; + image = GEBY(document, image); + if (section.style.display != "none") + { + section.style.display = "none"; + image.src = image_closed.src; } - else - { - document.getElementById(section).style.display = "block"; - document.getElementById(image).src = image_open.src; + else + { + section.style.display = "block"; + image.src = image_open.src; } } - } function expandall() { @@ -151,11 +143,17 @@ } + function onDocLoad() { + + toggle('trigger_scr', 'toggle_scr'); + toggle('trigger_lic', 'toggle_lic'); + } + //]]> - +
@@ -180,14 +178,12 @@ the setup wizard is closed (for example, whether the application should be started immediately). A finish page can also be used to ask for a system restart is necessary.

- Open/Close section Screenshots

-

-

-

-

+

+

@@ -254,12 +250,12 @@ !define MUI_INSTFILESPAGE_COLORS "FFFFFF 000000" ;Two colors

- Open/Close section Interface settings

- Open/Close section Page header

@@ -345,7 +341,7 @@ user interfaces that set a bigger header image.

- Open/Close section Interface resources

@@ -376,7 +372,7 @@ Default: ${NSISDIR}\Contrib\UIs\modern_nodesc.exe

- Open/Close section Installer welcome/finish page

@@ -391,7 +387,7 @@

- Open/Close section Uninstaller welcome/finish page

@@ -406,7 +402,7 @@

- Open/Close section License page

@@ -419,7 +415,7 @@ Default: /windows

- Open/Close section Components page

@@ -436,7 +432,7 @@ No description area.

- Open/Close section Directory page

@@ -445,7 +441,7 @@ The background color for the directory textbox.

- Open/Close section Start Menu folder page

@@ -454,7 +450,7 @@ The background color for the startmenu directory list and textbox.

- Open/Close section Installation page

@@ -470,7 +466,7 @@ Default: smooth

- Open/Close section Installer finish page

@@ -480,7 +476,7 @@ log.

- Open/Close section Uninstaller finish page

@@ -490,7 +486,7 @@ log.

- Open/Close section Abort warning

@@ -507,7 +503,7 @@

- Open/Close section Uninstaller abort warning

@@ -566,7 +562,7 @@ Var StartMenuFolder MUI_UNPAGE_INSTFILES
MUI_UNPAGE_FINISH

- Open/Close section Page settings

@@ -596,7 +592,7 @@ Var PLUGINS_FOLDER In all text settings, the doublequote character (") should be escaped in the following form: $\"

- Open/Close section General page settings

@@ -608,7 +604,7 @@ Var PLUGINS_FOLDER Subtext to display on the header of the page.

- Open/Close section Welcome page settings

@@ -623,7 +619,7 @@ Var PLUGINS_FOLDER Text to display on the page.

- Open/Close section License page settings

@@ -658,7 +654,7 @@ Var PLUGINS_FOLDER

- Open/Close section Components page settings

@@ -679,7 +675,7 @@ Var PLUGINS_FOLDER Text to display inside the description box when no section is selected.

- Open/Close section Directory page settings

@@ -699,7 +695,7 @@ Var PLUGINS_FOLDER GetInstDirError in the leave function to handle an invalid folder.

- Open/Close section Start Menu folder page settings

@@ -731,7 +727,7 @@ Var PLUGINS_FOLDER

- Open/Close section Installation page settings

@@ -753,7 +749,7 @@ Var PLUGINS_FOLDER been aborted.

- Open/Close section Finish page settings

@@ -845,7 +841,7 @@ Var PLUGINS_FOLDER this option to save some space if you are not using the /REBOOTOK flag or SetRebootFlag.

- Open/Close section Uninstall confirm page settings

@@ -961,7 +957,7 @@ FunctionEnd

This macro can also be used in the un.onInit function.

- Open/Close section Settings for registry storage of selected language

@@ -987,7 +983,7 @@ FunctionEnd

- Open/Close section Interface settings for selection dialog

@@ -1057,7 +1053,7 @@ FunctionEnd

Modern UI pages can also customized using custom functions.

- Open/Close section General Custom Functions

@@ -1076,7 +1072,7 @@ FunctionEnd used, regular .onMouseOverSection and un.onMouseOverSection must be used.

- Open/Close section Page Custom Functions

@@ -1126,7 +1122,7 @@ FunctionEnd

The zlib/libpng license applies to the Modern UI.

- Open/Close section License Terms

diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index 2f54f4e0..72c9c786 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -80,7 +80,7 @@ } .toggle { - display: none; + display: block; } .options { @@ -98,33 +98,25 @@ image_open.src = "images/open.gif"; var image_closed = new Image(); image_closed.src = "images/closed.gif"; - + + function GEBY(d, i) { return d.getElementById ? d.getElementById(i) : document.all ? document.all[i] : 0 } + function toggle(image, section) { - - if(document.all) { - if(document.all[section].style.display == "block") { - document.all[section].style.display = "none"; - document.all[image].src = image_closed.src; - } - else - { - document.all[section].style.display = "block"; - document.all[image].src = image_open.src; - } - } - else + + if (section = GEBY(document, section)) { - if(document.getElementById(section).style.display == "block") { - document.getElementById(section).style.display = "none"; - document.getElementById(image).src = image_closed.src; + image = GEBY(document, image); + if (section.style.display != "none") + { + section.style.display = "none"; + image.src = image_closed.src; } - else - { - document.getElementById(section).style.display = "block"; - document.getElementById(image).src = image_open.src; + else + { + section.style.display = "block"; + image.src = image_open.src; } } - } function expandall() { @@ -151,11 +143,17 @@ } + function onDocLoad() { + + toggle('trigger_scr', 'toggle_scr'); + toggle('trigger_lic', 'toggle_lic'); + } + //]]> - +
@@ -180,14 +178,12 @@ the setup wizard is closed (for example, whether the application should be started immediately). A finish page can also be used to ask for a system restart is necessary.

- Open/Close section Screenshots

-

-

-

-

+

+

@@ -227,12 +223,12 @@ !define MUI_INSTFILESPAGE_COLORS "FFFFFF 000000" ;Two colors

- Open/Close section Interface settings

- Open/Close section Page header

@@ -317,7 +313,7 @@ user interfaces that set a bigger header image.

- Open/Close section Interface resources

@@ -348,7 +344,7 @@ Default: ${NSISDIR}\Contrib\UIs\modern_nodesc.exe

- Open/Close section Installer welcome/finish page

@@ -370,7 +366,7 @@ Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini

- Open/Close section Uninstaller welcome/finish page

@@ -392,7 +388,7 @@ Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini

- Open/Close section License page

@@ -405,7 +401,7 @@ Default: /windows

- Open/Close section Components page

@@ -422,7 +418,7 @@ No description area.

- Open/Close section Directory page

@@ -431,7 +427,7 @@ The background color for the directory textbox.

- Open/Close section Start Menu folder page

@@ -440,7 +436,7 @@ The background color for the startmenu directory list and textbox.

- Open/Close section Installation page

@@ -456,7 +452,7 @@ Default: smooth

- Open/Close section Installer finish page

@@ -466,7 +462,7 @@ log.

- Open/Close section Uninstaller finish page

@@ -476,7 +472,7 @@ log.

- Open/Close section Abort warning

@@ -493,7 +489,7 @@

- Open/Close section Uninstaller abort warning

@@ -552,7 +548,7 @@ Var StartMenuFolder MUI_UNPAGE_INSTFILES
MUI_UNPAGE_FINISH

- Open/Close section Page settings

@@ -582,7 +578,7 @@ Var PLUGINS_FOLDER In all text settings, the doublequote character (") should be escaped in the following form: $\"

- Open/Close section General page settings

@@ -594,7 +590,7 @@ Var PLUGINS_FOLDER Subtext to display on the header of the page.

- Open/Close section Welcome page settings

@@ -611,7 +607,7 @@ Var PLUGINS_FOLDER Text to display on the page.

- Open/Close section License page settings

@@ -646,7 +642,7 @@ Var PLUGINS_FOLDER

- Open/Close section Components page settings

@@ -667,7 +663,7 @@ Var PLUGINS_FOLDER Text to display inside the description box when no section is selected.

- Open/Close section Directory page settings

@@ -687,7 +683,7 @@ Var PLUGINS_FOLDER GetInstDirError in the leave function to handle an invalid folder.

- Open/Close section Start Menu folder page settings

@@ -719,7 +715,7 @@ Var PLUGINS_FOLDER

- Open/Close section Installation page settings

@@ -741,7 +737,7 @@ Var PLUGINS_FOLDER been aborted.

- Open/Close section Finish page settings

@@ -835,7 +831,7 @@ Var PLUGINS_FOLDER this option to save some space if you are not using the /REBOOTOK flag or SetRebootFlag.

- Open/Close section Uninstall confirm page settings

@@ -952,7 +948,7 @@ FunctionEnd

This macro can also be used in the un.onInit function.

- Open/Close section Settings for registry storage of selected language

@@ -978,7 +974,7 @@ FunctionEnd

- Open/Close section Interface settings for selection dialog

@@ -1048,7 +1044,7 @@ Function myGUIInit FunctionEnd

- Open/Close section General Custom Functions

@@ -1067,7 +1063,7 @@ FunctionEnd used, regular .onMouseOverSection and un.onMouseOverSection must be used.

- Open/Close section Page Custom Functions

@@ -1087,7 +1083,7 @@ FunctionEnd

- Open/Close section Welcome/Finish Page Custom Functions

@@ -1125,7 +1121,7 @@ FunctionEnd

The zlib/libpng license applies to the Modern UI.

- Open/Close section License Terms