Index: admin_templates/config/config_general.tpl =================================================================== --- admin_templates/config/config_general.tpl (revision 14592) +++ admin_templates/config/config_general.tpl (working copy) @@ -82,6 +82,7 @@ + Index: admin_templates/config/config_search.tpl =================================================================== --- admin_templates/config/config_search.tpl (revision 14592) +++ admin_templates/config/config_search.tpl (working copy) @@ -125,6 +125,9 @@ + + +
style="border-bottom-width: 0px;">
Index: admin_templates/config/config_universal.tpl =================================================================== --- admin_templates/config/config_universal.tpl (revision 14592) +++ admin_templates/config/config_universal.tpl (working copy) @@ -96,6 +96,7 @@ + Index: admin_templates/incs/config_updated_notice.tpl =================================================================== --- admin_templates/incs/config_updated_notice.tpl (revision 0) +++ admin_templates/incs/config_updated_notice.tpl (revision 0) @@ -0,0 +1,6 @@ + + +
+
+ +
Index: admin_templates/incs/form_blocks.tpl =================================================================== --- admin_templates/incs/form_blocks.tpl (revision 14592) +++ admin_templates/incs/form_blocks.tpl (working copy) @@ -99,10 +99,10 @@ - +
id=""> - Index: admin_templates/incs/style_template.css =================================================================== --- admin_templates/incs/style_template.css (revision 14592) +++ admin_templates/incs/style_template.css (working copy) @@ -498,6 +498,10 @@ font-size: 11px; } +.form-notice { + font-size: 11px; +} + .priority { color: red; padding-left: 1px; Index: admin_templates/tools/system_tools.tpl =================================================================== --- admin_templates/tools/system_tools.tpl (revision 14592) +++ admin_templates/tools/system_tools.tpl (working copy) @@ -15,8 +15,16 @@ } -
+ + +
+
+ + +
+
+
Index: install/english.lang =================================================================== --- install/english.lang (revision 14592) +++ install/english.lang (working copy) @@ -1495,6 +1495,8 @@ QXV0by1EZXRlY3Q= Q29va2llcw== UXVlcnkgU3RyaW5nIChTSUQp + WW91ciBjaGFuZ2VzIHdlcmUgc3VjY2Vzc2Z1bGx5IHNhdmVkIQ== + TGFzdCBvcGVyYXRpb24gaGFzIGJlZW4gc3VjY2Vzc2Z1bGx5IGNvbXBsZXRlZCE= U3ViamVjdDogTmV3IENhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIC0gQWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIGhhcyBiZWVuIGFkZGVkLg== Index: units/admin/admin_events_handler.php =================================================================== --- units/admin/admin_events_handler.php (revision 14592) +++ units/admin/admin_events_handler.php (working copy) @@ -95,15 +95,19 @@ if ($this->Application->GetVar('ajax') == 'yes') { $event->status = kEvent::erSTOP; } - + $this->Conn->Query('DELETE FROM ' . TABLE_PREFIX . 'CachedUrls'); + + $this->_setSystemToolsOperationCompleted(); } function OnResetSections(&$event) { if ($this->Application->GetVar('ajax') == 'yes') { $event->status = kEvent::erSTOP; - } + } + + $this->_setSystemToolsOperationCompleted(); if ($this->Application->isCachingType(CACHING_TYPE_MEMORY)) { $this->Application->rebuildCache('master:sections_parsed', kCache::REBUILD_LATER, CacheSettings::$sectionsParsedRebuildTime); @@ -145,10 +149,12 @@ { if ($this->Application->GetVar('ajax') == 'yes') { $event->status = kEvent::erSTOP; - } - + } + + $this->_setSystemToolsOperationCompleted(); + $this->Application->DeleteUnitCache(); - + if ( $this->Application->GetVar('validate_configs') ) { $event->SetRedirectParam('validate_configs', 1); } @@ -161,6 +167,7 @@ } $this->Application->resetCache(); + $this->_setSystemToolsOperationCompleted(); } function OnCompileTemplates(&$event) @@ -193,6 +200,7 @@ } $this->_deleteCompiledTemplates($base_path); + $this->_setSystemToolsOperationCompleted(); } function _deleteCompiledTemplates($folder, $unlink_folder = false) @@ -398,6 +406,8 @@ /* @var $themes_helper kThemesHelper */ $themes_helper->refreshThemes(); + + $this->_setSystemToolsOperationCompleted(); } function OnSaveColumns(&$event) @@ -1352,6 +1362,8 @@ /* @var $deployment_helper DeploymentHelper */ $deployment_helper->deployAll(); + + $this->_setSystemToolsOperationCompleted(); } /** @@ -1366,8 +1378,17 @@ if ( !$deployment_helper->deployAll(true) ) { $event->status = kEvent::erFAIL; + } else { + $this->_setSystemToolsOperationCompleted(); } } + + function _setSystemToolsOperationCompleted() + { + if ($this->Application->GetVar('t') == 'tools/system_tools') { + $this->Application->StoreVar('system_tools_operation_completed', 1); + } + } } Index: units/categories/categories_event_handler.php =================================================================== --- units/categories/categories_event_handler.php (revision 14592) +++ units/categories/categories_event_handler.php (working copy) @@ -1870,6 +1870,10 @@ } $this->_resetMenuCache(); + + if ($this->Application->GetVar('t') == 'tools/system_tools') { + $this->Application->StoreVar('system_tools_operation_completed', 1); + } } function _resetMenuCache() Index: units/configuration/configuration_event_handler.php =================================================================== --- units/configuration/configuration_event_handler.php (revision 14592) +++ units/configuration/configuration_event_handler.php (working copy) @@ -145,6 +145,7 @@ */ function OnAfterItemUpdate(&$event) { + $this->Application->StoreVar('conf_was_updated', 1); $object =& $event->getObject(); /* @var $object kDBItem */ Index: units/languages/languages_event_handler.php =================================================================== --- units/languages/languages_event_handler.php (revision 14592) +++ units/languages/languages_event_handler.php (working copy) @@ -76,6 +76,10 @@ if ($this->Application->GetVar('ajax') == 'yes') { $event->status = kEvent::erSTOP; } + + if ($this->Application->GetVar('t') == 'tools/system_tools') { + $this->Application->StoreVar('system_tools_operation_completed', 1); + } if (is_object($event->MasterEvent)) { if ($event->MasterEvent->status != kEvent::erSUCCESS) {
+