Index: branches/1.2.x/in-bulletin/elements/content_boxes/add_poll_comment.elm.tpl
===================================================================
diff -u -N -r14274 -r15798
--- branches/1.2.x/in-bulletin/elements/content_boxes/add_poll_comment.elm.tpl	(.../add_poll_comment.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-bulletin/elements/content_boxes/add_poll_comment.elm.tpl	(.../add_poll_comment.elm.tpl)	(revision 15798)
@@ -1,8 +1,13 @@
 <inp2:m_DefineElement name="content">
 	<br/>
 
+	<script type="text/javascript">
+		FormManager.resetFields('poll-comment');
+	</script>
+
 	<inp2:poll-comment_PresetFormFields/>
-	<form method="post" id="poll_comment_form" action="<inp2:m_Link width='480' height='480' pass='m,poll'/>">
+
+	<form method="post" id="poll_comment_form">
 		<table class="form-data fullwidth">
 			<inp2:m_ifnot check="m_LoggedIn">
 				<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestName" title="lu_fld_Name" style="width:200px"/>
@@ -12,41 +17,30 @@
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="poll-comment" field="CommentBody" rows="8" cols="40" title="lu_fld_Comment" is_last="1"/>
 
 			<inp2:m_RenderElement design="inp_edit_buttons">
-				<input type="hidden" name="events[poll-comment]" value="OnCreate"/>
-				<input type="hidden" name="success_template" value="in-bulletin/elements/content_boxes/poll_comments.elm" />
-				<input class="button" id="add_comment_btn" type="button" value="<inp2:m_Phrase label='lu_btn_Create' no_editing='1'/>" />
+				<input class="button" type="submit" value="<inp2:m_Phrase label='lu_btn_Create' no_editing='1'/>" />
 				<input class="button" type="reset" name="reset" value="<inp2:m_Phrase label='lu_btn_Reset' no_editing='1'/>" />
 			</inp2:m_RenderElement>
 		</table>
 	</form>
-	<script language="javascript" type="text/javascript">
-		$(document).ready(
-			function() {
-				$('#add_comment_btn').click(
-					function ($e) {
-						TB.show(
-							{
-								url: $('#poll_comment_form').attr('action'),
-								postParams: $('#poll_comment_form').serialize(),
-								onDataReceived: function($data, params) {
-									var $match_redirect = new RegExp('^#redirect#(.*?)($|\\s.*)').exec($data);
 
-									if ($match_redirect != null) {
-										TB.show( {url: $match_redirect[1] + '&height=480&width=480'} );
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$('#poll_comment_form').submit(function ($e) {
+				FormManager.submitForm('poll-comment');
 
-										return false;
-									}
+				$e.preventDefault();
+			});
 
-									return $data;
-								}
-							}
-						);
-					}
-				)
-			}
-		);
+			FormManager.registerForm({
+				prefix: 'poll-comment',
+				url: '<inp2:m_Link template="#TEMPLATE#" pass="m,poll" no_amp="1" js_escape="1"/>',
+				next_template: 'in-bulletin/elements/content_boxes/poll_comments.elm',
+				save_event: 'OnCreateAjax',
+				id: '<inp2:poll-comment_Field name="CommentId" db="db"/>',
+				form_id: 'poll_comment_form'
+			});
+		});
 	</script>
-
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design_ajax.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.2.x/platform/designs/default_design_ajax.des.tpl
===================================================================
diff -u -N -r14274 -r15798
--- branches/1.2.x/platform/designs/default_design_ajax.des.tpl	(.../default_design_ajax.des.tpl)	(revision 14274)
+++ branches/1.2.x/platform/designs/default_design_ajax.des.tpl	(.../default_design_ajax.des.tpl)	(revision 15798)
@@ -1,3 +1,7 @@
+<inp2:m_if check="m_Get" name="ajax" equals_to="yes">
+	 <inp2:m_NoDebug/>
+</inp2:m_if>
+
 <inp2:m_include template="platform/elements/content_boxes.elm" strip_nl="1"/>
 <inp2:m_include template="platform/elements/forms.elm" strip_nl="1"/>