diff options
| -rw-r--r-- | .gitattributes | 5 | ||||
| -rw-r--r-- | demos/quickstart/protected/pages/Controls/Samples/THyperLink/Home.page | 50 | ||||
| -rw-r--r-- | demos/quickstart/protected/pages/Controls/Samples/THyperLink/hello_world.gif | bin | 0 -> 1602 bytes | |||
| -rw-r--r-- | demos/quickstart/protected/pages/Controls/Samples/TImage/HelloWorld.html | 8 | ||||
| -rw-r--r-- | demos/quickstart/protected/pages/Controls/Samples/TImage/Home.page | 41 | ||||
| -rw-r--r-- | demos/quickstart/protected/pages/Controls/Samples/TImage/hello_world.gif | bin | 0 -> 1602 bytes | |||
| -rw-r--r-- | demos/quickstart/protected/pages/Controls/Simple.page | 8 | ||||
| -rw-r--r-- | demos/quickstart/themes/PradoSoft/style.css | 72 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/THyperLink.php | 2 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TImage.php | 2 |
10 files changed, 150 insertions, 38 deletions
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 @@ +<com:TContent ID="body">
+
+<h1>THyperLink Samples</h1>
+
+<table class="sampletable">
+
+<tr><td class="samplenote">
+A regular hyperlink:
+</td><td class="sampleaction">
+Welcome to
+<com:THyperLink
+ NavigateUrl="http://www.pradosoft.com/"
+ Text="PradoSoft.com"
+ Target="_blank" />.
+</td></tr>
+
+<tr><td class="samplenote">
+A text hyperlink with css style:
+</td><td class="sampleaction">
+Welcome to
+<com:THyperLink
+ NavigateUrl="http://www.pradosoft.com/"
+ Text="PradoSoft.com"
+ Target="_blank"
+ BackColor="silver"
+ Font.Italic="true" />.
+</td></tr>
+
+<tr><td class="samplenote">
+An image hyperlink:
+</td><td class="sampleaction">
+<com:THyperLink
+ NavigateUrl="http://www.pradosoft.com/"
+ ImageUrl=<%~hello_world.gif%>
+ Text="Hello World" />.
+</td></tr>
+
+<tr><td class="samplenote">
+A hyerplink with body contents as link text:
+</td><td class="sampleaction">
+<com:THyperLink
+ NavigateUrl="http://www.pradosoft.com/"
+ Target="_blank">
+Body contents
+</com:THyperLink>
+</td></tr>
+
+</table>
+
+</com:TContent>
\ 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 Binary files differnew file mode 100644 index 00000000..bc81443c --- /dev/null +++ b/demos/quickstart/protected/pages/Controls/Samples/THyperLink/hello_world.gif 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 @@ +<html>
+<head>
+<title>Hello World!</title>
+</head>
+<body>
+This is Hello World long description file!
+</body>
+</html>
\ 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 @@ +<com:TContent ID="body">
+
+<h1>TImage Samples</h1>
+
+<table class="sampletable">
+
+<tr><td class="samplenote">
+Image with only <tt>ImageUrl</tt> being set:
+</td><td class="sampleaction">
+<com:TImage ImageUrl=<%~hello_world.gif%> />
+</td></tr>
+
+<tr><td class="samplenote">
+Image with <tt>AlterantiveText</tt> being set:
+</td><td class="sampleaction">
+<com:TImage
+ ImageUrl=<%~hello_world.gif%>
+ AlternateText="Hello World!"/>
+</td></tr>
+
+<tr><td class="samplenote">
+Image with <tt>baseline</tt> alignment:
+</td><td class="sampleaction">
+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!
+<com:TImage ImageUrl=<%~hello_world.gif%> ImageAlign="baseline" />
+</td></tr>
+
+<tr><td class="samplenote">
+Image with <tt>DescriptionUrl</tt>:
+</td><td class="sampleaction">
+<com:TImage
+ ImageUrl=<%~hello_world.gif%>
+ DescriptionUrl=<%~HelloWorld.html%> />
+</td></tr>
+
+</table>
+
+</com:TContent>
\ 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 Binary files differnew file mode 100644 index 00000000..bc81443c --- /dev/null +++ b/demos/quickstart/protected/pages/Controls/Samples/TImage/hello_world.gif 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 @@ <com:RunBar PagePath="Controls.Samples.TLabel.Home" />
<h2>THyperLink</h2>
+<p>
+<tt>THyperLink</tt> displays a hyperlink on a page. The hyperlink URL is specified via the <tt>NavigateUrl</tt> property, and link text is via the <tt>Text</tt> property. The link target is specified via the <tt>Target</tt> property. It is also possible to display an image by setting the <tt>ImageUrl</tt> property. In this case, <tt>Text</tt> is displayed as the alternate text of the image. If both <tt>ImageUrl</tt> and <tt>Text</tt> are empty, the content enclosed within the control tag will be rendered.
+</p>
+<com:RunBar PagePath="Controls.Samples.THyperLink.Home" />
<h2>TImage</h2>
+<p>
+<tt>TImage</tt> displays an image on a page. The image is specified via the <tt>ImageUrl</tt> property which takes a relative or absolute URL to the image file. The alignment of the image displayed is set by the <tt>ImageAlign</tt> property. To set alternate text or long description of the image, use <tt>AlternateText</tt> or <tt>DescriptionUrl</tt>, respectively.
+</p>
+<com:RunBar PagePath="Controls.Samples.TImage.Home" />
<h2>TPanel</h2>
<p>
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 <qiang.xue@gmail.com>
|
