merge from 3.0 branch till 1656.

1 files changed, 25 insertions, 4 deletions

diff --git a/demos/quickstart/protected/pages/Controls/Samples/THtmlArea/Home.page b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea/Home.page
index 190a4aec..7b6e35bc 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/THtmlArea/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea/Home.page
@@ -14,12 +14,33 @@ THtmlArea with default settings:
 </td></tr>

 

 <tr><td class="samplenote">

-THtmlArea with customized size and table toolbar:

+Full featured THtmlArea example 

 </td><td class="sampleaction">

-<com:THtmlArea ID="HtmlArea2" Width="500px" Height="250px">

+<com:THtmlArea ID="HtmlArea2" Width="670px" Height="300px">

   <prop:Options>

-    plugins : "table"

-  	theme_advanced_buttons3 : "tablecontrols"

+		theme : "advanced",

+		plugins : "devkit,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras",

+		theme_advanced_buttons1_add_before : "save,newdocument,separator,styleselect",

+		theme_advanced_buttons1_add : "separator,insertdate,inserttime,preview,separator,advsearchreplace",

+		theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator",

+		theme_advanced_buttons3 : "tablecontrols,separator,emotions,iespell,media,advhr,separator,print,separator,ltr,rtl,separator,fullscreen",

+		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,|,visualchars,nonbreaking",

+		theme_advanced_toolbar_location : "top",

+		theme_advanced_toolbar_align : "left",

+		theme_advanced_path_location : "bottom",

+		content_css : "example_full.css",

+	    plugin_insertdate_dateFormat : "%Y-%m-%d",

+	    plugin_insertdate_timeFormat : "%H:%M:%S",

+		extended_valid_elements : "hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",

+		external_link_list_url : "example_link_list.js",

+		external_image_list_url : "example_image_list.js",

+		flash_external_list_url : "example_flash_list.js",

+		media_external_list_url : "example_media_list.js",

+		file_browser_callback : "fileBrowserCallBack",

+		theme_advanced_resize_horizontal : false,

+		theme_advanced_resizing : true,

+		nonbreaking_force_tab : true,

+		apply_source_formatting : true

   </prop:Options>

 </com:THtmlArea>

 <com:TButton Text="Submit" OnClick="button2Clicked" />