Index: branches/5.2.x/core/admin_templates/categories/edit_content.tpl
===================================================================
diff -u -N -r14585 -r14856
--- branches/5.2.x/core/admin_templates/categories/edit_content.tpl	(.../edit_content.tpl)	(revision 14585)
+++ branches/5.2.x/core/admin_templates/categories/edit_content.tpl	(.../edit_content.tpl)	(revision 14856)
@@ -16,31 +16,21 @@
 	  					'select',
 	  					'<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>',
 	  					function() {
-							submit_event('content','<inp2:content_SaveEvent/>');
+							submit_event('content', 'OnSaveContentBlock');
 						}
 					)
 				);
 
 				a_toolbar.AddButton(
 					new ToolBarButton(
 						'cancel',
-						'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
+						'<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>',
 						function() {
-							cancel_edit('content','OnCancelEdit','<inp2:content_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+							window_close();
 						}
 					)
 				);
 
-				a_toolbar.AddButton(
-					new ToolBarButton(
-						'reset_edit',
-						'<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>',
-						function() {
-							reset_form('content', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
-						}
-				 	)
-				);
-
 				a_toolbar.Render();
 			</script>
 
@@ -81,4 +71,35 @@
 
 <input type="hidden" name="c_id" value="<inp2:m_Get name='c_id'/>"/>
 
+<script type="text/javascript">
+	var $autosave_title = '<inp2:m_Phrase name="la_title_EditingContentAutosaved" no_editing="1" js_escape="1"/>';
+
+	setInterval(
+		function () {
+			var $editor_instance = FCKeditorAPI.GetInstance('<inp2:content_InputName field="Content"/>');
+			$('#' + jq('<inp2:content_InputName field="Content"/>')).val( $editor_instance.GetHTML() );
+
+			submit_event_ajax(
+				'content', 'OnAutoSave', undefined,
+				function ($autosave_string) {
+					$('#blue_bar').html( $autosave_title.replace('%s', $autosave_string) );
+				}
+			);
+		}, <inp2:m_GetConst name="CONTENT_LASTAUTOSAVE_UPDATE_INTERVAL"/> * 1000
+	);
+
+	setInterval(
+		function () {
+			submit_event_ajax(
+				'content', 'OnGetAutoSaveTime', undefined,
+				function ($autosave_string) {
+					if ( $autosave_string ) {
+						$('#blue_bar').html( $autosave_title.replace('%s', $autosave_string) );
+					}
+				}
+			);
+		}, <inp2:m_GetConst name="CONTENT_LASTAUTOSAVE_REFRESH_INTERVAL"/> * 1000
+	);
+</script>
+
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file