diff options
4 files changed, 11 insertions, 4 deletions
diff --git a/demos/quickstart/protected/application.xml b/demos/quickstart/protected/application.xml index 7ed4a749..1765230b 100644 --- a/demos/quickstart/protected/application.xml +++ b/demos/quickstart/protected/application.xml @@ -24,4 +24,7 @@ <services>
<service id="page" class="TPageService" DefaultPage="GettingStarted.Introduction" />
</services>
+ <parameters>
+ <parameter id="enableNewComment" value="false" />
+ </parameters>
</application>
\ No newline at end of file diff --git a/demos/quickstart/protected/comments/CommentList.tpl b/demos/quickstart/protected/comments/CommentList.tpl index ef74316a..06cddd1e 100644 --- a/demos/quickstart/protected/comments/CommentList.tpl +++ b/demos/quickstart/protected/comments/CommentList.tpl @@ -3,7 +3,10 @@ <com:TRepeater ID="comments"> <prop:HeaderTemplate> <h2 class="comment_header">Comments - <span style="font-size:0.8em">( <a href="#add_comments">Add your comments</a> )</span></h2> + <com:TPlaceHolder Visible=<%$ enableNewComment %> > + <span style="font-size:0.8em">( <a href="#add_comments">Add your comments</a> )</span> + </com:TPlaceHolder> + </h2> </prop:HeaderTemplate> <prop:ItemTemplate> <div class="comment_item comment_item<%# $this->ItemIndex%2 %>"> @@ -25,7 +28,7 @@ </prop:ItemTemplate> </com:TRepeater> -<com:TMultiView ID="multiView1" ActiveViewIndex="0"> +<com:TMultiView ID="multiView1" ActiveViewIndex="0" Visible=<%$ enableNewComment %> > <com:TView ID="view1"> <div id="add_comments" class="add_comments"> <h3>Post a comment</h3> diff --git a/tests/FunctionalTests/features/protected/controls/Layout.tpl b/tests/FunctionalTests/features/protected/controls/Layout.tpl index 66b42f6c..dbd433b8 100644 --- a/tests/FunctionalTests/features/protected/controls/Layout.tpl +++ b/tests/FunctionalTests/features/protected/controls/Layout.tpl @@ -27,6 +27,7 @@ <body>
<com:TForm>
<com:TContentPlaceHolder ID="Content" />
+<com:TJavascriptLogger />
</com:TForm>
</body>
</html>
\ No newline at end of file diff --git a/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php b/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php index cc4c1571..d899aab5 100644 --- a/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php +++ b/tests/FunctionalTests/tickets/tests/Ticket191TestCase.php @@ -6,9 +6,9 @@ class Ticket191TestCase extends SeleniumTestCase {
$this->open('tickets/index.php?page=Ticket191');
$this->type("ctl0\$Content\$TextBox2", "test");
- $this->clickAndWait("//input[@type='submit' and @name='ctl0\$Content\$ctl0']", "");
+ $this->clickAndWait("name=ctl0\$Content\$ctl0");
$this->type("ctl0\$Content\$TextBox", "test");
- $this->clickAndWait("//input[@type='submit' and @name='ctl0\$Content\$ctl1']", "");
+ $this->clickAndWait("name=ctl0\$Content\$ctl1");
$this->verifyNotVisible('ctl0_Content_ctl2');
}
}
|