Added TImageMap and TInlineFrame demos.

10 files changed, 135 insertions, 2 deletions

diff --git a/.gitattributes b/.gitattributes
index 67d16d38..fd24bc45 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -194,6 +194,10 @@ demos/quickstart/protected/pages/Controls/Samples/TImage/hello_world.gif -text
 demos/quickstart/protected/pages/Controls/Samples/TImageButton/Home.page -text
 demos/quickstart/protected/pages/Controls/Samples/TImageButton/Home.php -text
 demos/quickstart/protected/pages/Controls/Samples/TImageButton/hello_world.gif -text
+demos/quickstart/protected/pages/Controls/Samples/TImageMap/Home.page -text
+demos/quickstart/protected/pages/Controls/Samples/TImageMap/Home.php -text
+demos/quickstart/protected/pages/Controls/Samples/TImageMap/hotspots.gif -text
+demos/quickstart/protected/pages/Controls/Samples/TInlineFrame/Home.page -text
 demos/quickstart/protected/pages/Controls/Samples/TLabel/Home.page -text
 demos/quickstart/protected/pages/Controls/Samples/TLinkButton/Home.page -text
 demos/quickstart/protected/pages/Controls/Samples/TLinkButton/Home.php -text
diff --git a/HISTORY b/HISTORY
index 89912f1e..f82161d4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -11,6 +11,7 @@ BUG: SF#1432624 - Incorrect documentation about caching expiry (Qiang)
 BUG: THttpSession fails when user storage module is used (Qiang)

 CHG: TTextHighlighter.EnableCopyCode defaults to false (Qiang)

 CHG: Reorganized quickstart tutorial demo, added new sections (Qiang)

+CHG: Reorganized folders under framework (Qiang)

 ENH: Ticket#92 - Support for user exception message file (Qiang)

 ENH: Ticket#106 - Support for validation on THiddenField (Qiang)

 ENH: TDataFieldAccessor can access public class variables (Qiang)

diff --git a/UPGRADE b/UPGRADE
index 2bfc8c53..fc721275 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -14,6 +14,10 @@ Upgrading from v3.0b
 - Pagers in TDataGrid are now enclosed within panels. The event indicating

   their creation is changed to OnPagerCreated instead of OnItemCreated.

 - TTextHighlighter.EnableCopyCode defaults to false now.

+- TTarFileExtrator is moved to System.IO

+  Cache classes are moved to System.Caching

+  TXmlDocument is moved to System.Xml

+  TLogger, TLogRouter, TDataFieldAccessor, TSimpleDateFormatter are moved to System.Util

 

 Upgrading from v3.0a

 --------------------

diff --git a/demos/quickstart/protected/pages/Controls/ImageMap.page b/demos/quickstart/protected/pages/Controls/ImageMap.page
index 0d7d65b1..997faad6 100644
--- a/demos/quickstart/protected/pages/Controls/ImageMap.page
+++ b/demos/quickstart/protected/pages/Controls/ImageMap.page
@@ -3,4 +3,23 @@
 <h1>TImageMap</h1>

 <com:DocLink ClassPath="System.Web.UI.WebControls.TImageMap" />

 

+<p>

+<tt>TImageMap</tt> represents an image on a Web page with predefined hotspot regions that can respond differently to users' clicks on them. Depending on the <tt>HotSpotMode</tt> of the hotspot region, clicking on the hotspot may trigger a postback or navigate to a specified URL.

+</p>

+<p>

+Each hotspot is described using a <tt>THotSpot</tt> object and is maintained in the <tt>HotSpots</tt> collection in <tt>TImageMap</tt>. A hotspot can be a circle, rectangle, polygon, etc.

+</p>

+<p>

+Hotspots can be added to <tt>TImageMap</tt> via its <tt>HotSpots</tt> property or in a template like the following,

+</p>

+<com:TTextHighlighter Language="prado" CssClass="source">

+&lt;com:TImageMap ... &gt;

+  &lt;com:TCircleHotSpot ... /&gt;

+  &lt;com:TRectangleHotSpot ... /&gt;

+  &lt;com:TPolygonHotSpot ... /&gt;

+&lt;/com:TImageMap&gt;

+</com:TTextHighlighter>

+

+<com:RunBar PagePath="Controls.Samples.TImageMap.Home" />

+

 </com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/InlineFrame.page b/demos/quickstart/protected/pages/Controls/InlineFrame.page
index ea89a690..56e3f382 100644
--- a/demos/quickstart/protected/pages/Controls/InlineFrame.page
+++ b/demos/quickstart/protected/pages/Controls/InlineFrame.page
@@ -3,4 +3,22 @@
 <h1>TInlineFrame</h1>

 <com:DocLink ClassPath="System.Web.UI.WebControls.TInlineFrame" />

 

+<p>

+<tt>TInlineFrame</tt> displays an inline frame (&lt;iframe&gt;) on a Web page. The location of the frame content is specified by the <tt>FrameUrl</tt> property.

+</p>

+<p>

+The appearance of a <tt>TInlineFrame</tt> may be customized with the following properties, in addition to those inherited from <tt>TWebControl</tt>.

+</p>

+<ul>

+  <li><tt>Align</tt> - the alignment of the frame.</li>

+  <li><tt>DescriptionUrl</tt> - the URI of a long description of the frame's contents.</li>

+  <li><tt>MarginWidth</tt> and <tt>MarginHeight</tt> - the number of pixels to use as the left/right margins and top/bottom margins, respectively.</li>

+  <li><tt>ScrollBars</tt> - whether scrollbars are provided for the inline frame. By default, it is <tt>Auto</tt>, meaning the scroll bars appear as needed. Setting it as <tt>None</tt> or <tt>Both</tt> to explicitly hide or show the scroll bars.</li>

+</ul>

+

+<p>

+The following samples show <tt>TInlineFrame</tt> with different property settings. The Google homepage is used as the frame content.

+</p>

+<com:RunBar PagePath="Controls.Samples.TInlineFrame.Home" />

+

 </com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TImageMap/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TImageMap/Home.page
new file mode 100644
index 00000000..bf291456
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/Samples/TImageMap/Home.page
@@ -0,0 +1,42 @@
+<com:TContent ID="body">

+

+<h1>TImageMap Sample</h1>

+

+<com:TImageMap

+		ImageUrl=<%~hotspots.gif%>

+		AlternateText="navigate buttons"

+		OnClick="buttonClicked" >

+

+<com:TCircleHotSpot

+	HotspotMode="Navigate"

+	NavigateUrl="http://www.pradosoft.com"

+	AlternateText="Navigate to pradosoft.com"

+	Target="_blank"

+	X="80"

+	Y="80"

+	Radius="55" />

+

+<com:TPolygonHotSpot

+	HotspotMode="Inactive"

+	AlternateText="Inactive area"

+	Coordinates="200,137,255,95,313,137,291,204,219,204"

+	/>

+

+<com:TRectangleHotSpot

+	HotspotMode="PostBack"

+	PostBackValue="Welcome!"

+	CausesValidation="true"

+	ValidationGroup="Group1"

+	AlternateText="Button 2"

+	Top="52"

+	Left="172"

+	Bottom="259"

+	Right="339" />

+

+</com:TImageMap>

+

+<br/>

+

+<com:TLabel ID="Result" />

+

+</com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TImageMap/Home.php b/demos/quickstart/protected/pages/Controls/Samples/TImageMap/Home.php
new file mode 100644
index 00000000..b8e17941
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/Samples/TImageMap/Home.php
@@ -0,0 +1,11 @@
+<?php

+

+class Home extends TPage

+{

+	public function buttonClicked($sender,$param)

+	{

+		$this->Result->Text="Your post value is : ".$param->PostBackValue;

+	}

+}

+

+?>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TImageMap/hotspots.gif b/demos/quickstart/protected/pages/Controls/Samples/TImageMap/hotspots.gif
new file mode 100644
index 00000000..dec647b1
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/Samples/TImageMap/hotspots.gif
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TInlineFrame/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TInlineFrame/Home.page
new file mode 100644
index 00000000..90f3f5a1
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/Samples/TInlineFrame/Home.page
@@ -0,0 +1,34 @@
+<com:TContent ID="body">

+

+<h1>TInlineFrame Samples</h1>

+

+<table class="sampletable">

+

+<tr><td class="samplenote">

+Inline frame with default settings:

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

+<com:TInlineFrame FrameUrl="http://www.google.com/" />

+</td></tr>

+

+<tr><td class="samplenote">

+Inline frame customized with margins and align:

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

+<com:TInlineFrame

+	MarginWidth="100"

+	MarginHeight="100"

+	Align="Right"

+	FrameUrl="http://www.google.com/" />

+</td></tr>

+

+<tr><td class="samplenote">

+Inline frame without scrollbars and border:

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

+<com:TInlineFrame

+	ScrollBars="None"

+	ShowBorder="false"

+	FrameUrl="http://www.google.com/" />

+</td></tr>

+

+</table>

+

+</com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/Standard.page b/demos/quickstart/protected/pages/Controls/Standard.page
index 026d3d1a..d2b36d1c 100644
--- a/demos/quickstart/protected/pages/Controls/Standard.page
+++ b/demos/quickstart/protected/pages/Controls/Standard.page
@@ -51,11 +51,11 @@
   <a href="?page=Controls.ImageButton">TImageButton</a> represents a click button that has an image as the background. It is mainly used to trigger page postback.

   </li>

 

-  <li>*

+  <li>

   <a href="?page=Controls.ImageMap">TImageMap</a> represents an image on a Web page with clickable hotspot regions.

   </li>

 

-  <li>*

+  <li>

   <a href="?page=Controls.InlineFrame">TInlineFrame</a> represents an &lt;iframe&gt; HTML element on a Web page.

   </li>