Index: branches/5.1.x/core/admin_templates/languages/phrase_list.tpl
===================================================================
diff -u -N -r13086 -r13151
--- branches/5.1.x/core/admin_templates/languages/phrase_list.tpl	(.../phrase_list.tpl)	(revision 13086)
+++ branches/5.1.x/core/admin_templates/languages/phrase_list.tpl	(.../phrase_list.tpl)	(revision 13151)
@@ -1,5 +1,5 @@
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:phrases" pagination="1" grid="Phrases" prefix="phrases.st" title_preset="phrases_list_st"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:phrases" pagination="1" grid="Phrases" prefix="phrases" title_preset="phrases_list_st" additional_blue_bar_render_as="grid_ml_selector"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -10,28 +10,22 @@
   			//do not rename - this function is used in default grid for double click!
   			function edit()
   			{
-  				set_hidden_field('remove_specials[phrases.st]', 1);
-  				std_edit_item('phrases.st', 'languages/phrase_edit');
+  	  			Application.SetVar('m_lang', '<inp2:m_Get name="m_lang"/>');
+  				std_edit_item('phrases', 'languages/phrase_edit');
   			}
 
   			var a_toolbar = new ToolBar();
 					a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewPhrase" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
 							function() {
-								var $phrase = prompt('Enter Phrase name:', '');
-								if (!$phrase) {
-									return ;
-								}
-
-								$url_mask = '<inp2:m_Link template="regional/phrases_edit" m_opener="d" phrases_label="#PHRASE_NAME#" phrases_event="OnNew" pass="all,phrases" js_escape="1" no_amp="1"/>';
-								direct_edit('phrases', $url_mask.replace('#PHRASE_NAME#', $phrase));
+								std_precreate_item('phrases', 'languages/phrase_edit');
 							}
 						)
 					);
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
-							std_delete_items('phrases.st')
+							std_delete_items('phrases')
 						} ) );
 
 
@@ -45,14 +39,14 @@
 				a_toolbar.Render();
 			</script>
 		</td>
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="phrases.st" grid="Phrases"/>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="phrases" grid="Phrases"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="phrases.st" IdField="PhraseId" grid="Phrases" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="phrases" IdField="PhraseId" grid="Phrases" menu_filters="yes"/>
 <script type="text/javascript">
-	Grids['phrases.st'].SetDependantToolbarButtons( new Array('edit','delete','primary_language','export_language') );
+	Grids['phrases'].SetDependantToolbarButtons( new Array('edit','delete','primary_language','export_language') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file