Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl
===================================================================
diff -u -r7090 -r7099
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl	(.../languages_edit_email_events.tpl)	(revision 7090)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl	(.../languages_edit_email_events.tpl)	(revision 7099)
@@ -66,6 +66,7 @@
 				<inp2:m_endif/>
 			</script>
 		</td>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailevents" grid="Default"/>
 	</tr>
 </tbody>
 </table>
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -r7090 -r7099
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 7090)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 7099)
@@ -40,26 +40,7 @@
 				a_toolbar.Render();
 			</script>
 		</td>
-		<td style="white-space: nowrap; text-align: right; width: 200px;" align="right">
-			<div style="float: right">
-				<script type="text/javascript">
-					b_toolbar = new ToolBar();
-//							b_toolbar.ButtonStyle = 'float: right;'
-
-					b_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search" escape="1"/>',
-							function() {
-								search('u', 'Admins', 0);
-							} ) );
-
-					b_toolbar.AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase label="la_ToolTip_SearchReset" escape="1"/>',
-							function() {
-								search_reset('u', 'Admins', 0);
-							} ) );
-
-					b_toolbar.Render();
-				</script>
-			</div>
-		</td>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="u" grid="Admins"/>
 	</tr>
 </tbody>
 </table>
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_add.gif
===================================================================
diff -u
Binary files differ
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js
===================================================================
diff -u -r7073 -r7099
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js	(.../ajax.js)	(revision 7073)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js	(.../ajax.js)	(revision 7099)
@@ -269,8 +269,8 @@
 	}
 
 	if (!isset(this.PopupSizes[$template])) {
-//		alert('from ajax');
 		var $url = this.URL + '&type=GetPopupSize&template_name=' + $template;
+//		alert('from ajax: '+$url);
 		Request.makeRequest($url, this.BusyRequest, '', this.successCallback, this.errorCallback, ['GetSize', $template], this);
 	}
 	else {
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_add_f2.gif
===================================================================
diff -u
Binary files differ
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_add_f3.gif
===================================================================
diff -u
Binary files differ
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js
===================================================================
diff -u -r7090 -r7099
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 7090)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 7099)
@@ -410,7 +410,6 @@
 }
 
 function open_popup($prefix_special, $event, $t, $window_size) {
-//	alert('opening '+$prefix_special+' event: '+$event+' t:'+$t+' size: '+$window_size)
 	if (!$window_size) {
 		// if no size given, then query it from ajax
 		var $default_size = '750x400';
@@ -444,6 +443,19 @@
 
 function openSelector($prefix, $url, $dst_field, $window_size, $event)
 {
+	// if url has additional params - store it and make hidden fields from it (later, below)
+	var	$additional = [];
+	if ($url.match('(.*)&(.*)')) {
+		$url = RegExp.$1;
+		var tmp = RegExp.$2;
+		var pairs = tmp.split('&');
+
+		for (var i in pairs) {
+			var data = pairs[i].split('=');
+			$additional[data[0]] = data[1];
+		}
+	}
+
 	// get template name from url
 	var $regex = new RegExp('(.*)\?env=(' + document.getElementById('sid').value + ')?-(.*?):(m[^:]+)');
 	$regex = $regex.exec($url);
@@ -462,6 +474,11 @@
 	set_hidden_field('main_prefix', $prefix);
 	set_hidden_field('dst_field', $dst_field);
 
+	for (var i in $additional)
+	{
+		set_hidden_field(i, $additional[i]);
+	}
+
 	open_popup($prefix, $event, $t);
 
 	// restore form action back
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl
===================================================================
diff -u -r7090 -r7099
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 7090)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 7099)
@@ -75,24 +75,7 @@
 				<inp2:m_endif/>
 			</script>
 		</td>
-		<td style="text-align: right" align="right">
-			<script type="text/javascript">
-				b_toolbar = new ToolBar();
-				b_toolbar.ButtonStyle = 'float: right;'
-
-				b_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search" escape="1"/>',
-						function() {
-							search('phrases', 'Default', 0);
-						} ) );
-
-				b_toolbar.AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase label="la_ToolTip_SearchReset" escape="1"/>',
-						function() {
-							search_reset('phrases', 'Default', 0);
-						} ) );
-
-				b_toolbar.Render();
-			</script>
-		</td>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="phrases" grid="Default"/>
 	</tr>
 </tbody>
 </table>
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_search_reset_alt_f2.gif
===================================================================
diff -u
Binary files differ
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_search_reset_alt_f3.gif
===================================================================
diff -u
Binary files differ
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_search_reset_alt.gif
===================================================================
diff -u
Binary files differ
Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r7027 -r7099
--- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 7027)
+++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 7099)
@@ -452,4 +452,4 @@
 
 <inp2:m_DefineElement name="ml_selector" prefix="">
 
-</inp2:m_DefineElement>
\ No newline at end of file
+</inp2:m_DefineElement>