Index: branches/5.2.x/core/install/step_templates/sys_config.tpl =================================================================== diff -u -N -r14842 -r15165 --- branches/5.2.x/core/install/step_templates/sys_config.tpl (.../sys_config.tpl) (revision 14842) +++ branches/5.2.x/core/install/step_templates/sys_config.tpl (.../sys_config.tpl) (revision 15165) @@ -1,57 +1,57 @@ - Array ('type' => 'text', 'title' => 'Web Path to Installation', 'section' => 'Misc', 'required' => 1, 'default' => '/'), - 'WriteablePath' => Array ('type' => 'text', 'title' => 'Path to Writable folder', 'section' => 'Misc', 'required' => 1, 'default' => '/system'), - 'RestrictedPath' => Array ('type' => 'text', 'title' => 'Path to Restricted folder', 'section' => 'Misc', 'required' => 1, 'default' => '/system/.restricted'), - 'AdminDirectory' => Array ('type' => 'text', 'title' => 'Path to Admin folder', 'section' => 'Misc', 'default' => '/admin'), - 'AdminPresetsDirectory' => Array ('type' => 'text', 'title' => 'Path to Admin Interface Presets folder', 'section' => 'Misc', 'default' => '/admin'), - 'ApplicationClass' => Array ('type' => 'text', 'title' => 'Name of Base Application Class', 'section' => 'Misc', 'default' => 'kApplication'), - 'ApplicationPath' => Array ('type' => 'text', 'title' => 'Path to Base Application Class file', 'section' => 'Misc', 'default' => '/core/kernel/application.php'), - 'CacheHandler' => Array ('type' => 'select', 'title' => 'Output Caching Engine', 'section' => 'Misc', 'default' => 'Fake'), - 'MemcacheServers' => Array ('type' => 'text', 'title' => 'Location of Memcache Servers', 'section' => 'Misc', 'default' => 'localhost:11211'), - 'CompressionEngine' => Array ('type' => 'select', 'title' => 'CSS/JS Compression Engine', 'section' => 'Misc', 'default' => ''), - ); - - $settings['CacheHandler']['options'] = $this->toolkit->getWorkingCacheHandlers(); - $settings['CompressionEngine']['options'] = $this->toolkit->getWorkingCompressionEngines(); - - $row_class = 'table-color2'; - - foreach ($settings as $config_var => $output_params) { - $row_class = $row_class == 'table-color1' ? 'table-color2' : 'table-color1'; - ?> - - - *' : ''); ?>: - - - toolkit->getSystemConfig($output_params['section'], $config_var, $output_params['default']); - - if ( $output_params['type'] == 'text' ) { - echo ''; - } - else { - echo ''; - } - ?> - - - + Array ('type' => 'text', 'title' => 'Web Path to Installation', 'section' => 'Misc', 'required' => 1, 'default' => '/'), + 'WriteablePath' => Array ('type' => 'text', 'title' => 'Path to Writable folder', 'section' => 'Misc', 'required' => 1, 'default' => '/system'), + 'RestrictedPath' => Array ('type' => 'text', 'title' => 'Path to Restricted folder', 'section' => 'Misc', 'required' => 1, 'default' => '/system/.restricted'), + 'AdminDirectory' => Array ('type' => 'text', 'title' => 'Path to Admin folder', 'section' => 'Misc', 'default' => '/admin'), + 'AdminPresetsDirectory' => Array ('type' => 'text', 'title' => 'Path to Admin Interface Presets folder', 'section' => 'Misc', 'default' => '/admin'), + 'ApplicationClass' => Array ('type' => 'text', 'title' => 'Name of Base Application Class', 'section' => 'Misc', 'default' => 'kApplication'), + 'ApplicationPath' => Array ('type' => 'text', 'title' => 'Path to Base Application Class file', 'section' => 'Misc', 'default' => '/core/kernel/application.php'), + 'CacheHandler' => Array ('type' => 'select', 'title' => 'Output Caching Engine', 'section' => 'Misc', 'default' => 'Fake'), + 'MemcacheServers' => Array ('type' => 'text', 'title' => 'Location of Memcache Servers', 'section' => 'Misc', 'default' => 'localhost:11211'), + 'CompressionEngine' => Array ('type' => 'select', 'title' => 'CSS/JS Compression Engine', 'section' => 'Misc', 'default' => ''), + ); + + $settings['CacheHandler']['options'] = $this->toolkit->getWorkingCacheHandlers(); + $settings['CompressionEngine']['options'] = $this->toolkit->getWorkingCompressionEngines(); + + $row_class = 'table-color2'; + + foreach ($settings as $config_var => $output_params) { + $row_class = $row_class == 'table-color1' ? 'table-color2' : 'table-color1'; + ?> + + + *' : ''); ?>: + + + toolkit->getSystemConfig($output_params['section'], $config_var, $output_params['default']); + + if ( $output_params['type'] == 'text' ) { + echo ''; + } + else { + echo ''; + } + ?> + + +