summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes1
-rw-r--r--demos/quickstart/protected/pages/Database/SqlMap.page4
-rw-r--r--demos/quickstart/protected/pages/Tutorial/CurrencyConverter.page2
-rw-r--r--demos/quickstart/themes/PradoSoft/style.css4
-rw-r--r--tests/FunctionalTests/tickets/protected/pages/Ticket511.page10
5 files changed, 16 insertions, 5 deletions
diff --git a/.gitattributes b/.gitattributes
index ca1df998..bb8a27d5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2315,6 +2315,7 @@ tests/FunctionalTests/tickets/protected/pages/Ticket477.page -text
tests/FunctionalTests/tickets/protected/pages/Ticket477.php -text
tests/FunctionalTests/tickets/protected/pages/Ticket484.page -text
tests/FunctionalTests/tickets/protected/pages/Ticket484.php -text
+tests/FunctionalTests/tickets/protected/pages/Ticket511.page -text
tests/FunctionalTests/tickets/protected/pages/Ticket518.page -text
tests/FunctionalTests/tickets/protected/pages/Ticket521.page -text
tests/FunctionalTests/tickets/protected/pages/Ticket521.php -text
diff --git a/demos/quickstart/protected/pages/Database/SqlMap.page b/demos/quickstart/protected/pages/Database/SqlMap.page
index aa940662..ce9e979e 100644
--- a/demos/quickstart/protected/pages/Database/SqlMap.page
+++ b/demos/quickstart/protected/pages/Database/SqlMap.page
@@ -258,8 +258,8 @@ $user->save(); //save it using Active Record
<ul id="u1" class="block-content">
<li>Fowler et. al. <i>Patterns of Enterprise Application Architecture</i>,
Addison Wesley, 2002.</li>
- <li>xxxx. <i>iBatis Data Mapper</i>,
- <a href="http://www.apache.org/ibatis">http://www.apache.org/ibatis</a>.</li>
+ <li>iBatis Team. <i>iBatis Data Mapper</i>,
+ <a href="http://ibatis.apache.org">http://ibatis.apache.org</a>.</li>
</ul>
<div class="last-modified">$Id$</div></com:TContent> \ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Tutorial/CurrencyConverter.page b/demos/quickstart/protected/pages/Tutorial/CurrencyConverter.page
index 5a9aec1a..7f552ae1 100644
--- a/demos/quickstart/protected/pages/Tutorial/CurrencyConverter.page
+++ b/demos/quickstart/protected/pages/Tutorial/CurrencyConverter.page
@@ -299,7 +299,7 @@ public function convert_clicked($sender, $param)
<h1 id="16006">Improve User Experience With Active Controls</h1>
<p id="80073" class="block-content">In this simple application we may further improve the user experience
- by decreasing the responsiveness of the application. One way to achieve
+ by increasing the responsiveness of the application. One way to achieve
a faster response is calculate and present the results without reloading
the whole page.
</p>
diff --git a/demos/quickstart/themes/PradoSoft/style.css b/demos/quickstart/themes/PradoSoft/style.css
index a69a6540..799dbf36 100644
--- a/demos/quickstart/themes/PradoSoft/style.css
+++ b/demos/quickstart/themes/PradoSoft/style.css
@@ -1,9 +1,9 @@
html
{
- background-image: url('mantisbg.jpg');
+ background-image: url('mantisbg.jpg');
background-repeat: no-repeat;
background-position: top right;
-
+ background-color: white;
}
body {
diff --git a/tests/FunctionalTests/tickets/protected/pages/Ticket511.page b/tests/FunctionalTests/tickets/protected/pages/Ticket511.page
new file mode 100644
index 00000000..b6b9dda4
--- /dev/null
+++ b/tests/FunctionalTests/tickets/protected/pages/Ticket511.page
@@ -0,0 +1,10 @@
+<com:TContent ID="Content">
+<h2 class="defect">Problem loading TListItemCollection</h2>
+
+<com:System.Web.UI.ActiveControls.TActiveDropDownList>
+ <com:TListItem Text="One" />
+ <com:TListItem Text="Two" />
+</com:System.Web.UI.ActiveControls.TActiveDropDownList>
+
+
+</com:TContent> \ No newline at end of file