From 138dbc23381a82eaf17a2685cc3bdb54ad8b7f51 Mon Sep 17 00:00:00 2001 From: xue <> Date: Fri, 20 Jan 2006 04:20:39 +0000 Subject: Added TImage and THyperLink demos. --- .gitattributes | 5 ++ .../pages/Controls/Samples/THyperLink/Home.page | 50 ++++++++++++++ .../Controls/Samples/THyperLink/hello_world.gif | Bin 0 -> 1602 bytes .../pages/Controls/Samples/TImage/HelloWorld.html | 8 +++ .../pages/Controls/Samples/TImage/Home.page | 41 ++++++++++++ .../pages/Controls/Samples/TImage/hello_world.gif | Bin 0 -> 1602 bytes .../protected/pages/Controls/Simple.page | 8 +++ demos/quickstart/themes/PradoSoft/style.css | 72 ++++++++++----------- framework/Web/UI/WebControls/THyperLink.php | 2 +- framework/Web/UI/WebControls/TImage.php | 2 +- 10 files changed, 150 insertions(+), 38 deletions(-) create mode 100644 demos/quickstart/protected/pages/Controls/Samples/THyperLink/Home.page create mode 100644 demos/quickstart/protected/pages/Controls/Samples/THyperLink/hello_world.gif create mode 100644 demos/quickstart/protected/pages/Controls/Samples/TImage/HelloWorld.html create mode 100644 demos/quickstart/protected/pages/Controls/Samples/TImage/Home.page create mode 100644 demos/quickstart/protected/pages/Controls/Samples/TImage/hello_world.gif diff --git a/.gitattributes b/.gitattributes index 742e4299..5456a9be 100644 --- a/.gitattributes +++ b/.gitattributes @@ -63,6 +63,11 @@ demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.page -text demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.php -text demos/quickstart/protected/pages/Controls/Samples/TEmailAddressValidator/Home.page -text demos/quickstart/protected/pages/Controls/Samples/TEmailAddressValidator/Home.php -text +demos/quickstart/protected/pages/Controls/Samples/THyperLink/Home.page -text +demos/quickstart/protected/pages/Controls/Samples/THyperLink/hello_world.gif -text +demos/quickstart/protected/pages/Controls/Samples/TImage/HelloWorld.html -text +demos/quickstart/protected/pages/Controls/Samples/TImage/Home.page -text +demos/quickstart/protected/pages/Controls/Samples/TImage/hello_world.gif -text demos/quickstart/protected/pages/Controls/Samples/TLabel/Home.page -text demos/quickstart/protected/pages/Controls/Samples/TListBox/Home.page -text demos/quickstart/protected/pages/Controls/Samples/TListBox/Home.php -text diff --git a/demos/quickstart/protected/pages/Controls/Samples/THyperLink/Home.page b/demos/quickstart/protected/pages/Controls/Samples/THyperLink/Home.page new file mode 100644 index 00000000..8d8c700e --- /dev/null +++ b/demos/quickstart/protected/pages/Controls/Samples/THyperLink/Home.page @@ -0,0 +1,50 @@ + + +

THyperLink Samples

+ + + + + + + + + + + +
+A regular hyperlink: + +Welcome to +. +
+A text hyperlink with css style: + +Welcome to +. +
+An image hyperlink: + + + Text="Hello World" />. +
+A hyerplink with body contents as link text: + + +Body contents + +
+ +
\ No newline at end of file diff --git a/demos/quickstart/protected/pages/Controls/Samples/THyperLink/hello_world.gif b/demos/quickstart/protected/pages/Controls/Samples/THyperLink/hello_world.gif new file mode 100644 index 00000000..bc81443c Binary files /dev/null and b/demos/quickstart/protected/pages/Controls/Samples/THyperLink/hello_world.gif differ diff --git a/demos/quickstart/protected/pages/Controls/Samples/TImage/HelloWorld.html b/demos/quickstart/protected/pages/Controls/Samples/TImage/HelloWorld.html new file mode 100644 index 00000000..3a319a1b --- /dev/null +++ b/demos/quickstart/protected/pages/Controls/Samples/TImage/HelloWorld.html @@ -0,0 +1,8 @@ + + +Hello World! + + +This is Hello World long description file! + + \ No newline at end of file diff --git a/demos/quickstart/protected/pages/Controls/Samples/TImage/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TImage/Home.page new file mode 100644 index 00000000..5dbb754b --- /dev/null +++ b/demos/quickstart/protected/pages/Controls/Samples/TImage/Home.page @@ -0,0 +1,41 @@ + + +

TImage Samples

+ + + + + + + + + + + +
+Image with only ImageUrl being set: + + /> +
+Image with AlterantiveText being set: + + + AlternateText="Hello World!"/> +
+Image with baseline alignment: + +Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! +Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! +Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! +Hello World! Hello World! Hello World! Hello World! Hello World! Hello World! + ImageAlign="baseline" /> +
+Image with DescriptionUrl: + + + DescriptionUrl=<%~HelloWorld.html%> /> +
+ +
\ No newline at end of file diff --git a/demos/quickstart/protected/pages/Controls/Samples/TImage/hello_world.gif b/demos/quickstart/protected/pages/Controls/Samples/TImage/hello_world.gif new file mode 100644 index 00000000..bc81443c Binary files /dev/null and b/demos/quickstart/protected/pages/Controls/Samples/TImage/hello_world.gif differ diff --git a/demos/quickstart/protected/pages/Controls/Simple.page b/demos/quickstart/protected/pages/Controls/Simple.page index 86b819f4..f6f981c4 100644 --- a/demos/quickstart/protected/pages/Controls/Simple.page +++ b/demos/quickstart/protected/pages/Controls/Simple.page @@ -9,8 +9,16 @@

THyperLink

+

+THyperLink displays a hyperlink on a page. The hyperlink URL is specified via the NavigateUrl property, and link text is via the Text property. The link target is specified via the Target property. It is also possible to display an image by setting the ImageUrl property. In this case, Text is displayed as the alternate text of the image. If both ImageUrl and Text are empty, the content enclosed within the control tag will be rendered. +

+

TImage

+

+TImage displays an image on a page. The image is specified via the ImageUrl property which takes a relative or absolute URL to the image file. The alignment of the image displayed is set by the ImageAlign property. To set alternate text or long description of the image, use AlternateText or DescriptionUrl, respectively. +

+

TPanel

diff --git a/demos/quickstart/themes/PradoSoft/style.css b/demos/quickstart/themes/PradoSoft/style.css index bd4a4aee..1d084548 100644 --- a/demos/quickstart/themes/PradoSoft/style.css +++ b/demos/quickstart/themes/PradoSoft/style.css @@ -37,24 +37,24 @@ a height:100px; background-image: url('pradologo.gif'); background-repeat: no-repeat; -} - -#header div.title -{ - display: none; -} - -#header div.image -{ - display: block; - float: right; - width: 757px; - height: 100px; - background-image: url('mantis.jpg'); - background-repeat: no-repeat; - background-position: top right; -} - +} + +#header div.title +{ + display: none; +} + +#header div.image +{ + display: block; + float: right; + width: 757px; + height: 100px; + background-image: url('mantis.jpg'); + background-repeat: no-repeat; + background-position: top right; +} + #menu { @@ -163,7 +163,7 @@ a .runbar a:link, .runbar a:visited { background-color:#E2E2E2; font-size: 12px; - font-weight: none; + font-weight: normal; padding: 3px; padding-left: 6px; padding-right: 6px; @@ -177,7 +177,7 @@ a .runbar a:link.active, .runbar a:visited.active, .runbar a:hover { background-color:#E2E2E2; font-size: 12px; - font-weight: none; + font-weight: normal; padding: 3px; padding-left: 6px; padding-right: 6px; @@ -219,22 +219,22 @@ tt { height:100px; background-image: url('pradologo.gif'); background-repeat: no-repeat; -} - -.sampleheader div.title -{ - display: none; -} - -.sampleheader div.image -{ - display: block; - float: right; - width: 900px; - height: 100px; - background-image: url('mantissample.jpg'); - background-repeat: no-repeat; - background-position: top right; +} + +.sampleheader div.title +{ + display: none; +} + +.sampleheader div.image +{ + display: block; + float: right; + width: 900px; + height: 100px; + background-image: url('mantissample.jpg'); + background-repeat: no-repeat; + background-position: top right; } .samplemenu diff --git a/framework/Web/UI/WebControls/THyperLink.php b/framework/Web/UI/WebControls/THyperLink.php index c47cc1c4..4992dfd3 100644 --- a/framework/Web/UI/WebControls/THyperLink.php +++ b/framework/Web/UI/WebControls/THyperLink.php @@ -72,7 +72,7 @@ class THyperLink extends TWebControl } else { - $image=new TImage; + $image=Prado::createComponent('System.Web.UI.WebControls.TImage'); $image->setImageUrl($imageUrl); if(($toolTip=$this->getToolTip())!=='') $image->setToolTip($toolTip); diff --git a/framework/Web/UI/WebControls/TImage.php b/framework/Web/UI/WebControls/TImage.php index 3f7b8f49..fa5f406f 100644 --- a/framework/Web/UI/WebControls/TImage.php +++ b/framework/Web/UI/WebControls/TImage.php @@ -17,7 +17,7 @@ * {@link setImageUrl ImageUrl} property which takes a relative or absolute * URL to the image file. The alignment of the image displayed is set by * the {@link setImageAlign ImageAlign} property. To set alternative texts - * or long description of the image, use {@link setAlternativeText AlternativeText} + * or long description of the image, use {@link setAlternateText AlternateText} * or {@link setDescriptionUrl DescriptionUrl} property, respectively. * * @author Qiang Xue -- cgit v1.2.3