Merge from 3.0 branch till 1253.

6 files changed, 9 insertions, 132 deletions

diff --git a/tests/FunctionalTests/features/protected/pages/ClientScripTest.page b/tests/FunctionalTests/features/protected/pages/ClientScripTest.page
deleted file mode 100644
index 8dbf7133..00000000
--- a/tests/FunctionalTests/features/protected/pages/ClientScripTest.page
+++ /dev/null
@@ -1,30 +0,0 @@
-<com:TContent ID="Content">
-	<h1>ClientScript Test</h1>
-	
-	<com:TClientScript ScriptUrl=<%~ test.js %> ScriptPosition="Head">
-		if(typeof(ClientScriptInfo) == "undefined")
-			ClientScriptInfo = [];
-		ClientScriptInfo.push("ok 3?")
-	</com:TClientScript>
-		
-	<com:TClientScript ScriptPosition="Begin">
-		if(typeof(ClientScriptInfo) == "undefined")
-			ClientScriptInfo = [];
-		ClientScriptInfo.push("ok 2!")
-	</com:TClientScript>
-	
-	<com:TLabel ID="label1" Text="Label 1" />
-	<input type="button" id="button1" value="update" />
-	
-	<com:TClientScript ScriptPosition="End" UsingPradoScripts="prado">
-		Event.observe("button1", "click", function()
-		{
-			element = $("<%= $this->label1->ClientID %>");
-			if(element)
-				element.innerHTML = inspect(ClientScriptInfo);
-			else
-				alert("failed");
-		});
-	</com:TClientScript>
-	
-</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/CompositeControl.page b/tests/FunctionalTests/features/protected/pages/CompositeControl.page
deleted file mode 100644
index b135445a..00000000
--- a/tests/FunctionalTests/features/protected/pages/CompositeControl.page
+++ /dev/null
@@ -1,12 +0,0 @@
-<com:TContent ID="Content">

-<h1>Composite Control Test</h1>

-	<com:LabeledTextBox id="user" Label.Text="username:" /><br />

-	<com:LabeledTextBox id="pass" Label.Text="password:" /><br />

-	<com:TButton Text="Submit" />

-

-<com:TPanel Visible=<%= $this->user->TextBox->Text != "" %> >

-<h2>Result</h2>

-	User: <%= $this->user->TextBox->Text %> Pass: <%= $this->pass->TextBox->Text %>

-</com:TPanel>

-

-</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/DatePicker.page b/tests/FunctionalTests/features/protected/pages/DatePicker.page
deleted file mode 100644
index 261a6994..00000000
--- a/tests/FunctionalTests/features/protected/pages/DatePicker.page
+++ /dev/null
@@ -1,61 +0,0 @@
-<com:TContent ID="Content">

-

-<h1>TDatePicker Samples</h1>

-

-<table class="sampletable">

-

-<tr>

-	<td class="samplenote">Default TDatePicker</td>

-	<td class="sampleaction">

-		<com:TDatePicker />

-	</td>

-</tr>

-

-<tr>

-	<td class="samplenote">Button Mode, pre-selected date</td>

-	<td class="sampleaction">

-		<com:TDatePicker Mode="Button" Date="20-10-2005"/>

-	</td>

-</tr>

-

-<tr>

-	<td class="samplenote">InputMode="DropDownList", custom DateFormat</td>

-	<td class="sampleaction">

-		<com:TDatePicker DateFormat="yyyy/MMM" InputMode="DropDownList"/>

-	</td>

-</tr>

-

-<tr>

-	<td class="samplenote">InputMode="DropDownList", custom DateFormat, Culture</td>

-	<td class="sampleaction">

-		<com:TDatePicker DateFormat="MMM/yyyy" Culture="fr" InputMode="DropDownList"/>

-	</td>

-</tr>

-

-

-<tr>

-	<td class="samplenote">Custom DateFormat, culture, ImageButton mode, pre-selected date</td>

-	<td class="sampleaction">

-		<com:TDatePicker Mode="ImageButton" Culture="zh_CN" 

-			DateFormat="日期：yyyy年M月d日"  

-			Timestamp=<%= @strtotime("-1 year") %>/>

-	</td>

-</tr>

-

-<tr>

-	<td class="samplenote">Custom DateFormat, DropDownList, pre-selected date set in as Text</td>

-	<td class="sampleaction">

-		<com:TDatePicker DateFormat="yyyy/MMMM/dd" Date="2005/05/15" InputMode="DropDownList"/>

-	</td>

-</tr>

-

-<tr>

-	<td class="samplenote">DropDownList, pre-selected date as integer</td>

-	<td class="sampleaction">

-		<com:TDatePicker InputMode="DropDownList" Timestamp=<%= @strtotime("-1 month") %>/>

-	</td>

-</tr>

-	

-</table>

-

-</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/HtmlArea.page b/tests/FunctionalTests/features/protected/pages/HtmlArea.page
deleted file mode 100644
index 3936e68c..00000000
--- a/tests/FunctionalTests/features/protected/pages/HtmlArea.page
+++ /dev/null
@@ -1,25 +0,0 @@
-

-<com:TContent ID="Content">

-

-	<com:THtmlArea ID="text1" />

-

-	<com:TRequiredFieldValidator 

-		ControlToValidate="text1"

-		ErrorMessage="*" />

-

-	<com:TButton ID="button1" Text="submit 1" />

-

-	<com:TButton ID="button2" Text="submit 2" />

-

-	<com:THtmlArea ID="text2" />

-

-	<com:TRequiredFieldValidator 

-		ControlToValidate="text2"

-		ValidationGroup="group2"

-		ErrorMessage="*" />

-

-	<com:TButton ID="button3" ValidationGroup="group2" Text="submit 3" />

-

-	<com:TButton ID="button4" ValidationGroup="group2" Text="submit 4" />

-

-</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page
index 1a97a249..7fca0f56 100644
--- a/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page
+++ b/tests/FunctionalTests/features/protected/pages/ValidatorEffects.page
@@ -93,5 +93,14 @@
 

 </fieldset>

 

+<com:TLinkButton ID="linkButton1" 

+	Text="Click Me" 

+	OnClick="linkButton1_Clicked">

+	<prop:Attributes.onclick>

+	if(!confirm('<%= Prado::localize("Confirm Delete") %>')) 

+		return false;

+	</prop:Attributes.onclick>

+</com:TLinkButton>

+

 

 </com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/test.js b/tests/FunctionalTests/features/protected/pages/test.js
deleted file mode 100644
index e8e80b19..00000000
--- a/tests/FunctionalTests/features/protected/pages/test.js
+++ /dev/null
@@ -1,4 +0,0 @@
-if(typeof(ClientScriptInfo) == "undefined")
-	ClientScriptInfo = [];
-
-ClientScriptInfo.push("ok")
\ No newline at end of file