Index: branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_tag_processor.php
===================================================================
diff -u -r1406 -r1407
--- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_tag_processor.php	(.../selectors_tag_processor.php)	(revision 1406)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_tag_processor.php	(.../selectors_tag_processor.php)	(revision 1407)
@@ -15,6 +15,26 @@
 			}
 			return $ret;
 		}
+		
+		/**
+		 * Returns input field name to
+		 * be placed on form (for correct
+		 * event processing)
+		 *
+		 * @param Array $params
+		 * @return string
+		 * @access public
+		 */
+		function InputName($params)
+		{
+			$ret = parent::InputName($params);
+			$subfield = getArrayValue($params,'subfield');
+			if($subfield)
+			{
+				$ret .= '['.$subfield.']';	
+			}
+			return $ret;
+		}
 	}
 
 ?>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_tabs.tpl
===================================================================
diff -u -r1402 -r1407
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_tabs.tpl	(.../stylesheets_tabs.tpl)	(revision 1402)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/stylesheets_tabs.tpl	(.../stylesheets_tabs.tpl)	(revision 1407)
@@ -4,8 +4,8 @@
   	<table cellpadding="0" cellspacing="0" border="0" height="23">
 		<tr>
 			<inp2:m_ParseBlock name="tab" title="la_tab_General" t="in-commerce/stylesheets/stylesheets_edit" main_prefix="css"/>
-			<inp2:m_ParseBlock name="tab" title="la_tab_BaseStyles" t="in-commerce/stylesheets/stylesheets_edit_base" main_prefix="css"/>
 			<inp2:m_ParseBlock name="tab" title="la_tab_BlockStyles" t="in-commerce/stylesheets/stylesheets_edit_block" main_prefix="css"/>
+			<inp2:m_ParseBlock name="tab" title="la_tab_BaseStyles" t="in-commerce/stylesheets/stylesheets_edit_base" main_prefix="css"/>
 		</tr>
 		</table>
 	</td>
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -r1406 -r1407
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 1406)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 1407)
@@ -28,7 +28,7 @@
 				function editStyle()
 				{
 					set_hidden_field('remove_specials[selectors.base]', 1);
-					openSelector('selectors.base','<inp2:m_t t="in-commerce/stylesheets/style_editor" pass="all"/>');	
+					openSelector('selectors.base','<inp2:m_t t="in-commerce/stylesheets/style_editor" pass="all"/>',null,850,460,'OnOpenStyleEditor');	
 				}
 			</script>
 		</td>
Index: branches/unlabeled/unlabeled-1.1.2/core/units/stylesheets/stylesheets_config.php
===================================================================
diff -u -r1406 -r1407
--- branches/unlabeled/unlabeled-1.1.2/core/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 1406)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 1407)
@@ -39,6 +39,8 @@
 																						'edit_status_labels'	=> Array('selectors.base'=>'!la_title_Editing_BaseStyle!'),
 																						'new_titlefield'		=> Array('selectors.base'=>'!la_title_New_BaseStyle!'),
 																						'format' => "#css_status# '#css_titlefield#' - #selectors.base_status# '#selectors.base_titlefield#'"),
+												
+												'style_edit'				=>	Array('prefixes' => Array('selectors'), 'format' => "!la_title_EditingStyle! '#selectors_titlefield#'"),
 											),
 					
 					'TableName'			=>	TABLE_PREFIX.'Stylesheets',
@@ -69,7 +71,7 @@
 															),																		
 					'Fields' => Array(
 										'StylesheetId' => Array(),
-										'Name' => Array('type' => 'string','not_null' => '1','default' => ''),
+										'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'Enabled' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 0),
Index: branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_event_handler.php
===================================================================
diff -u -r1406 -r1407
--- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 1406)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 1407)
@@ -53,6 +53,26 @@
 					break;
 			}
 		}
+		
+		/**
+		 * Save css-style name & description before opening css editor
+		 *
+		 * @param kEvent $event
+		 */
+		function OnOpenStyleEditor(&$event)
+		{
+			$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
+			$object =& $event->getObject();
+			
+			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
+			if($items_info)
+			{
+				list($id,$field_values) = each($items_info);	
+				$object->Load($id);
+				$object->SetFieldsFromHash($field_values);
+				$object->Update();
+			}
+		}
 	}
 
 ?>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php
===================================================================
diff -u -r1406 -r1407
--- branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 1406)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 1407)
@@ -37,7 +37,7 @@
 					'Fields' => Array(
 										'SelectorId' => Array(),
 										'StylesheetId' => Array('type' => 'int','not_null' => '1','default' => '0'),
-										'Name' => Array('type' => 'string','not_null' => '1','default' => ''),
+										'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'SelectorName' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'SelectorData' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'Description' => Array('type' => 'string','not_null' => '1','default' => ''),