Index: branches/unlabeled/unlabeled-1.3.4/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.3.4/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.3.4/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 4367)
@@ -39,7 +39,7 @@
 	<td valign="top" class="text">
 		<input type="hidden" name="<inp2:$PrefixSpecial_InputName field="ResourceId" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="ResourceId" IdField="$IdField"/>" value="<inp2:$PrefixSpecial_field field="ResourceId" grid="$grid"/>">
 		<input type="hidden" name="<inp2:$PrefixSpecial_InputName field="CustomDataId" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="CustomDataId" IdField="$IdField"/>" value="<inp2:$PrefixSpecial_field field="CustomDataId" grid="$grid"/>">
-		<!--<input size="40" type="text" name="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" value="<inp2:$PrefixSpecial_field field="$field" grid="$grid"/>">-->
+		<!-- <input size="40" type="text" name="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$field" IdField="$IdField"/>" value="<inp2:$PrefixSpecial_field field="$field" grid="$grid"/>"> -->
 		
 		<inp2:$PrefixSpecial_ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
 	</td>
Index: branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/stylesheets_edit_block.tpl
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 4367)
@@ -15,30 +15,30 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 						submit_event('css','<inp2:css_SaveEvent/>');
 						}
 					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('css','OnCancelEdit');
 						}
 				 ) );
 				
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 				
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('css', '<inp2:css_PrevId/>');
 						}
 				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('css', '<inp2:css_NextId/>');
 						}
 				 ) );
 				 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 				
 				//Relations related:
-				a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBlockStyle"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBlockStyle" escape="1"/>',
 						function() {
 							set_hidden_field('remove_specials[selectors.block]',1);
 							std_new_item('selectors.block', 'stylesheets/block_style_edit') 
@@ -50,30 +50,30 @@
 	  				std_edit_temp_item('selectors.block', 'stylesheets/block_style_edit');
 	  			}
 						
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit"/>', edit) );
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete"/>',
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('selectors.block')
 						} ) );
 				
 						
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 				
-				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
 						set_hidden_field('remove_specials[selectors.block]',1);
 						submit_event('selectors.block','OnMassClone');
 						}
 				) );
 				
-				a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
 						set_hidden_field('remove_specials[selectors.block]',1);
 						submit_event('selectors.block','OnMassResetToBase');
 						}
 				) );
 				 
 				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
 				 
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
@@ -105,7 +105,7 @@
 
 <inp2:m_ParseBlock name="grid" PrefixSpecial="selectors.block" IdField="SelectorId" grid="BlockStyles" header_block="grid_column_title" data_block="grid_data_td" search="on"/>
 <script type="text/javascript">
-	Grids['selectors.block'].SetDependantToolbarButtons( new Array('edit','delete','clone') );
+	Grids['selectors.block'].SetDependantToolbarButtons( new Array('edit','delete','clone','reset_to_base') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.4.2/core/units/selectors/selectors_event_handler.php
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.4.2/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.4.2/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 4367)
@@ -5,7 +5,55 @@
 
 	class SelectorsEventHandler extends InpDBEventHandler 
 	{
+		
 		/**
+		 * Occures before an item has been cloned
+		 * Id of newly created item is passed as event' 'id' param
+		 *
+		 * @param kEvent $event
+		 */
+		function OnBeforeClone(&$event)
+		{
+			$event->Init($event->Prefix, '-item');
+			$object =& $event->getObject();
+			
+			$title_field = 'SelectorName';
+			$new_name = $object->GetDBField($title_field);
+			$original_checked = false;
+			
+			$foreign_key = $event->getEventParam('foreign_key'); // in case if whole stylesheet is cloned
+			if($foreign_key === false) $foreign_key = $object->GetDBField('StylesheetId'); // in case if selector is copied ifself
+			
+			do {
+				if ( preg_match('/(.*)-([\d]+)/', $new_name, $regs) ) {
+					$new_name = $regs[1].'-'.($regs[2]+1);
+				}
+				elseif ($original_checked) {
+					$new_name = $new_name.'-1';
+				}
+				
+				// if we are cloning in temp table this will look for names in temp table, 
+				// since object' TableName contains correct TableName (for temp also!)
+				// if we are cloning live - look in live
+				$query = '	SELECT '.$title_field.' 
+							FROM '.$object->TableName.'
+							WHERE '.$title_field.' = '.$this->Conn->qstr($new_name).' AND StylesheetId = '.$foreign_key;
+				
+				$res = $this->Conn->GetOne($query);
+				
+				/*// if not found in live table, check in temp table if applicable
+				if ($res === false && $object->Special == 'temp') {
+					$query = 'SELECT '.$name_field.' FROM '.$this->GetTempName($master['TableName']).'
+										WHERE '.$name_field.' = '.$this->Conn->qstr($new_name);
+					$res = $this->Conn->GetOne($query);
+				}*/
+				
+				$original_checked = true;
+			} while ($res !== false);
+			$object->SetDBField($title_field, $new_name);
+		}
+		
+		/**
 		 * Show base styles or block styles
 		 *
 		 * @param kEvent $event
@@ -205,8 +253,7 @@
 			$parent_info = $object->getLinkedInfo();
 			$title_field = $this->Application->getUnitOption($event->Prefix,'TitleField');
 			$sql = 'SELECT '.$title_field.', '.$object->IDField.' FROM '.$object->TableName.' WHERE Type = 1 AND StylesheetId = '.$parent_info['ParentId'].' ORDER BY '.$title_field;
-			$object->Fields['ParentId']['options'] = array_merge_recursive2($object->Fields['ParentId']['options'],
-																				$this->Conn->GetCol($sql,$object->IDField) );
+			$object->Fields['ParentId']['options'] = $this->Conn->GetCol($sql,$object->IDField);
 		}
 		
 		/**
Index: branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/stylesheets_list.tpl
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/stylesheets_list.tpl	(.../stylesheets_list.tpl)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/stylesheets_list.tpl	(.../stylesheets_list.tpl)	(revision 4367)
@@ -19,39 +19,39 @@
   			}
   		
   			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('new_style', '<inp2:m_phrase label="la_ToolTip_NewStylesheet"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_style', '<inp2:m_phrase label="la_ToolTip_NewStylesheet" escape="1"/>',
 						function() {
 							std_precreate_item('css', 'stylesheets/stylesheets_edit')
 						} ) );
 				
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit"/>', edit) );
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete"/>',
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('css')
 						} ) );
 				
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 				
-				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
 							submit_event('css','OnMassApprove');
 						}
 				 ) );
 				
-				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
 							submit_event('css','OnMassDecline');
 						}
 				 ) ); 
 				
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 				
-				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
 						submit_event('css','OnMassClone');
 						}
 				 ) );
 				 		
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 				
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 						show_viewmenu(a_toolbar,'view');
 						}
 				) );
Index: branches/unlabeled/unlabeled-1.3.4/core/units/config_search/config_search_event_handler.php
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.3.4/core/units/config_search/config_search_event_handler.php	(.../config_search_event_handler.php)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.3.4/core/units/config_search/config_search_event_handler.php	(.../config_search_event_handler.php)	(revision 4367)
@@ -81,7 +81,7 @@
 		
 			$is_new = $event->MasterEvent->getEventParam('IsNew');
 			
-			
+			// TODO: direct access to private attributes of object is prohibited
 			$cf_search = array();			
 			$cf_search['DisplayOrder'] = $cf_object->FieldValues['DisplayOrder'];
 			$cf_search['ElementType'] = $cf_object->FieldValues['ElementType'];
Index: branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 4367)
@@ -23,19 +23,19 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('selectors','OnSaveStyle');
 						}
 					) );
 					
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							window.close();
 						}
 				 ) );
 				
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 				
-				a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
 							submit_event('selectors','OnResetToBase');
 						}
 				) );
Index: branches/unlabeled/unlabeled-1.3.2/core/units/stylesheets/stylesheets_config.php
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.3.2/core/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.3.2/core/units/stylesheets/stylesheets_config.php	(.../stylesheets_config.php)	(revision 4367)
@@ -61,7 +61,7 @@
 											),
 					
 					'TableName'			=>	TABLE_PREFIX.'Stylesheets',
-					'SubItems' => Array('selectors'),
+					'SubItems' => Array('selectorsbase', 'selectorsblock'),
 					
 					'FilterMenu'		=>	Array(
 												'Groups' => Array(
Index: branches/unlabeled/unlabeled-1.4.2/core/units/selectors/selectors_config.php
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.4.2/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.4.2/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 4367)
@@ -7,6 +7,23 @@
 					'EventHandlerClass'	=>	Array('class'=>'SelectorsEventHandler','file'=>'selectors_event_handler.php','build_event'=>'OnBuild'),
 					'TagProcessorClass' =>	Array('class'=>'SelectorsTagProcessor','file'=>'selectors_tag_processor.php','build_event'=>'OnBuild'),
 					'AutoLoad'			=>	true,
+					
+					'Clones'		=>	Array(
+												'selectorsbase'	=>	Array(
+																			'Hooks'		=>	Array(),
+																			'Constrain' => 'Type = 1',
+																			'SubItems'	=>	Array('selectorsblock'),
+																	),
+																	
+												'selectorsblock'	=>	Array(
+																				'Hooks'				=>	Array(),
+																				'Constrain'			=>	'Type = 2',
+																				'ForeignKey' 		=> 	Array('css' => 'StylesheetId', 'selectorsbase' => 'ParentId'),
+																				'ParentTableKey' 	=> 	Array('css' => 'StylesheetId', 'selectorsbase' => 'SelectorId'),
+																				'ParentPrefix'		=>	'selectorsbase',
+																	),
+											),
+					
 					'Hooks'	=>	Array( 
 												Array(
 													'Mode' => hAFTER,
@@ -58,10 +75,6 @@
 					'ParentPrefix' 		=> 	'css', 
 					'AutoDelete'		=>	true,
 					'AutoClone'			=>	true,
-					
-					'Constrain'			=>	'Type = 1',
-					'SubItems'			=>	Array('SAME: Type=2'),
-					'ForeignKey1'	=>	'ParentId',
 															
 					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.*
 															FROM %s',
@@ -75,14 +88,14 @@
 															),																		
 					'Fields' => Array(
 										'SelectorId' => Array(),
-										'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'not_null' => '1','default' => '0'),
+										'StylesheetId' => Array('type' => 'int', 'unique'=>Array('SelectorName'), 'current_table_only' => 1, 'not_null' => '1','default' => '0'),
 										'Name' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
-										'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'not_null' => '1','default' => '','required'=>1),
+										'SelectorName' => Array('type' => 'string', 'unique'=>Array('StylesheetId'), 'current_table_only' => 1, 'not_null' => '1','default' => '','required'=>1),
 										'SelectorData' => Array('not_null' => '1','default' => ''),
 										'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
 										'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'),
 										'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''),
-										'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0=>''), 'not_null' => '1','default' => '0'),
+										'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'required' => 1, 'not_null' => '1','default' => '0'),
 								),
 
 					'VirtualFields'	=> 	Array(
Index: branches/unlabeled/unlabeled-1.2.4/core/units/selectors/selectors_tag_processor.php
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.2.4/core/units/selectors/selectors_tag_processor.php	(.../selectors_tag_processor.php)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.2.4/core/units/selectors/selectors_tag_processor.php	(.../selectors_tag_processor.php)	(revision 4367)
@@ -67,7 +67,7 @@
 			$block_params['field'] = $params['field'];
 			$block_params['pass_params'] = 'true';
 
-			$selected_param_name = $params['selected_param'];
+			$selected_param_name = getArrayValue($params, 'selected_param');
 			if (!$selected_param_name) $selected_param_name = $params['selected'];
 			$selected = $params['selected'];
 
Index: branches/unlabeled/unlabeled-1.3.4/core/admin_templates/stylesheets/stylesheets_edit.tpl
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.3.4/core/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.3.4/core/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 4367)
@@ -15,22 +15,22 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('css','<inp2:css_SaveEvent/>');
 						}
 					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('css','OnCancelEdit');
 						}
 				 ) );
 				
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 				
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('css', '<inp2:css_PrevId/>');
 						}
 				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('css', '<inp2:css_NextId/>');
 						}
 				 ) );
Index: branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 4367)
@@ -14,11 +14,11 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('selectors','<inp2:selectors_SaveEvent/>');
 						}
 					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('selectors','OnCancel');
 						}
 				 ) );
Index: branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/stylesheets_edit_base.tpl
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 4367)
@@ -15,29 +15,29 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 						submit_event('css','<inp2:css_SaveEvent/>');
 						}
 					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('css','OnCancelEdit');
 						}
 				 ) );
 				
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 				
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 							go_to_id('css', '<inp2:css_PrevId/>');
 						}
 				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 							go_to_id('css', '<inp2:css_NextId/>');
 						}
 				 ) );
 				 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 				 
-				a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBaseStyle"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_selector', '<inp2:m_phrase label="la_ToolTip_NewBaseStyle" escape="1"/>',
 						function() {
 							set_hidden_field('remove_specials[selectors.base]',1);
 							std_new_item('selectors.base', 'stylesheets/base_style_edit') 
@@ -49,23 +49,23 @@
 	  				std_edit_temp_item('selectors.base', 'stylesheets/base_style_edit');
 	  			}
 						
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit"/>', edit) );
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete"/>',
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('selectors.base')
 						} ) );
 				
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 				
-				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
 						set_hidden_field('remove_specials[selectors.base]',1);
 						submit_event('selectors.base','OnMassClone');
 						}
 				 ) );
 						
 				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
 				 
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
 				) );
Index: branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.4.4/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 4367)
@@ -14,18 +14,18 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 							submit_event('selectors','<inp2:selectors_SaveEvent/>');
 						}
 					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 							submit_event('selectors','OnCancel');
 						}
 				 ) );
 				
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 				
-				a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('reset_to_base', '<inp2:m_phrase label="la_ToolTip_ResetToBase" escape="1"/>', function() {
 							submit_event('selectors','OnResetToBase');
 						}
 				) );
Index: branches/unlabeled/unlabeled-1.2.2/core/units/stylesheets/stylesheets_item.php
===================================================================
diff -u -r2326 -r4367
--- branches/unlabeled/unlabeled-1.2.2/core/units/stylesheets/stylesheets_item.php	(.../stylesheets_item.php)	(revision 2326)
+++ branches/unlabeled/unlabeled-1.2.2/core/units/stylesheets/stylesheets_item.php	(.../stylesheets_item.php)	(revision 4367)
@@ -1,14 +1,14 @@
 <?php
 
-	class StylesheetsItem extends kDBItem 
+	class StylesheetsItem extends kDBItem
 	{
 		function Compile()
 		{
 			$this->Application->setUnitOption('selectors', 'AutoLoad', false);
 			$selector_item =& $this->Application->recallObject('selectors.item', 'selectors', Array('live_table'=>true) );
 			$parent_field = $this->Application->getUnitOption($selector_item->Prefix, 'ForeignKey');
 
-			$sql_template = 'SELECT '.$selector_item->IDField.' FROM '.$selector_item->TableName.' WHERE '.$parent_field.' = %s';
+			$sql_template = 'SELECT '.$selector_item->IDField.' FROM '.$selector_item->TableName.' WHERE '.$parent_field.' = %s ORDER BY SelectorName ASC';
 
 			$selectors_ids = $this->Conn->GetCol( sprintf($sql_template, $this->GetID() ) );
 			$ret = '/* This file is generated automatically. Don\'t edit it manually ! */'."\n\n";
@@ -21,8 +21,8 @@
 
 			$ret .= $this->GetDBField('AdvancedCSS');
 
-			$compile_ts = time();
-			$css_path = DOC_ROOT.BASE_PATH.'/kernel/stylesheets/';
+			$compile_ts = adodb_mktime();
+			$css_path = FULL_PATH.'/kernel/stylesheets/';
 
 			$css_file = $css_path.strtolower($this->GetDBField('Name')).'-'.$compile_ts.'.css';