Index: trunk/core/admin_templates/stylesheets/stylesheets_edit.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/core/admin_templates/stylesheets/stylesheets_edit.tpl (.../stylesheets_edit.tpl) (revision 1563) +++ trunk/core/admin_templates/stylesheets/stylesheets_edit.tpl (.../stylesheets_edit.tpl) (revision 1580) @@ -4,9 +4,9 @@ - + - + Index: trunk/kernel/admin_templates/regional/languages_list.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 1563) +++ trunk/kernel/admin_templates/regional/languages_list.tpl (.../languages_list.tpl) (revision 1580) @@ -15,13 +15,13 @@ //do not rename - this function is used in default grid for double click! function edit() { - std_edit_item('lang', 'in-commerce/regional/languages_edit'); + std_edit_item('lang', 'regional/languages_edit'); } var a_toolbar = new ToolBar(); a_toolbar.AddButton( new ToolBarButton('new_language', '', function() { - std_precreate_item('lang', 'in-commerce/regional/languages_edit') + std_precreate_item('lang', 'regional/languages_edit') } ) ); a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); @@ -33,7 +33,7 @@ a_toolbar.AddButton( new ToolBarSeparator('sep1') ); a_toolbar.AddButton( new ToolBarButton('import_language', '', function() { - redirect(''); + redirect(''); } ) ); Index: trunk/kernel/admin_templates/stylesheets/stylesheets_edit.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/stylesheets/stylesheets_edit.tpl (.../stylesheets_edit.tpl) (revision 1563) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_edit.tpl (.../stylesheets_edit.tpl) (revision 1580) @@ -4,9 +4,9 @@ - + - + Index: trunk/core/admin_templates/stylesheets/block_style_edit.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/core/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 1563) +++ trunk/core/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 1580) @@ -57,7 +57,7 @@ { if( ValidateRequired() ) { - openSelector('selectors','',null,850,460,'OnOpenStyleEditor'); + openSelector('selectors','',null,850,460,'OnOpenStyleEditor'); } else { Index: trunk/kernel/admin_templates/regional/languages_edit_phrases.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/regional/languages_edit_phrases.tpl (.../languages_edit_phrases.tpl) (revision 1563) +++ trunk/kernel/admin_templates/regional/languages_edit_phrases.tpl (.../languages_edit_phrases.tpl) (revision 1580) @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ function edit() { - std_edit_temp_item('phrases', 'in-commerce/regional/phrases_edit'); + std_edit_temp_item('phrases', 'regional/phrases_edit'); } a_toolbar = new ToolBar(); @@ -46,7 +46,7 @@ a_toolbar.AddButton( new ToolBarButton('new_language_var', '', function() { - std_new_item('phrases', 'in-commerce/regional/phrases_edit') + std_new_item('phrases', 'regional/phrases_edit') } ) ); a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); Index: trunk/kernel/admin_templates/stylesheets/block_style_edit.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 1563) +++ trunk/kernel/admin_templates/stylesheets/block_style_edit.tpl (.../block_style_edit.tpl) (revision 1580) @@ -57,7 +57,7 @@ { if( ValidateRequired() ) { - openSelector('selectors','',null,850,460,'OnOpenStyleEditor'); + openSelector('selectors','',null,850,460,'OnOpenStyleEditor'); } else { Index: trunk/kernel/units/languages/languages_event_handler.php =================================================================== diff -u -N -r1566 -r1580 --- trunk/kernel/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 1566) +++ trunk/kernel/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 1580) @@ -166,7 +166,7 @@ function OnImportProgress(&$event) { define('IMPORT_BY', 300); // import this much records per step - $template_name = 'in-commerce/regional/languages_import_step2'; + $template_name = 'regional/languages_import_step2'; $import_source = (int)$this->Application->GetVar('source'); $import_steps = Array(0 => 'lang', 1 => 'phrases', 2 => 'emailmessages', 3 => 'finish'); @@ -252,7 +252,7 @@ $this->Application->StoreVar('export_language_ids', implode(',', $this->getSelectedIDs($event)) ); $event->setRedirectParams( Array('m_opener'=>'d','phrases.export_event'=>'OnNew','pass'=>'all,phrases.export') ); - $event->redirect = 'in-commerce/regional/languages_export'; + $event->redirect = 'regional/languages_export'; } /** @@ -292,7 +292,7 @@ } - $event->redirect = 'in-commerce/regional/languages_export_step2'; + $event->redirect = 'regional/languages_export_step2'; $event->SetRedirectParam('export_file', $field_values['LangFile']); } Index: trunk/kernel/admin_templates/stylesheets/base_style_edit.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/stylesheets/base_style_edit.tpl (.../base_style_edit.tpl) (revision 1563) +++ trunk/kernel/admin_templates/stylesheets/base_style_edit.tpl (.../base_style_edit.tpl) (revision 1580) @@ -50,7 +50,7 @@ { if( ValidateRequired() ) { - openSelector('selectors','',null,850,460,'OnOpenStyleEditor'); + openSelector('selectors','',null,850,460,'OnOpenStyleEditor'); } else { Index: trunk/core/units/languages/languages_event_handler.php =================================================================== diff -u -N -r1566 -r1580 --- trunk/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 1566) +++ trunk/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 1580) @@ -166,7 +166,7 @@ function OnImportProgress(&$event) { define('IMPORT_BY', 300); // import this much records per step - $template_name = 'in-commerce/regional/languages_import_step2'; + $template_name = 'regional/languages_import_step2'; $import_source = (int)$this->Application->GetVar('source'); $import_steps = Array(0 => 'lang', 1 => 'phrases', 2 => 'emailmessages', 3 => 'finish'); @@ -252,7 +252,7 @@ $this->Application->StoreVar('export_language_ids', implode(',', $this->getSelectedIDs($event)) ); $event->setRedirectParams( Array('m_opener'=>'d','phrases.export_event'=>'OnNew','pass'=>'all,phrases.export') ); - $event->redirect = 'in-commerce/regional/languages_export'; + $event->redirect = 'regional/languages_export'; } /** @@ -292,7 +292,7 @@ } - $event->redirect = 'in-commerce/regional/languages_export_step2'; + $event->redirect = 'regional/languages_export_step2'; $event->SetRedirectParam('export_file', $field_values['LangFile']); } Index: trunk/kernel/admin_templates/regional/languages_edit.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/regional/languages_edit.tpl (.../languages_edit.tpl) (revision 1563) +++ trunk/kernel/admin_templates/regional/languages_edit.tpl (.../languages_edit.tpl) (revision 1580) @@ -4,7 +4,7 @@ - + Index: trunk/core/admin_templates/stylesheets/base_style_edit.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/core/admin_templates/stylesheets/base_style_edit.tpl (.../base_style_edit.tpl) (revision 1563) +++ trunk/core/admin_templates/stylesheets/base_style_edit.tpl (.../base_style_edit.tpl) (revision 1580) @@ -50,7 +50,7 @@ { if( ValidateRequired() ) { - openSelector('selectors','',null,850,460,'OnOpenStyleEditor'); + openSelector('selectors','',null,850,460,'OnOpenStyleEditor'); } else { Index: trunk/core/admin_templates/stylesheets/stylesheets_edit_block.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 1563) +++ trunk/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 1580) @@ -4,7 +4,7 @@ - + @@ -41,13 +41,13 @@ a_toolbar.AddButton( new ToolBarButton('new_selector', '', function() { set_hidden_field('remove_specials[selectors.block]',1); - std_new_item('selectors.block', 'in-commerce/stylesheets/block_style_edit') + std_new_item('selectors.block', 'stylesheets/block_style_edit') } ) ); function edit() { set_hidden_field('remove_specials[selectors.block]',1); - std_edit_temp_item('selectors.block', 'in-commerce/stylesheets/block_style_edit'); + std_edit_temp_item('selectors.block', 'stylesheets/block_style_edit'); } a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); Index: trunk/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 1563) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 1580) @@ -4,7 +4,7 @@ - + @@ -41,13 +41,13 @@ a_toolbar.AddButton( new ToolBarButton('new_selector', '', function() { set_hidden_field('remove_specials[selectors.block]',1); - std_new_item('selectors.block', 'in-commerce/stylesheets/block_style_edit') + std_new_item('selectors.block', 'stylesheets/block_style_edit') } ) ); function edit() { set_hidden_field('remove_specials[selectors.block]',1); - std_edit_temp_item('selectors.block', 'in-commerce/stylesheets/block_style_edit'); + std_edit_temp_item('selectors.block', 'stylesheets/block_style_edit'); } a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); Index: trunk/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 1563) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 1580) @@ -4,7 +4,7 @@ - + @@ -40,13 +40,13 @@ a_toolbar.AddButton( new ToolBarButton('new_selector', '', function() { set_hidden_field('remove_specials[selectors.base]',1); - std_new_item('selectors.base', 'in-commerce/stylesheets/base_style_edit') + std_new_item('selectors.base', 'stylesheets/base_style_edit') } ) ); function edit() { set_hidden_field('remove_specials[selectors.base]',1); - std_edit_temp_item('selectors.base', 'in-commerce/stylesheets/base_style_edit'); + std_edit_temp_item('selectors.base', 'stylesheets/base_style_edit'); } a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); Index: trunk/kernel/admin_templates/regional/languages_edit_email_events.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 1563) +++ trunk/kernel/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 1580) @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ function edit() { - std_edit_temp_item('phrases', 'in-commerce/regional/email_messages_edit'); + std_edit_temp_item('phrases', 'regional/email_messages_edit'); } a_toolbar = new ToolBar(); Index: trunk/core/admin_templates/stylesheets/stylesheets_edit_base.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 1563) +++ trunk/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 1580) @@ -4,7 +4,7 @@ - + @@ -40,13 +40,13 @@ a_toolbar.AddButton( new ToolBarButton('new_selector', '', function() { set_hidden_field('remove_specials[selectors.base]',1); - std_new_item('selectors.base', 'in-commerce/stylesheets/base_style_edit') + std_new_item('selectors.base', 'stylesheets/base_style_edit') } ) ); function edit() { set_hidden_field('remove_specials[selectors.base]',1); - std_edit_temp_item('selectors.base', 'in-commerce/stylesheets/base_style_edit'); + std_edit_temp_item('selectors.base', 'stylesheets/base_style_edit'); } a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); Index: trunk/kernel/admin_templates/regional/languages_edit_tabs.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/regional/languages_edit_tabs.tpl (.../languages_edit_tabs.tpl) (revision 1563) +++ trunk/kernel/admin_templates/regional/languages_edit_tabs.tpl (.../languages_edit_tabs.tpl) (revision 1580) @@ -3,9 +3,9 @@ Index: trunk/core/admin_templates/stylesheets/stylesheets_tabs.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/core/admin_templates/stylesheets/stylesheets_tabs.tpl (.../stylesheets_tabs.tpl) (revision 1563) +++ trunk/core/admin_templates/stylesheets/stylesheets_tabs.tpl (.../stylesheets_tabs.tpl) (revision 1580) @@ -3,9 +3,9 @@ Index: trunk/core/admin_templates/stylesheets/stylesheets_list.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/core/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 1563) +++ trunk/core/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 1580) @@ -15,13 +15,13 @@ //do not rename - this function is used in default grid for double click! function edit() { - std_edit_item('css', 'in-commerce/stylesheets/stylesheets_edit'); + std_edit_item('css', 'stylesheets/stylesheets_edit'); } var a_toolbar = new ToolBar(); a_toolbar.AddButton( new ToolBarButton('new_style', '', function() { - std_precreate_item('css', 'in-commerce/stylesheets/stylesheets_edit') + std_precreate_item('css', 'stylesheets/stylesheets_edit') } ) ); a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); Index: trunk/kernel/admin_templates/incs/header.tpl =================================================================== diff -u -N -r1566 -r1580 --- trunk/kernel/admin_templates/incs/header.tpl (.../header.tpl) (revision 1566) +++ trunk/kernel/admin_templates/incs/header.tpl (.../header.tpl) (revision 1580) @@ -26,7 +26,7 @@ var t = ''; var popups = '1'; var multiple_windows = '1'; -var main_title = 'In-Commerce'; +var main_title = 'In-Portal'; var tpl_changed = 0; var base_url = ''; Index: trunk/kernel/admin_templates/stylesheets/stylesheets_list.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 1563) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_list.tpl (.../stylesheets_list.tpl) (revision 1580) @@ -15,13 +15,13 @@ //do not rename - this function is used in default grid for double click! function edit() { - std_edit_item('css', 'in-commerce/stylesheets/stylesheets_edit'); + std_edit_item('css', 'stylesheets/stylesheets_edit'); } var a_toolbar = new ToolBar(); a_toolbar.AddButton( new ToolBarButton('new_style', '', function() { - std_precreate_item('css', 'in-commerce/stylesheets/stylesheets_edit') + std_precreate_item('css', 'stylesheets/stylesheets_edit') } ) ); a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); Index: trunk/kernel/admin_templates/stylesheets/stylesheets_tabs.tpl =================================================================== diff -u -N -r1563 -r1580 --- trunk/kernel/admin_templates/stylesheets/stylesheets_tabs.tpl (.../stylesheets_tabs.tpl) (revision 1563) +++ trunk/kernel/admin_templates/stylesheets/stylesheets_tabs.tpl (.../stylesheets_tabs.tpl) (revision 1580) @@ -3,9 +3,9 @@ Index: trunk/kernel/units/selectors/selectors_event_handler.php =================================================================== diff -u -N -r1566 -r1580 --- trunk/kernel/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 1566) +++ trunk/kernel/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 1580) @@ -131,7 +131,7 @@ $return_tpl = $object->GetDBField('Type') == 1 ? 'base_style_edit' : 'block_style_edit'; - $this->finalizePopup($event, 'selectors.base','in-commerce/stylesheets/'.$return_tpl); + $this->finalizePopup($event, 'selectors.base','stylesheets/'.$return_tpl); } /** Index: trunk/core/units/selectors/selectors_event_handler.php =================================================================== diff -u -N -r1566 -r1580 --- trunk/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 1566) +++ trunk/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 1580) @@ -131,7 +131,7 @@ $return_tpl = $object->GetDBField('Type') == 1 ? 'base_style_edit' : 'block_style_edit'; - $this->finalizePopup($event, 'selectors.base','in-commerce/stylesheets/'.$return_tpl); + $this->finalizePopup($event, 'selectors.base','stylesheets/'.$return_tpl); } /**