Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl
===================================================================
diff -u -r7071 -r7090
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl	(.../languages_edit_email_events.tpl)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_email_events.tpl	(.../languages_edit_email_events.tpl)	(revision 7090)
@@ -41,7 +41,7 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', 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 ToolBarSeparator('sep3') );
 
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -r7071 -r7090
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 7090)
@@ -22,7 +22,7 @@
 							std_precreate_item('u', 'proj-base/users/admins_edit')
 						} ) );
 
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', 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('u')
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_list.tpl
===================================================================
diff -u -r7071 -r7090
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_list.tpl	(.../languages_list.tpl)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_list.tpl	(.../languages_list.tpl)	(revision 7090)
@@ -17,12 +17,12 @@
   			}
 
   			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('new_language', '<inp2:m_phrase label="la_ToolTip_NewLanguage" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_language', '<inp2:m_phrase label="la_ToolTip_NewLanguage" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
 						function() {
 							std_precreate_item('lang', 'regional/languages_edit')
 						} ) );
 
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', 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('lang')
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl
===================================================================
diff -u -r7073 -r7090
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 7073)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 7090)
@@ -9,13 +9,14 @@
 			o += '<div style="position: relative; overflow: auto; width: 100%; height: 100%;">';
 			o += el.innerHTML + '</div>';
 			el.innerHTML = o;
-			AdjustScollableArea();
-			addEvent(window, 'resize', AdjustScollableArea)
+			MakeHeight100();
+			addEvent(window, 'resize', MakeHeight100)
 		}
 
-		function AdjustScollableArea()
+		function MakeHeight100(id)
 		{
-			var el = document.getElementById('scroll_container');
+			if (!id) id = 'scroll_container';
+			var el = document.getElementById(id);
 			var h = (document.all ? window.document.body.offsetHeight : window.innerHeight) - el.offsetTop + 'px';
 			var w = (document.all ? window.document.body.offsetWidth : window.innerWidth) - el.offsetLeft + 'px';
 //			alert('h: '+h)
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/user_edit_password.tpl
===================================================================
diff -u -r7071 -r7090
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 7090)
@@ -17,7 +17,7 @@
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('u','OnCancelEdit');
+							cancel_edit('u','OnCancelEdit','<inp2:u_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
 						}
 				 ) );
 
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js
===================================================================
diff -u -r7073 -r7090
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 7073)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 7090)
@@ -1211,4 +1211,14 @@
 		if (confirm(msg)) {
 			submit_event(prefix, event)
 		}
+	}
+
+	function cancel_edit(prefix, cancel_ev, save_ev, msg)
+	{
+		if (confirm(msg)) {
+			submit_event(prefix, save_ev)
+		}
+		else {
+			submit_event(prefix, cancel_ev)
+		}
 	}
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl
===================================================================
diff -u -r7071 -r7090
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 7090)
@@ -41,12 +41,12 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				a_toolbar.AddButton( new ToolBarButton('new_language_var', '<inp2:m_phrase label="la_ToolTip_NewLabel" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_language_var', '<inp2:m_phrase label="la_ToolTip_NewLabel" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
 						function() {
 							std_new_item('phrases', 'regional/phrases_edit')
 						} ) );
 
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', 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')
Index: branches/unlabeled/unlabeled-1.10.2/core/units/categories/categories_item.php
===================================================================
diff -u -r7060 -r7090
--- branches/unlabeled/unlabeled-1.10.2/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 7060)
+++ branches/unlabeled/unlabeled-1.10.2/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 7090)
@@ -5,18 +5,18 @@
 		function Create($force_id=false, $system_create=false)
 		{
 			if (!$this->Validate()) return false;
-			
+
 			$this->SetDBField('ResourceId', $this->Application->NextResourceId());
 			$this->SetDBField('CreatedById', $this->Application->RecallVar('user_id') );
 			$this->SetDBField('CreatedOn_date', adodb_mktime() );
 			$this->SetDBField('CreatedOn_time', adodb_mktime() );
-			
+
 			$this->checkFilename();
 			$this->generateFilename();
 
 			$parent_category = $this->GetDBField('ParentId') > 0 ? $this->GetDBField('ParentId') : $this->Application->GetVar('m_cat_id');
 			$this->SetDBField('ParentId', $parent_category);
-			
+
 			$ret = parent::Create($force_id, $system_create);
 			if ($ret) {
 				$sql = 'UPDATE %s SET ParentPath = %s WHERE CategoryId = %s';
@@ -33,15 +33,15 @@
 		{
 			$this->checkFilename();
 			$this->generateFilename();
-			
+
 			$ret = parent::Update($id, $system_update);
 			return $ret;
 		}
-		
+
 		function buildParentPath()
 		{
 			$parent_id = $this->GetDBField('ParentId');
-			
+
 			if ($parent_id == 0) {
 				$parent_path = '|';
 			}
@@ -50,7 +50,7 @@
 				$sql = 'SELECT ParentPath FROM '.$cat_table.' WHERE CategoryId = %s';
 				$parent_path = $this->Conn->GetOne( sprintf($sql, $parent_id) );
 			}
-			
+
 			return $parent_path.$this->GetID().'|';
 		}
 
@@ -140,7 +140,7 @@
 
 			if ( $name != $this->GetDBField('Filename') ) $this->SetDBField('Filename', $name);
 		}
-		
+
 		/**
 		 * Allows to detect if root category being edited
 		 *
@@ -157,18 +157,18 @@
 					return true;
 				}
 			}
-			
+
 			return false;
 		}
-		
+
 		/**
 		 * Sets correct name to Home category while editing it
 		 *
 		 * @return bool
 		 */
 		function IsNewItem()
 		{
-			if ($this->IsRoot()) {
+			if ($this->IsRoot() && $this->Prefix == 'c') {
 				$title_field = $this->Application->getUnitOption($this->Prefix, 'TitleField');
 				$category_name = $this->Application->Phrase( $this->Application->ConfigValue('Root_Name') );
 				$this->SetDBField($title_field, $category_name);
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -r7071 -r7090
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 7090)
@@ -79,10 +79,11 @@
 	<inp2:m_if check="lang_IsNewMode">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_inc param="tab_index" by="1"/>
-		<td class="text">
+		<td class="label-cell">
 			<inp2:m_phrase name="la_fld_CopyLabels"/>:
 		</td>
-		<td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
 			<input type="hidden" id="<inp2:lang_InputName field="CopyLabels"/>" name="<inp2:lang_InputName field="CopyLabels"/>" value="<inp2:lang_Field field="CopyLabels" db="db"/>">
 			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_CopyLabels" name="_cb_CopyLabels" <inp2:lang_Field field="CopyLabels" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:lang_InputName field="CopyLabels"/>'))">
 
@@ -92,7 +93,7 @@
 				<inp2:lang_PredefinedOptions field="CopyFromLanguage" block="inp_option_item" selected="selected"/>
 			</select>
 		</td>
-		<td class="error">&nbsp;</td>
+		<td class="error-cell">&nbsp;</td>
 	</tr>
 	</inp2:m_if>
 </table>
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js
===================================================================
diff -u -r7071 -r7090
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7090)
@@ -84,19 +84,22 @@
 ToolBarButton.prototype.SetOnMouseOver = function() {
 	this.Container.onmouseover = function() {
 		this.btn.imgObject.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '_f2.gif';
+		this.className = 'toolbar-button-over';
 	};
 }
 
 ToolBarButton.prototype.SetOnMouseOut = function() {
 	this.Container.onmouseout = function() {
 		this.btn.imgObject.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '.gif';
+		this.className = 'toolbar-button';
 	};
 }
 
 ToolBarButton.prototype.SetOnClick = function() {
-	this.Container.onmouseout = function() {
+	// we have SetOnMouseOut for this ???
+	/*this.Container.onmouseout = function() {
 		this.btn.imgObject.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '.gif';
-	};
+	};*/
 	this.Container.inClick = false;
 	if (typeof(this.onClick) != 'function') {
 		this.Container.onclick = function() {
@@ -135,6 +138,7 @@
 	this.Container.onclick = null;
 	this.Container.style.cursor = 'default';
 	this.Enabled = false;
+	this.Container.className = 'toolbar-button-disabled'
 }
 
 ToolBarButton.prototype.Enable = function() {
@@ -144,6 +148,7 @@
 	this.SetOnMouseOut();
 	this.SetOnClick();
 	this.Enabled = true;
+	this.Container.className = 'toolbar-button'
 }
 
 ToolBarButton.prototype.Hide = function() {
@@ -166,7 +171,7 @@
 
 ToolBarSeparator.prototype.GetHTML = function() {
 	var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
-	var padding = this.ToolBar.UseLabels ? '7px' : '2px'
+	var padding = this.ToolBar.UseLabels ? '12px' : '2px'
 	return '<div id="'+this.GetToolID('div')+'" class="toolbar-button" style="padding-top: '+padding+'; height: 32px;" '+add_style+'><img id="' + this.GetToolID() + '" src="' + this.IconsPath() + 'tool_divider.gif"></div>';
 
 	var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -r7073 -r7090
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 7073)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 7090)
@@ -17,7 +17,7 @@
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('u','OnCancelEdit');
+							cancel_edit('u','OnCancelEdit','<inp2:u_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
 						}
 				 ) );