Index: /FCKeditor.Net/trunk/_samples/aspx/1.1/sample01.aspx
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/1.1/sample01.aspx	(revision 1200)
+++ /FCKeditor.Net/trunk/_samples/aspx/1.1/sample01.aspx	(revision 1201)
@@ -1,3 +1,4 @@
-<%@ Page ValidateRequest="false" Language="C#" AutoEventWireup="false" %>
+<%@ Page Language="C#" AutoEventWireup="false" %>
+
 <%@ Register TagPrefix="FCKeditorV2" Namespace="FredCK.FCKeditorV2" Assembly="FredCK.FCKeditorV2" %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -25,6 +26,9 @@
 --%>
 <script runat="server" language="C#">
-	// This sample doesnt use a code behind file to avoid the user to have to compile
-	// the page to run it.
+
+	// In this page, we are placing all server side code inline to the page, to
+	// avoid having to compile the page in your web site to run it.
+	// Of course it would work in the same way with Code Behind.
+
 	protected override void OnLoad(EventArgs e)
 	{
@@ -35,34 +39,68 @@
 		int iIndex = sPath.LastIndexOf( "_samples") ;
 		FCKeditor1.BasePath = sPath.Remove( iIndex, sPath.Length - iIndex  ) ;
+
+		if ( Page.IsPostBack )
+			return;
+
+		// Set the startup editor value.
+		FCKeditor1.Value = "<p>This is some <strong>sample text</strong>. You are using <a href=\"http://www.fckeditor.net/\">FCKeditor</a>.</p>";
 	}
+
+	protected void BtnSubmit_Click( object sender, EventArgs e )
+	{
+		// For sample purposes, print the editor value at the bottom of the
+		// page. Note that we are encoding the value, so it will be printed as
+		// is, intead of rendering it.
+		LblPostedData.Text = HttpUtility.HtmlEncode( FCKeditor1.Value );
+
+		// Make the posted data block visible.
+		PostedDataBlock.Visible = true;
+		PostedAlertBlock.Visible = true;
+	}
+
 </script>
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	window.status = editorInstance.Description ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - ASP.Net - Sample 1</h1>
-		This sample displays a normal HTML form with an FCKeditor with full features 
-		enabled.
-		<br>
-		No code behind is used so you don't need to compile the ASPX pages to make it 
-		work. All other samples use code behind.
-		<hr>
-		<form action="sampleposteddata.aspx" method="post" target="_blank">
-			<FCKeditorV2:FCKeditor id="FCKeditor1" runat="server" value='This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.'></FCKeditorV2:FCKeditor>
-			<br>
-			<input type="submit" value="Submit">
-		</form>
-	</body>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>FCKeditor - Sample</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<link href="../sample.css" rel="stylesheet" type="text/css" />
+	<style type="text/css">
+		pre { background-color: #f5f5f5; padding: 5px; border: #d3d3d3 1px solid; }
+	</style>
+</head>
+<body>
+	<form runat="server">
+		<h1>
+			FCKeditor - ASP.NET - Sample 1
+		</h1>
+		<p>
+			This sample displays a normal HTML form with an FCKeditor with full features enabled.
+		</p>
+		<p>
+			No code behind is used so you don't need to compile the ASPX pages to make it work.
+			All other samples use code behind.
+		</p>
+		<p id="PostedAlertBlock" style="color: Red" runat="server" visible="false">
+			The posted data has been printed at the bottom of the page.
+		</p>
+		<p>
+			<!---
+				Here we have the FCKeditor component tag. It has been created
+				by dragging the FCKeditor icon from the toolbar to the page, in design mode.
+			--->
+			<FCKeditorV2:FCKeditor ID="FCKeditor1" runat="server">
+			</FCKeditorV2:FCKeditor>
+		</p>
+		<p>
+			<asp:Button ID="BtnSubmit" runat="server" OnClick="BtnSubmit_Click" Text="Submit" />
+		</p>
+	</form>
+	<div id="PostedDataBlock" runat="server" visible="false">
+		<p>
+			Posted data:
+		</p>
+		<pre><asp:Label ID="LblPostedData" runat="server"></asp:Label></pre>
+	</div>
+</body>
 </html>
Index: /FCKeditor.Net/trunk/_samples/aspx/1.1/sample02.aspx
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/1.1/sample02.aspx	(revision 1200)
+++ /FCKeditor.Net/trunk/_samples/aspx/1.1/sample02.aspx	(revision 1201)
@@ -1,5 +1,6 @@
-<%@ Page ValidateRequest="false" language="c#" Codebehind="sample02.aspx.cs" Inherits="FredCK.FCKeditorV2.Samples.Sample02" AutoEventWireup="false" %>
-<%@ Register TagPrefix="fckeditorv2" Namespace="FredCK.FCKeditorV2" Assembly="FredCK.FCKeditorV2" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ Page language="c#" Codebehind="sample02.aspx.cs" AutoEventWireup="false" Inherits="FredCK.FCKeditorV2.Samples.Sample02" %>
+
+<%@ Register Assembly="FredCK.FCKeditorV2" Namespace="FredCK.FCKeditorV2" TagPrefix="FCKeditorV2" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
@@ -24,37 +25,129 @@
  * Sample page.
 --%>
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css">
-		<script type="text/javascript">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>FCKeditor - Sample</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<link href="../sample.css" rel="stylesheet" type="text/css" />
+	<style type="text/css">
+		pre { background-color: #f5f5f5; padding: 5px; border: #d3d3d3 1px solid; }
+	</style>
+	<script type="text/javascript">
 
+//
+// Here we are using JavaScript to retrieve the available languages from
+// FCKeditor. This is completely optional and is needed onl for sample purposes.
+//
+// It shows also how to interact with the editor instance through JavaScript.
+//
+
+/**
+ * FCKeditor_OnComplete is a special function which is called when an FCKeditor
+ * instance is loaded on the page and available for code interaction.
+ */
 function FCKeditor_OnComplete( editorInstance )
 {
-	window.status = editorInstance.Description ;
+	// Get the language combo.
+	var combo = document.getElementById( 'xLanguages' ) ;
+
+	// Remove all options. (#1399)
+	combo.innerHTML = '' ;
+	
+	// Retrieve the available languages object.
+	var availableLanguages = editorInstance.Language.AvailableLanguages ;
+	
+	// Fill an array with all available languages.
+	var languages = new Array() ;
+	for ( code in availableLanguages )
+		languages.push( { Code : code, Name : availableLanguages[code] } ) ;
+
+	// Sort the array using a custom comparison function.
+	languages.sort( SortLanguage ) ;
+
+	// Add all languages to the combo.
+	for ( var i = 0 ; i < languages.length ; i++ )
+		AddComboOption( combo, languages[i].Name + ' (' + languages[i].Code + ')', languages[i].Code ) ;
+	
+	// Set the combo value to the current language.
+	combo.value = editorInstance.Language.ActiveLanguage.Code ;
+	
+	combo.style.visibility = '' ;
 }
 
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - ASP.Net - Sample 2</h1>
-		This sample displays a normal HTML form with an FCKeditor with full features 
-		enabled.
-		<br>
-		The only difference from sample01 is that this page uses code behind and the 
-		submitted data is shown in the page itself.
-		<hr>
-		<form method="post" runat="server">
-			<FCKeditorV2:FCKeditor id="FCKeditor1" runat="server" />
-			<br>
-			<input id="btnSubmit" type="submit" value="Submit" runat="server">
-		</form>
-		<div id="eSubmittedDataBlock" runat="server">
-			<hr>
-			This is the submitted data:<br>
-			<textarea id="txtSubmitted" runat="server" rows="10" cols="60" style="WIDTH: 100%" readonly></textarea>
+/**
+ * Custom function to sort the language entries.
+ */
+function SortLanguage( langA, langB )
+{
+	return ( langA.Name < langB.Name ? -1 : langA.Name > langB.Name ? 1 : 0 ) ;
+}
+
+/**
+ * Utility function to append options in a <select> element.
+ */
+function AddComboOption( combo, optionText, optionValue )
+{
+	var option = document.createElement( 'option' ) ;
+
+	combo.options.add( option ) ;
+
+	option.innerHTML = optionText ;
+	option.value     = optionValue ;
+
+	return option ;
+}
+
+/**
+ * Reloads the page, passing the specified language code in the querystring.
+ */
+function ChangeLanguage( languageCode )
+{
+	window.location.href = window.location.pathname + "?lang=" + languageCode ;
+}
+
+	</script>
+</head>
+<body>
+	<form runat="server">
+		<h1>
+			FCKeditor - ASP.NET - Sample 2</h1>
+		<p>
+			This sample shows the editor in all its available languages.
+		</p>
+		<hr />
+		<table cellpadding="0" cellspacing="0" border="0">
+			<tr>
+				<td>
+					Select a language:&nbsp;
+				</td>
+				<td>
+					<select id="xLanguages" onchange="ChangeLanguage(this.value);" style="visibility: hidden">
+						<option>&nbsp;</option>
+					</select>
+				</td>
+			</tr>
+		</table>
+		<p id="PostedAlertBlock" style="color: Red" runat="server" visible="false">
+			The posted data has been printed at the bottom of the page.
+		</p>
+		<div style="margin-top: 10px;">
+			<!---
+				Here we have the FCKeditor component tag. It has been created
+				by dragging the FCKeditor icon from the toolbar to the page, in design mode.
+			--->
+			<FCKeditorV2:FCKeditor ID="FCKeditor1" runat="server">
+			</FCKeditorV2:FCKeditor>
 		</div>
-	</body>
+		<p>
+			<asp:Button ID="BtnSubmit" runat="server" Text="Submit" OnClick="BtnSubmit_Click" />
+		</p>
+		<div id="PostedDataBlock" runat="server" visible="false">
+			<p>
+				Posted data:
+			</p>
+			<pre><asp:Label ID="LblPostedData" runat="server"></asp:Label></pre>
+		</div>
+	</form>
+</body>
 </html>
Index: /FCKeditor.Net/trunk/_samples/aspx/1.1/sample02.aspx.cs
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/1.1/sample02.aspx.cs	(revision 1200)
+++ /FCKeditor.Net/trunk/_samples/aspx/1.1/sample02.aspx.cs	(revision 1201)
@@ -14,30 +14,39 @@
 	public class Sample02 : System.Web.UI.Page
 	{
-		protected System.Web.UI.HtmlControls.HtmlTextArea txtSubmitted;
-		protected System.Web.UI.HtmlControls.HtmlInputButton btnSubmit;
-		protected System.Web.UI.HtmlControls.HtmlGenericControl eSubmittedDataBlock;
-
 		protected FredCK.FCKeditorV2.FCKeditor FCKeditor1;
+		protected System.Web.UI.WebControls.Button BtnSubmit;
+		protected System.Web.UI.WebControls.Label LblPostedData;
+		protected System.Web.UI.HtmlControls.HtmlGenericControl PostedAlertBlock;
+		protected System.Web.UI.HtmlControls.HtmlGenericControl PostedDataBlock;
 	
 		private void Page_Load(object sender, System.EventArgs e)
 		{
-			// We'll do initializartion settings in the editor only the first time.
-			// Once the page is submitted, nothing must be done in the OnLoad.
+			// Set the base path. This is the URL path for the FCKeditor
+			// installations. By default "/fckeditor/".
+			FCKeditor1.BasePath = this.GetBasePath();
+
+			if ( Request.QueryString[ "lang" ] != null )
+			{
+				// Disable the language automatic detection (note that we always use strings).
+				FCKeditor1.Config[ "AutoDetectLanguage" ] = "false";
+
+				// Set the language to the querystring value.
+				FCKeditor1.Config[ "DefaultLanguage" ] = Request.QueryString[ "lang" ];
+			}
+			else
+			{
+				// Enable language automatic detection (default).
+				FCKeditor1.Config[ "AutoDetectLanguage" ] = "true";
+
+				// Set the default language to English (default). Used if the user
+				//language is not available in FCKeditor.
+				FCKeditor1.Config[ "DefaultLanguage" ] = "en";
+			}
+
 			if ( Page.IsPostBack )
-				return ;
+				return;
 
-			eSubmittedDataBlock.Visible = false ;
-
-			// Automatically calculates the editor base path based on the _samples directory.
-			// This is usefull only for these samples. A real application should use something like this:
-			// FCKeditor1.BasePath = '/FCKeditor/' ;	// '/FCKeditor/' is the default value.
-			string sPath = Request.Url.AbsolutePath ;
-			int iIndex = sPath.LastIndexOf( "_samples") ;
-			sPath = sPath.Remove( iIndex, sPath.Length - iIndex  ) ;
-			
-			FCKeditor1.BasePath = sPath ;
-			FCKeditor1.Value = "This is some <strong>sample text</strong>. You are using <a href=\"http://www.fckeditor.net/\">FCKeditor</a>." ;
-			FCKeditor1.ImageBrowserURL	= sPath + "editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/aspx/connector.aspx" ;
-			FCKeditor1.LinkBrowserURL	= sPath + "editor/filemanager/browser/default/browser.html?Connector=connectors/aspx/connector.aspx" ;
+			// Set the startup editor value.
+			FCKeditor1.Value = "<p>This is some <strong>sample text</strong>. You are using <a href=\"http://www.fckeditor.net/\">FCKeditor</a>.</p>";
 		}
 
@@ -50,9 +59,4 @@
 			InitializeComponent();
 			base.OnInit(e);
-
-			// This events declarations has been moved to the "OnInit" method
-			// to avoid a bug in Visual Studio to delete then without any advice.
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.btnSubmit.ServerClick += new System.EventHandler(this.btnSubmit_ServerClick);
 		}
 		
@@ -63,12 +67,35 @@
 		private void InitializeComponent()
 		{    
+			this.BtnSubmit.Click += new System.EventHandler(this.BtnSubmit_Click);
+			this.Load += new System.EventHandler(this.Page_Load);
 
 		}
 		#endregion
 
-		private void btnSubmit_ServerClick(object sender, System.EventArgs e)
+		/// <summary>
+		/// Automatically calculates the editor base path based on the _samples
+		/// directory. This is usefull only for these samples. A real application
+		/// should use something like this instead:
+		/// <code>
+		/// FCKeditor1.BasePath = "/fckeditor/" ;	// "/fckeditor/" is the default value.
+		/// </code>
+		/// </summary>
+		private string GetBasePath()
 		{
-			eSubmittedDataBlock.Visible = true ;
-			txtSubmitted.Value = HttpUtility.HtmlEncode( FCKeditor1.Value ) ;
+			string path = Request.Url.AbsolutePath;
+			int index = path.LastIndexOf( "_samples" );
+			return path.Remove( index, path.Length - index );
+		}
+
+		protected void BtnSubmit_Click( object sender, EventArgs e )
+		{
+			// For sample purposes, print the editor value at the bottom of the
+			// page. Note that we are encoding the value, so it will be printed as
+			// is, intead of rendering it.
+			LblPostedData.Text = HttpUtility.HtmlEncode( FCKeditor1.Value );
+
+			// Make the posted data block visible.
+			PostedDataBlock.Visible = true;
+			PostedAlertBlock.Visible = true;
 		}
 	}
Index: Keditor.Net/trunk/_samples/aspx/1.1/sample03.ascx
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/1.1/sample03.ascx	(revision 1200)
+++ 	(revision )
@@ -1,3 +1,0 @@
-<%@ Register TagPrefix="fckeditorv2" Namespace="FredCK.FCKeditorV2" Assembly="FredCK.FCKeditorV2" %>
-<%@ Control Language="c#" AutoEventWireup="false" Codebehind="sample03.ascx.cs" Inherits="FredCK.FCKeditorV2.Samples.sample031" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
-<FCKeditorV2:FCKeditor id="FCKeditor1" ImageBrowserURL="editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/aspx/connector.aspx" runat="server" />
Index: Keditor.Net/trunk/_samples/aspx/1.1/sample03.ascx.cs
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/1.1/sample03.ascx.cs	(revision 1200)
+++ 	(revision )
@@ -1,63 +1,0 @@
-namespace FredCK.FCKeditorV2.Samples
-{
-	using System;
-	using System.Data;
-	using System.Drawing;
-	using System.Web;
-	using System.Web.UI.WebControls;
-	using System.Web.UI.HtmlControls;
-
-	public class sample031 : System.Web.UI.UserControl
-	{
-		protected FredCK.FCKeditorV2.FCKeditor FCKeditor1 ;
-
-		private void Page_Load(object sender, System.EventArgs e)
-		{
-			// We'll do initializartion settings in the editor only the first time.
-			// Once the page is submitted, nothing must be done in the OnLoad.
-			if ( Page.IsPostBack )
-				return ;
-
-			// Automatically calculates the editor base path based on the _samples directory.
-			// This is usefull only for these samples. A real application should use something like this:
-			// FCKeditor1.BasePath = '/FCKeditor/' ;	// '/FCKeditor/' is the default value.
-			string sPath = Request.Url.AbsolutePath ;
-			int iIndex = sPath.LastIndexOf( "_samples") ;
-			sPath = sPath.Remove( iIndex, sPath.Length - iIndex  ) ;
-			
-			FCKeditor1.BasePath = sPath ;
-			FCKeditor1.Value = "This is some <strong>sample text</strong>. You are using <a href=\"http://www.fckeditor.net/\">FCKeditor</a>." ;
-			FCKeditor1.ImageBrowserURL	= sPath + "editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/aspx/connector.aspx" ;
-			FCKeditor1.LinkBrowserURL	= sPath + "editor/filemanager/browser/default/browser.html?Connector=connectors/aspx/connector.aspx" ;
-		}
-
-		public string GetFCKeditorValue()
-		{
-			return FCKeditor1.Value ;
-		}
-
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-
-			// This events declarations has been moved to the "OnInit" method
-			// to avoid a bug in Visual Studio to delete then without any advice.
-			this.Load += new System.EventHandler(this.Page_Load);
-		}
-		
-		/// <summary>
-		///		Required method for Designer support - do not modify
-		///		the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-
-		}
-		#endregion
-	}
-}
Index: Keditor.Net/trunk/_samples/aspx/1.1/sample03.ascx.resx
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/1.1/sample03.ascx.resx	(revision 1200)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 1.3
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">1.3</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1">this is my long string</data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        [base64 mime encoded serialized .NET Framework object]
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        [base64 mime encoded string representing a byte array form of the .NET Framework object]
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used forserialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>1.3</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </data>
-</root>
Index: /FCKeditor.Net/trunk/_samples/aspx/1.1/sample03.aspx
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/1.1/sample03.aspx	(revision 1200)
+++ /FCKeditor.Net/trunk/_samples/aspx/1.1/sample03.aspx	(revision 1201)
@@ -1,5 +1,6 @@
-<%@ Page language="c#" Codebehind="sample03.aspx.cs" AutoEventWireup="false" Inherits="FredCK.FCKeditorV2.Samples.sample03" %>
-<%@ Register TagPrefix="uc1" TagName="sample03" Src="sample03.ascx" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ Page language="c#" Codebehind="sample03.aspx.cs" AutoEventWireup="false" Inherits="FredCK.FCKeditorV2.Samples.Sample03" %>
+
+<%@ Register Assembly="FredCK.FCKeditorV2" Namespace="FredCK.FCKeditorV2" TagPrefix="FCKeditorV2" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
@@ -24,38 +25,55 @@
  * Sample page.
 --%>
-<html>
-	<head>
-		<title>FCKeditor - Sample</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css">
-		<script type="text/javascript">
-
-function FCKeditor_OnComplete( editorInstance )
-{
-	window.status = editorInstance.Description ;
-}
-
-		</script>
-	</head>
-	<body>
-		<h1>FCKeditor - ASP.Net - Sample 3</h1>
-		This sample displays a normal HTML form with an FCKeditor with full features 
-		enabled.
-		<br>
-		The only difference from sample02 is that this page uses a custom control that 
-		includes the editor in the back. This is a test page to see if the editor works 
-		over a control tree hierarchy.
-		<hr>
-		<form method="post" runat="server">
-			<uc1:sample03 id="MyCustomControl" runat="server"></uc1:sample03>
-			<br>
-			<input id="btnSubmit" type="submit" value="Submit" runat="server">
-		</form>
-		<div id="eSubmittedDataBlock" runat="server">
-			<hr>
-			This is the submitted data:<br>
-			<textarea id="txtSubmitted" runat="server" rows="10" cols="60" style="WIDTH: 100%" readonly></textarea>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>FCKeditor - Sample</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<link href="../sample.css" rel="stylesheet" type="text/css" />
+	<style type="text/css">
+		pre { background-color: #f5f5f5; padding: 5px; border: #d3d3d3 1px solid; }
+	</style>
+</head>
+<body>
+	<form runat="server">
+		<h1>
+			FCKeditor - ASP.NET - Sample 3</h1>
+		<div>
+			This sample shows how to change the editor toolbar.
 		</div>
-	</body>
+		<hr />
+		<table cellpadding="0" cellspacing="0" border="0">
+			<tr>
+				<td style="height: 21px">
+					Select the toolbar to load:&nbsp;
+				</td>
+				<td style="height: 21px">
+					<asp:DropDownList ID="cmbToolbars" runat="server" AutoPostBack="True" OnSelectedIndexChanged="cmbToolbars_SelectedIndexChanged">
+						<asp:ListItem Selected="True">Default</asp:ListItem>
+						<asp:ListItem>Basic</asp:ListItem>
+					</asp:DropDownList>&nbsp;</td>
+			</tr>
+		</table>
+		<p id="PostedAlertBlock" style="color: Red" runat="server" visible="false">
+			The posted data has been printed at the bottom of the page.
+		</p>
+		<div style="margin-top: 10px;">
+			<!---
+				Here we have the FCKeditor component tag. It has been created
+				by dragging the FCKeditor icon from the toolbar to the page, in design mode.
+			--->
+			<FCKeditorV2:FCKeditor ID="FCKeditor1" runat="server">
+			</FCKeditorV2:FCKeditor>
+		</div>
+		<p>
+			<asp:Button ID="BtnSubmit" runat="server" Text="Submit" OnClick="BtnSubmit_Click" />
+		</p>
+		<div id="PostedDataBlock" runat="server" visible="false">
+			<p>
+				Posted data:
+			</p>
+			<pre><asp:Label ID="LblPostedData" runat="server"></asp:Label></pre>
+		</div>
+	</form>
+</body>
 </html>
Index: /FCKeditor.Net/trunk/_samples/aspx/1.1/sample03.aspx.cs
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/1.1/sample03.aspx.cs	(revision 1200)
+++ /FCKeditor.Net/trunk/_samples/aspx/1.1/sample03.aspx.cs	(revision 1201)
@@ -12,20 +12,28 @@
 namespace FredCK.FCKeditorV2.Samples
 {
-	public class sample03 : System.Web.UI.Page
+	public class Sample03 : System.Web.UI.Page
 	{
-		protected System.Web.UI.HtmlControls.HtmlInputButton btnSubmit;
-		protected System.Web.UI.HtmlControls.HtmlGenericControl eSubmittedDataBlock;
-		protected System.Web.UI.HtmlControls.HtmlTextArea txtSubmitted;
-
-		protected sample031 MyCustomControl ;
+		protected System.Web.UI.WebControls.DropDownList cmbToolbars;
+		protected FredCK.FCKeditorV2.FCKeditor FCKeditor1;
+		protected System.Web.UI.WebControls.Button BtnSubmit;
+		protected System.Web.UI.WebControls.Label LblPostedData;
+		protected System.Web.UI.HtmlControls.HtmlGenericControl PostedAlertBlock;
+		protected System.Web.UI.HtmlControls.HtmlGenericControl PostedDataBlock;
 	
 		private void Page_Load(object sender, System.EventArgs e)
 		{
-			// We'll do initializartion only the first time.
-			// Once the page is submitted, nothing must be done in the OnLoad.
+			// Set the base path. This is the URL path for the FCKeditor
+			// installations. By default "/fckeditor/".
+			FCKeditor1.BasePath = this.GetBasePath();
+
+			LblPostedData.Text = "";
+			PostedAlertBlock.Visible = false;
+			PostedDataBlock.Visible = false;
+
 			if ( Page.IsPostBack )
-				return ;
+				return;
 
-			eSubmittedDataBlock.Visible = false ;
+			// Set the startup editor value.
+			FCKeditor1.Value = "<p>This is some <strong>sample text</strong>. You are using <a href=\"http://www.fckeditor.net/\">FCKeditor</a>.</p>";
 		}
 
@@ -38,9 +46,4 @@
 			InitializeComponent();
 			base.OnInit(e);
-
-			// This events declarations has been moved to the "OnInit" method
-			// to avoid a bug in Visual Studio to delete then without any advice.
-			this.Load += new System.EventHandler(this.Page_Load);
-			this.btnSubmit.ServerClick += new System.EventHandler(this.btnSubmit_ServerClick);
 		}
 		
@@ -51,11 +54,39 @@
 		private void InitializeComponent()
 		{    
+			this.Load += new System.EventHandler(this.Page_Load);
+
 		}
 		#endregion
 
-		private void btnSubmit_ServerClick(object sender, System.EventArgs e)
+		/// <summary>
+		/// Automatically calculates the editor base path based on the _samples
+		/// directory. This is usefull only for these samples. A real application
+		/// should use something like this instead:
+		/// <code>
+		/// FCKeditor1.BasePath = "/fckeditor/" ;	// "/fckeditor/" is the default value.
+		/// </code>
+		/// </summary>
+		private string GetBasePath()
 		{
-			eSubmittedDataBlock.Visible = true ;
-			txtSubmitted.Value = HttpUtility.HtmlEncode( MyCustomControl.GetFCKeditorValue() ) ;
+			string path = Request.Url.AbsolutePath;
+			int index = path.LastIndexOf( "_samples" );
+			return path.Remove( index, path.Length - index );
+		}
+
+		protected void BtnSubmit_Click( object sender, EventArgs e )
+		{
+			// For sample purposes, print the editor value at the bottom of the
+			// page. Note that we are encoding the value, so it will be printed as
+			// is, intead of rendering it.
+			LblPostedData.Text = HttpUtility.HtmlEncode( FCKeditor1.Value );
+
+			// Make the posted data block visible.
+			PostedDataBlock.Visible = true;
+			PostedAlertBlock.Visible = true;
+		}
+
+		protected void cmbToolbars_SelectedIndexChanged( object sender, EventArgs e )
+		{
+			FCKeditor1.ToolbarSet = cmbToolbars.SelectedValue;
 		}
 	}
Index: /FCKeditor.Net/trunk/_samples/aspx/1.1/sample04.aspx
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/1.1/sample04.aspx	(revision 1201)
+++ /FCKeditor.Net/trunk/_samples/aspx/1.1/sample04.aspx	(revision 1201)
@@ -0,0 +1,81 @@
+<%@ Page language="c#" Codebehind="sample04.aspx.cs" AutoEventWireup="false" Inherits="FredCK.FCKeditorV2.Samples.Sample04" %>
+
+<%@ Register Assembly="FredCK.FCKeditorV2" Namespace="FredCK.FCKeditorV2" TagPrefix="FCKeditorV2" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Sample page.
+--%>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>FCKeditor - Sample</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<link href="../sample.css" rel="stylesheet" type="text/css" />
+	<style type="text/css">
+		pre { background-color: #f5f5f5; padding: 5px; border: #d3d3d3 1px solid; }
+	</style>
+</head>
+<body>
+	<form runat="server">
+		<h1>
+			FCKeditor - ASP.NET - Sample 4</h1>
+		<div>
+			This sample shows how to change the editor skin.
+		</div>
+		<hr />
+		<table cellpadding="0" cellspacing="0" border="0">
+			<tr>
+				<td>
+					Select the skin to load:&nbsp;
+				</td>
+				<td>
+					<asp:DropDownList ID="cmbSkin" runat="server" AutoPostBack="True" OnSelectedIndexChanged="cmbSkin_SelectedIndexChanged">
+						<asp:ListItem Selected="True" Value="default">Default</asp:ListItem>
+						<asp:ListItem Value="office2003">Office 2003</asp:ListItem>
+						<asp:ListItem Value="silver">Silver</asp:ListItem>
+					</asp:DropDownList>
+				</td>
+			</tr>
+		</table>
+		<p id="PostedAlertBlock" style="color: Red" runat="server" visible="false">
+			The posted data has been printed at the bottom of the page.
+		</p>
+		<div style="margin-top: 10px;">
+			<!---
+				Here we have the FCKeditor component tag. It has been created
+				by dragging the FCKeditor icon from the toolbar to the page, in design mode.
+			--->
+			<FCKeditorV2:FCKeditor ID="FCKeditor1" runat="server">
+			</FCKeditorV2:FCKeditor>
+		</div>
+		<p>
+			<asp:Button ID="BtnSubmit" runat="server" Text="Submit" OnClick="BtnSubmit_Click" />
+		</p>
+		<div id="PostedDataBlock" runat="server" visible="false">
+			<p>
+				Posted data:
+			</p>
+			<pre><asp:Label ID="LblPostedData" runat="server"></asp:Label></pre>
+		</div>
+	</form>
+</body>
+</html>
Index: /FCKeditor.Net/trunk/_samples/aspx/1.1/sample04.aspx.cs
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/1.1/sample04.aspx.cs	(revision 1201)
+++ /FCKeditor.Net/trunk/_samples/aspx/1.1/sample04.aspx.cs	(revision 1201)
@@ -0,0 +1,94 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Web;
+using System.Web.SessionState;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.HtmlControls;
+
+namespace FredCK.FCKeditorV2.Samples
+{
+	public class Sample04 : System.Web.UI.Page
+	{
+		protected System.Web.UI.WebControls.DropDownList cmbSkin;
+		protected FredCK.FCKeditorV2.FCKeditor FCKeditor1;
+		protected System.Web.UI.WebControls.Button BtnSubmit;
+		protected System.Web.UI.WebControls.Label LblPostedData;
+		protected System.Web.UI.HtmlControls.HtmlGenericControl PostedAlertBlock;
+		protected System.Web.UI.HtmlControls.HtmlGenericControl PostedDataBlock;
+	
+		private void Page_Load(object sender, System.EventArgs e)
+		{
+			// Set the base path. This is the URL path for the FCKeditor
+			// installations. By default "/fckeditor/".
+			FCKeditor1.BasePath = this.GetBasePath();
+
+			LblPostedData.Text = "";
+			PostedAlertBlock.Visible = false;
+			PostedDataBlock.Visible = false;
+
+			if ( Page.IsPostBack )
+				return;
+
+			// Set the startup editor value.
+			FCKeditor1.Value = "<p>This is some <strong>sample text</strong>. You are using <a href=\"http://www.fckeditor.net/\">FCKeditor</a>.</p>";
+		}
+
+		#region Web Form Designer generated code
+		override protected void OnInit(EventArgs e)
+		{
+			//
+			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
+			//
+			InitializeComponent();
+			base.OnInit(e);
+		}
+		
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{    
+			this.Load += new System.EventHandler(this.Page_Load);
+
+		}
+		#endregion
+
+		/// <summary>
+		/// Automatically calculates the editor base path based on the _samples
+		/// directory. This is usefull only for these samples. A real application
+		/// should use something like this instead:
+		/// <code>
+		/// FCKeditor1.BasePath = "/fckeditor/" ;	// "/fckeditor/" is the default value.
+		/// </code>
+		/// </summary>
+		private string GetBasePath()
+		{
+			string path = Request.Url.AbsolutePath;
+			int index = path.LastIndexOf( "_samples" );
+			return path.Remove( index, path.Length - index );
+		}
+
+		protected void BtnSubmit_Click( object sender, EventArgs e )
+		{
+			// For sample purposes, print the editor value at the bottom of the
+			// page. Note that we are encoding the value, so it will be printed as
+			// is, intead of rendering it.
+			LblPostedData.Text = HttpUtility.HtmlEncode( FCKeditor1.Value );
+
+			// Make the posted data block visible.
+			PostedDataBlock.Visible = true;
+			PostedAlertBlock.Visible = true;
+		}
+
+		protected void cmbSkin_SelectedIndexChanged( object sender, EventArgs e )
+		{
+			// Relative to the "editor" folder in the FCKeditor installation.
+			FCKeditor1.Config["SkinPath"] = this.GetBasePath() + "editor/skins/" + cmbSkin.SelectedValue + "/";
+		}
+	}
+}
Index: Keditor.Net/trunk/_samples/aspx/1.1/sampleposteddata.aspx
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/1.1/sampleposteddata.aspx	(revision 1200)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<%@ Page ValidateRequest="false" Language="C#" AutoEventWireup="false" %>
-<%--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This page lists the data posted by a form.
---%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-	<head>
-		<title>FCKeditor - Samples - Posted Data</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<link href="../sample.css" rel="stylesheet" type="text/css" />
-	</head>
-	<body>
-		<h1>FCKeditor - Samples - Posted Data</h1>
-		This page lists all data posted by the form.
-		<hr>
-		<table width="100%" border="1" cellspacing="0" bordercolor="#999999">
-			<tr style="FONT-WEIGHT: bold; COLOR: #dddddd; BACKGROUND-COLOR: #999999">
-				<td noWrap>Field Name&nbsp;&nbsp;</td>
-				<td>Value</td>
-			</tr>
-			<% foreach ( string sForm in Request.Form ) { %>
-			<tr>
-				<td valign="top" nowrap><b><%=sForm%></b></td>
-				<td width="100%"><%=Server.HtmlEncode( Request.Form[sForm] )%></td>
-			</tr>
-			<% } %>
-		</table>
-	</body>
-</html>
Index: /FCKeditor.Net/trunk/_samples/aspx/default.html
===================================================================
--- /FCKeditor.Net/trunk/_samples/aspx/default.html	(revision 1201)
+++ /FCKeditor.Net/trunk/_samples/aspx/default.html	(revision 1201)
@@ -0,0 +1,32 @@
+﻿<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>FCKeditor - Sample</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<link href="../sample.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+	<h1>
+		FCKeditor - ASP.NET - Samples
+	</h1>
+	<p>
+		In the FCKeditor.Net installation package you will find two directories containing
+		examples on how to use FCKeditor in web forms:</p>
+	<ul>
+		<li>_samples/aspx/<strong>1.1</strong> : Samples targetted to the .NET Framework 1.1.</li>
+		<li>_samples/aspx/<strong>2.0</strong> : Samples targetted to the .NET Framework 2.0+.</li>
+	</ul>
+	<p>
+		There directories contain the same exact samples, but you will note some diffences
+		in the code, due to the different way the Code Behind is handled by each of the
+		above .NET Framework versions.</p>
+	<p>
+		To properly run the samples you must copy one of the above folders to the "_<strong>samples</strong>"
+		folder in FCKeditor installation in your web server or Visual Studio project. You
+		may eventualy rename the folder to "aspx", just make it clearer.</p>
+	<p>
+		Remember to copy also the <strong>FredCK.FCKeditorV2.dll</strong> file, provide
+		with FCKeditor.Net, in the <strong>bin</strong> folder of your web site.</p>
+</body>
+</html>
