Index: branches/5.0.x/core/install/incs/script.js =================================================================== diff -u -r12117 -r12417 --- branches/5.0.x/core/install/incs/script.js (.../script.js) (revision 12117) +++ branches/5.0.x/core/install/incs/script.js (.../script.js) (revision 12417) @@ -1,8 +1,7 @@ - -function swap_image($img_id, $src) { - document.getElementById($img_id).src = 'incs/img/' + $src; -} - function continue_install() { document.getElementById('install_form').submit(); +} + +function RemoveTranslationLink($label) { + return $label; } \ No newline at end of file Index: branches/5.0.x/core/install/incs/install.tpl =================================================================== diff -u -r12326 -r12417 --- branches/5.0.x/core/install/incs/install.tpl (.../install.tpl) (revision 12326) +++ branches/5.0.x/core/install/incs/install.tpl (.../install.tpl) (revision 12417) @@ -8,6 +8,7 @@ + @@ -68,22 +69,47 @@ - - - - - - - -
- - Save
- - 		- Cancel
- 		 
- + buttonVisible('any')) { + ?> + + + + + + + +
+ +
+ + + Index: branches/5.0.x/core/install/incs/img/toolbar/tool_select_f2.gif =================================================================== diff -u -r12117 -r12417 Binary files differ Index: branches/5.0.x/core/install/incs/img/toolbar/tool_cancel_f2.gif =================================================================== diff -u -r12117 -r12417 Binary files differ Index: branches/5.0.x/core/install/incs/img/toolbar/tool_cancel.gif =================================================================== diff -u -r12117 -r12417 Binary files differ Index: branches/5.0.x/core/install/incs/img/toolbar/tool_select.gif =================================================================== diff -u -r12117 -r12417 Binary files differ Index: branches/5.0.x/core/install.php =================================================================== diff -u -r12365 -r12417 --- branches/5.0.x/core/install.php (.../install.php) (revision 12365) +++ branches/5.0.x/core/install.php (.../install.php) (revision 12417) @@ -1,6 +1,6 @@ Done($errstr); } } + + /** + * Checks, that given button should be visible on current installation step + * + * @param string $name + * @return bool + */ + function buttonVisible($name) + { + $button_visibility = Array ( + 'continue' => $this->GetNextStep() != -1 || ($this->stepsPreset == 'already_installed'), + 'refresh' => in_array($this->currentStep, Array ('check_paths', 'security')), + 'back' => in_array($this->currentStep, Array (/*'select_license',*/ 'download_license', 'select_domain')), + ); + + if ($name == 'any') { + foreach ($button_visibility as $button_name => $button_visible) { + if ($button_visible) { + return true; + } + } + + return false; + } + + return array_key_exists($name, $button_visibility) ? $button_visibility[$name] : true; + } } ?> \ No newline at end of file Index: branches/5.0.x/core/install/step_templates/post_config.tpl =================================================================== diff -u -r12204 -r12417 --- branches/5.0.x/core/install/step_templates/post_config.tpl (.../post_config.tpl) (revision 12204) +++ branches/5.0.x/core/install/step_templates/post_config.tpl (.../post_config.tpl) (revision 12417) @@ -102,6 +102,7 @@
@@ -114,14 +140,17 @@

- - GetStepNumber() > 1 && $this->GetNextStep() != -1) { - echo ''; + if ($this->buttonVisible('refresh')) { + echo ' '; } - ?> + if ($this->buttonVisible('back')) { + echo ' '; + } + + echo ''; + ?>
Application->InitParser(); echo '' . $this->Application->Parser->Parse(ob_get_clean(), 'post_config') . ''; ?> \ No newline at end of file Index: branches/5.0.x/core/install/incs/style.css =================================================================== diff -u -r12204 -r12417 --- branches/5.0.x/core/install/incs/style.css (.../style.css) (revision 12204) +++ branches/5.0.x/core/install/incs/style.css (.../style.css) (revision 12417) @@ -19,26 +19,6 @@ color: #FF0000; } -/*#nav { - margin-left: -1px; - text-align: center; - float: left -} - -#content { - padding: 10px; - color: darkblue; - float: right -} - -#header { - background-color: #fff; - color: #006; - border-bottom: 1px solid #006; - margin-bottom: 0px -} -*/ - .footer { background-color: #FFFFFF; color: #006; @@ -55,15 +35,6 @@ font-family: 'Lucida Grande', Verdana, Geneva, Lucida, Helvetica, Arial, sans-serif; } - -/* -.spacer {clear: both} - -dd, dt { - font: 0.95em 'Lucida Grande', Verdana, Geneva, Lucida, Helvetica, Arial, sans-serif; -} -*/ - .head_version { padding-right: 5px; font-weight: normal; @@ -110,16 +81,36 @@ text-decoration: none; } +/* Toolbar */ + .toolbar { - border-right: #000000 1px solid; - border-top: #000000 0px solid; - font-size: 10pt; - border-left: #000000 1px solid; - border-bottom: #000000 1px solid; - font-family: Arial, Helvetica, sans-serif; + font-size: 8pt; + border: 1px solid #000000; + border-width: 0px 1px 1px 1px; background-color: #F0F1EB; + border-collapse: collapse; } +.toolbar td { + height: 100%; +} + +.toolbar-button, .toolbar-button-disabled, .toolbar-button-over { + float: left; + text-align: center; + font-size: 8pt; + padding: 5px 5px 5px 5px; + vertical-align: middle; + color: #006F99; +} + +.toolbar-button-over { + color: #000; +} + +.toolbar-button-disabled { + color: #444; +} .tableborder { border-right: #000000 1px solid; border-top: #000000 0px solid;