Merge from 3.0 branch till 1305.

5 files changed, 31 insertions, 0 deletions

diff --git a/demos/blog/protected/.htaccess b/demos/blog/protected/.htaccess
new file mode 100644
index 00000000..e0198322
--- /dev/null
+++ b/demos/blog/protected/.htaccess
@@ -0,0 +1 @@
+deny from all

diff --git a/demos/composer/protected/.htaccess b/demos/composer/protected/.htaccess
new file mode 100644
index 00000000..e0198322
--- /dev/null
+++ b/demos/composer/protected/.htaccess
@@ -0,0 +1 @@
+deny from all

diff --git a/demos/personal/protected/.htaccess b/demos/personal/protected/.htaccess
new file mode 100644
index 00000000..e0198322
--- /dev/null
+++ b/demos/personal/protected/.htaccess
@@ -0,0 +1 @@
+deny from all

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.page
index 90dc4a3c..1b0b82d9 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.page
@@ -184,6 +184,20 @@ Dropdown list causing validation:
 </td>

 </tr>

 

+<tr>

+<td class="samplenote">

+Dropdown list with option groups:

+</td>

+<td class="sampleaction">

+<com:TDropDownList>

+  <com:TListItem Value="value 1" Text="item 1" Attributes.Group="group 1"/>

+  <com:TListItem Value="value 2" Text="item 2" Attributes.Group="group 1"/>

+  <com:TListItem Value="value 3" Text="item 3" Attributes.Group="group 2"/>

+  <com:TListItem Value="value 4" Text="item 4" Attributes.Group="group 2"/>

+</com:TDropDownList>

+</td>

+</tr>

+

 </table>

 

 </com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TListBox/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TListBox/Home.page
index 9f9bf162..7b729588 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TListBox/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TListBox/Home.page
@@ -255,6 +255,20 @@ List box causing validation:
 </td>

 </tr>

 

+<tr>

+<td class="samplenote">

+List box with option groups:

+</td>

+<td class="sampleaction">

+<com:TListBox>

+  <com:TListItem Value="value 1" Text="item 1" Attributes.Group="group 1"/>

+  <com:TListItem Value="value 2" Text="item 2" Attributes.Group="group 1"/>

+  <com:TListItem Value="value 3" Text="item 3" Attributes.Group="group 2"/>

+  <com:TListItem Value="value 4" Text="item 4" Attributes.Group="group 2"/>

+</com:TListBox>

+</td>

+</tr>

+

 </table>

 

 </com:TContent>
\ No newline at end of file