diff --git a/mozilla/webtools/litmus/Litmus/Template.pm b/mozilla/webtools/litmus/Litmus/Template.pm index dc3f2a011fa..244e94a63f1 100755 --- a/mozilla/webtools/litmus/Litmus/Template.pm +++ b/mozilla/webtools/litmus/Litmus/Template.pm @@ -137,7 +137,6 @@ sub create { return $class->new({ INCLUDE_PATH => &getTemplateIncludePath, CONSTANTS => \%constants, - PRE_PROCESS => "variables.none.tmpl", POST_CHOMP => 1, EVAL_PERL => 1, diff --git a/mozilla/webtools/litmus/selenium/testcases/advanced_search_admin_options.html b/mozilla/webtools/litmus/selenium/testcases/advanced_search_admin_options.html index 61ce085cd92..3dddac5c588 100644 --- a/mozilla/webtools/litmus/selenium/testcases/advanced_search_admin_options.html +++ b/mozilla/webtools/litmus/selenium/testcases/advanced_search_admin_options.html @@ -16,7 +16,7 @@ select email - label=ccooper@deadsquid.com + label=ccooper@deadsquid.com clickAndWait diff --git a/mozilla/webtools/litmus/templates/en/default/admin/edit_users/edit_user.html.tmpl b/mozilla/webtools/litmus/templates/en/default/admin/edit_users/edit_user.html.tmpl index 98e2ac97a19..a2f7caa072b 100755 --- a/mozilla/webtools/litmus/templates/en/default/admin/edit_users/edit_user.html.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/admin/edit_users/edit_user.html.tmpl @@ -112,7 +112,7 @@ function checkFormContents(f) { [% FOREACH group=groups %] - [% group.name FILTER html %] + [% group.name | html %] [% END %] diff --git a/mozilla/webtools/litmus/templates/en/default/admin/edit_users/searchform.html.tmpl b/mozilla/webtools/litmus/templates/en/default/admin/edit_users/searchform.html.tmpl index 5a4a03a6185..191c387118a 100755 --- a/mozilla/webtools/litmus/templates/en/default/admin/edit_users/searchform.html.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/admin/edit_users/searchform.html.tmpl @@ -34,7 +34,7 @@ And belonging to group(s): [% id = group.group_id %] - [% group.name FILTER html %] + [% group.name | html %] [% END %] diff --git a/mozilla/webtools/litmus/templates/en/default/auth/accountcreated.html.tmpl b/mozilla/webtools/litmus/templates/en/default/auth/accountcreated.html.tmpl index 9a2642e4214..f8f626f08cd 100755 --- a/mozilla/webtools/litmus/templates/en/default/auth/accountcreated.html.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/auth/accountcreated.html.tmpl @@ -42,8 +42,8 @@ [% IF params %] [% FOREACH curdata = params.param() %] [% IF ! params.param(curdata) %] [% NEXT %] [% END %] - + [% END %] [% END %] [% END %] @@ -63,11 +63,11 @@

Thank you,[% IF realname != "" %] [% realname | html %],[% END %] your account has been created

-

For future testing sessions, you can login using your email address ([% email FILTER html %]) and your chosen password.

+

For future testing sessions, you can login using your email address ([% email | html %]) and your chosen password.

Thank you for your contribution to Mozilla QA.

-
+ [% INCLUDE create_hidden_fields %] [% IF ! login_extension %] diff --git a/mozilla/webtools/litmus/templates/en/default/auth/login.html.tmpl b/mozilla/webtools/litmus/templates/en/default/auth/login.html.tmpl index a2f79bb292a..c8e7a2ac0c8 100755 --- a/mozilla/webtools/litmus/templates/en/default/auth/login.html.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/auth/login.html.tmpl @@ -45,8 +45,8 @@ [% FOREACH curdata = params.param() %] [% IF ! params.param(curdata) %] [% NEXT %] [% END %] [% FOREACH p = params.param(curdata) %] - + [% END %] [% END %] [% END %] diff --git a/mozilla/webtools/litmus/templates/en/default/error/error.html.tmpl b/mozilla/webtools/litmus/templates/en/default/error/error.html.tmpl index 56b510ea79e..383ebcda766 100755 --- a/mozilla/webtools/litmus/templates/en/default/error/error.html.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/error/error.html.tmpl @@ -40,7 +40,7 @@

Error

-
[% message FILTER html %]
+
[% message | html %]
diff --git a/mozilla/webtools/litmus/templates/en/default/extension/createaccount.html.tmpl b/mozilla/webtools/litmus/templates/en/default/extension/createaccount.html.tmpl index fc2ed859008..ed19c578a64 100755 --- a/mozilla/webtools/litmus/templates/en/default/extension/createaccount.html.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/extension/createaccount.html.tmpl @@ -47,8 +47,8 @@ [% IF params %] [% FOREACH curdata = params.param() %] [% IF ! params.param(curdata) %] [% NEXT %] [% END %] - + [% END %] [% END %] [% END %] diff --git a/mozilla/webtools/litmus/templates/en/default/filterexceptions.pl b/mozilla/webtools/litmus/templates/en/default/filterexceptions.pl deleted file mode 100644 index 07f27c2ac39..00000000000 --- a/mozilla/webtools/litmus/templates/en/default/filterexceptions.pl +++ /dev/null @@ -1,78 +0,0 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code are the Bugzilla tests. -# -# The Initial Developer of the Original Code is Jacob Steenhagen. -# Portions created by Jacob Steenhagen are -# Copyright (C) 2001 Jacob Steenhagen. All -# Rights Reserved. -# -# Contributor(s): Gervase Markham -# Zach Lipton - -# Important! The following classes of directives are excluded in the test, -# and so do not need to be added here. Doing so will cause warnings. -# See 008filter.t for more details. -# -# Comments - [%#... -# Directives - [% IF|ELSE|UNLESS|FOREACH... -# Assignments - [% foo = ... -# Simple literals - [% " selected" ... -# Values always used for numbers - [% (i|j|k|n|count) %] -# Params - [% Param(... -# Safe functions - [% (time2str|GetBugLink)... -# Safe vmethods - [% foo.size %] [% foo.length %] -# [% foo.push() %] -# TT loop variables - [% loop.count %] -# Already-filtered stuff - [% wibble FILTER html %] -# where the filter is one of html|csv|js|url_quote|quoteUrls|time|uri|xml|none - -%::safe = ( - -'variables.none.tmpl' => [ - 'selname', - 'onchangereal', -], - -'global/footer.html.tmpl' => [ - 'style', -], - -'global/header.html.tmpl' => [ - 'curscript', - 'realonload', -], - -'global/html_header.tmpl' => [ - 'curscript', - 'js_file', -], - -'global/litmus_header.tmpl' => [ - 'onload', -], - -'instructions/test_result_navigation.tmpl' => [ - 'icon', -], - -'sidebar/widget_testcases.tmpl' => [ - 'order_num', -], - -'test/test.html.tmpl' => [ - 'checked', - 'evenodd', -], - -); diff --git a/mozilla/webtools/litmus/templates/en/default/form_widgets/input_test_id.tmpl b/mozilla/webtools/litmus/templates/en/default/form_widgets/input_test_id.tmpl index 1f9b57f767f..10b6ef595fb 100644 --- a/mozilla/webtools/litmus/templates/en/default/form_widgets/input_test_id.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/form_widgets/input_test_id.tmpl @@ -1,6 +1,6 @@ diff --git a/mozilla/webtools/litmus/templates/en/default/form_widgets/select_email.tmpl b/mozilla/webtools/litmus/templates/en/default/form_widgets/select_email.tmpl index 44d6b3287ea..f7a19747ffe 100644 --- a/mozilla/webtools/litmus/templates/en/default/form_widgets/select_email.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/form_widgets/select_email.tmpl @@ -3,7 +3,7 @@ [% IF users %] [% FOREACH user=users %] [% user.email | html | uri | email%] + value="[% user.email | html | email | js %]">[% user.email | html | email | js %] [% END %] [% END %] - \ No newline at end of file + diff --git a/mozilla/webtools/litmus/templates/en/default/global/header.html.tmpl b/mozilla/webtools/litmus/templates/en/default/global/header.html.tmpl index 58b7c7c834b..96a2f64052b 100644 --- a/mozilla/webtools/litmus/templates/en/default/global/header.html.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/global/header.html.tmpl @@ -33,7 +33,7 @@ -Litmus - [% title FILTER html %] +Litmus - [% title | html %] @@ -74,4 +74,4 @@ function MM_findObj(n) { border="0" width="600" height="58">

- \ No newline at end of file + diff --git a/mozilla/webtools/litmus/templates/en/default/global/selects.none.tmpl b/mozilla/webtools/litmus/templates/en/default/global/selects.none.tmpl index a8fd21fc757..a471b59a4fc 100755 --- a/mozilla/webtools/litmus/templates/en/default/global/selects.none.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/global/selects.none.tmpl @@ -44,14 +44,14 @@ [% IF defaultplatform %] [% valuelist = defaultplatform.list.join(',') %] - + value="[%valuelist | html%]"> [% END %] [% END %] @@ -66,12 +66,12 @@ [% ELSE %] [% testidflag = "" %][% END %] [% IF defaultopsys %] [% valuelist = defaultopsys.list.join(',') %] - + value="[%valuelist | html%]"> [% END %] - [% END %] @@ -86,12 +86,12 @@ [% ELSE %] [% testidflag = "" %][% END %] [% IF defaultbranch %] [% valuelist = defaultbranch.list.join(',') %] - + value="[%valuelist | html%]"> [% END %] - [% END %] @@ -106,12 +106,12 @@ [% ELSE %] [% testidflag = "" %][% END %] [% IF defaultbranch %] [% valuelist = defaultlocale.list.join(',') %] - + value="[%valuelist | html%]"> [% END %] - [% END %] @@ -128,13 +128,13 @@ [% ELSE %] [% testidflag = "" %][% END %] [% IF default %] [% valuelist = default.list.join(',') %] - + value="[%default | html%]"> [% END %] - [% END %] @@ -151,12 +151,12 @@ [% ELSE %] [% testidflag = "" %][% END %] [% IF default %] [% valuelist = default.list.join(',') %] - + value="[%valuelist | html%]"> [% END %] - @@ -175,13 +175,13 @@ [% ELSE %] [% testidflag = "" %][% END %] [% IF selected %] [% valuelist = selected.list.join(',') %] - + value="[%valuelist | html%]"> [% END %] - -[% END %] \ No newline at end of file +[% END %] diff --git a/mozilla/webtools/litmus/templates/en/default/index.html.tmpl b/mozilla/webtools/litmus/templates/en/default/index.html.tmpl deleted file mode 100755 index 8accc65bccb..00000000000 --- a/mozilla/webtools/litmus/templates/en/default/index.html.tmpl +++ /dev/null @@ -1,228 +0,0 @@ -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is Litmus. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Zach Lipton -#%] - -[%# INTERFACE: - # @products - a list of all product objects in the system - # @hotlist - a hotlist of the top 15 confirmed failures for - # all products -#%] - -[% INCLUDE global/header.html.tmpl title = 'Home' %] - -
-

- - - Main Menu - -

- - - Run Tests: - -
- - - - -
- - - -
-
- - Product: - -
- 		- -
- - -
- - -
- Enter a test ID: -
-
- - -
- -
-
-
-

- - - Test Groups - -

- - - [% FOREACH curproduct = products %] - - [% END %] - - [% FOREACH curproduct = products %] - - [% END %] - -
-
- [% INCLUDE hotlist title='Testing Hotlist - Top 15 Confirmed Failures' hotlist = hotlist %] -
- -[% INCLUDE global/footer.html.tmpl style="position: absolute;" %] diff --git a/mozilla/webtools/litmus/templates/en/default/list/list.html.tmpl b/mozilla/webtools/litmus/templates/en/default/list/list.html.tmpl deleted file mode 100755 index 43ec3d81bff..00000000000 --- a/mozilla/webtools/litmus/templates/en/default/list/list.html.tmpl +++ /dev/null @@ -1,59 +0,0 @@ -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is Litmus. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Zach Lipton -#%] - -[%# INTERFACE: - # @testlist - list of test objects to display - # -#%] - -[% INCLUDE global/header.html.tmpl title = "Test List" %] - -

Query Results

- - - - - - - - - - -[% FOREACH testcase=testlist %] - - - - - - - -[% END %] - -
Testcase #
-
Product
-
Summary
-
Results
-
Status
-
[% INCLUDE product_to_img product=testcase.product %]
[% testcase.summary FILTER html %]
[% INCLUDE platformtable testcase=testcase %]
[% testcase.status.name FILTER html %]
- - -[% INCLUDE global/footer.html.tmpl %] diff --git a/mozilla/webtools/litmus/templates/en/default/logout.tmpl b/mozilla/webtools/litmus/templates/en/default/logout.tmpl index 7e53278cd4a..ea47840d8f4 100644 --- a/mozilla/webtools/litmus/templates/en/default/logout.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/logout.tmpl @@ -34,7 +34,7 @@
-

[% title FILTER html %]

+

[% title | html %]

You have been successfully logged out of Litmus.
diff --git a/mozilla/webtools/litmus/templates/en/default/process/process.html.tmpl b/mozilla/webtools/litmus/templates/en/default/process/process.html.tmpl index b6400faa8c2..90774bafba7 100755 --- a/mozilla/webtools/litmus/templates/en/default/process/process.html.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/process/process.html.tmpl @@ -71,7 +71,7 @@

[% IF testcount %] [% IF testcount > 1 %] [% plural = 's' %] [% END %] - You have submitted [% testcount FILTER html %] + You have submitted [% testcount | html %] test result[% plural | html %]. [% END %] Thank you for your testing efforts.

@@ -85,9 +85,9 @@ Thank you for your testing efforts.

[% ELSE %] [% count = 0 %] [% END %] - - [% curresult FILTER html %]: - [% count FILTER html %] + + [% curresult | html %]: + [% count | html %] [% END %] @@ -97,7 +97,7 @@ Thank you for your testing efforts.

[% FOREACH curchange=changedlist %] [% END %]
- Changes recorded for Test [% curchange FILTER html %] + Changes recorded for Test [% curchange | html %]
diff --git a/mozilla/webtools/litmus/templates/en/default/reporting/result_display.tmpl b/mozilla/webtools/litmus/templates/en/default/reporting/result_display.tmpl index 7fc1bc6d61a..b3eb8e09b42 100644 --- a/mozilla/webtools/litmus/templates/en/default/reporting/result_display.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/reporting/result_display.tmpl @@ -93,7 +93,7 @@ Summary Information [% display_name = result.user.getDisplayName %] Submitted by:[% IF display_name != "" %] -[% IF show_admin %][% END %][% display_name.replace('\@.*','') %][% IF show_admin %][% END %] +[% IF show_admin %][% END %][% display_name.replace('\@.*','') %][% IF show_admin %][% END %] [% ELSE %] Not provided [% END %] @@ -105,7 +105,7 @@ Not provided Vetted By: -[% IF result.vetted_by_user.email %][% result.vetted_by_user.email | html | uri | email %][% ELSE %]Not yet vetted[% END %] +[% IF result.vetted_by_user.email %][% result.vetted_by_user.email | html | email | js %][% ELSE %]Not yet vetted[% END %] Vetted on:[% IF result.vetted_timestamp %][% result.vetted_timestamp | html %][% ELSE %]Not yet vetted[% END %] @@ -229,14 +229,14 @@ You must log in before you can leave comments.

------- Comment #[% comment_num | html %] From [% IF comment.user.email %] - - [% comment.user.email FILTER html | email %] + + [% comment.user.email | html | email | js %] [% ELSE %] Anonymous [% END %] [% comment.submission_time.strftime("%Y-%m-%d %T %Z") | html %] -------

-

[% comment.comment FILTER html %]

+

[% comment.comment | html %]

[% comment_num=comment_num+1 %] [% END %] diff --git a/mozilla/webtools/litmus/templates/en/default/reporting/test_results.tmpl b/mozilla/webtools/litmus/templates/en/default/reporting/test_results.tmpl index 10d0ec3cebf..2348d623757 100644 --- a/mozilla/webtools/litmus/templates/en/default/reporting/test_results.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/reporting/test_results.tmpl @@ -39,7 +39,7 @@ var comments = new Array(); [% subscript=0 %] [% FOREACH result=results %] - comments[[% subscript | js %]] = "[% IF result.comments %][% FOREACH comment=result.comments %][% IF loop.count>1 %]
[% END %]

[% IF show_admin %][% END %][% comment.user.getDisplayName | html | js | email %][% IF show_admin %][% END %]
[% comment.submission_time.strftime("%Y-%m-%d %T") %]
[% commenticon | none %] [% comment.comment | js | html %]

[% END %][% END %]"; + comments[[% subscript | js %]] = "[% IF result.comments %][% FOREACH comment=result.comments %][% IF loop.count>1 %]
[% END %]

[% IF show_admin %][% END %][% comment.user.getDisplayName | html | email | js %][% IF show_admin %][% END %]
[% comment.submission_time.strftime("%Y-%m-%d %T") %]
[% commenticon | none %] [% comment.comment | js | html %]

[% END %][% END %]"; [% subscript=subscript+1 %] [% END %] @@ -95,7 +95,7 @@ [% result.testcase_id | html %]: [% result.summary | html %] - [% IF show_admin==1 %][% result.email | html | uri | email %][% END %] + [% IF show_admin==1 %][% result.email | html | email | js %][% END %] [% result.product_name | html %] [% IF result.iconpath %][% result.platform_name | html %][% ELSE %][% result.platform_name | html %][% END %] [% result.branch_name | html %] diff --git a/mozilla/webtools/litmus/templates/en/default/reporting/testday_results.tmpl b/mozilla/webtools/litmus/templates/en/default/reporting/testday_results.tmpl index 3207de953f8..6ec21e53263 100755 --- a/mozilla/webtools/litmus/templates/en/default/reporting/testday_results.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/reporting/testday_results.tmpl @@ -58,8 +58,8 @@ [% rowstyle = 'odd' %] [% END %] -[% IF loop.first OR user_result.num_results == num_results %][% num_results = user_result.num_results %]Trophy! [% END %][% IF show_admin %][% END %][% IF user_result.irc_nickname %][% user_result.irc_nickname | email | html %][% ELSE %][% IF show_admin %][% user_result.email | email %][% ELSE %][% user_result.email | userFromEmail %][% END %][% END %][% IF show_admin %][% END %] -[% IF show_admin %][% END %][% user_result.num_results %][% IF show_admin %][% END %] +[% IF loop.first OR user_result.num_results == num_results %][% num_results = user_result.num_results %]Trophy! [% END %][% IF show_admin %][% END %][% IF user_result.irc_nickname %][% user_result.irc_nickname | html | email | js %][% ELSE %][% IF show_admin %][% user_result.email | html| email | js %][% ELSE %][% user_result.email | html | userFromEmail | js %][% END %][% END %][% IF show_admin %][% END %] +[% IF show_admin %][% END %][% user_result.num_results %][% IF show_admin %][% END %] [% END %] @@ -94,10 +94,10 @@ [% FOR user_status_result IN user_status_results %] -[% IF show_admin %][% END %][% IF user_status_result.irc_nickname %][% user_status_result.irc_nickname | email | html %][% ELSE %][% IF show_admin %][% user_status_result.email | email %][% ELSE %][% user_status_result.email | userFromEmail %][% END %][% END %][% IF show_admin %][% END %] -[% IF user_status_result.pass %][% IF show_admin %][% END %][% user_status_result.pass %][% IF show_admin %][% END %][% ELSE %]0[% END %] -[% IF user_status_result.fail %][% IF show_admin %][% END %][% user_status_result.fail %][% IF show_admin %][% END %][% ELSE %]0[% END %] -[% IF user_status_result.unclear %][% IF show_admin %][% END %][% user_status_result.unclear %][% IF show_admin %][% END %][% ELSE %]0[% END %] +[% IF show_admin %][% END %][% IF user_status_result.irc_nickname %][% user_status_result.irc_nickname | html | email | js %][% ELSE %][% IF show_admin %][% user_status_result.email | html | email | js %][% ELSE %][% user_status_result.email | html | userFromEmail | js %][% END %][% END %][% IF show_admin %][% END %] +[% IF user_status_result.pass %][% IF show_admin %][% END %][% user_status_result.pass %][% IF show_admin %][% END %][% ELSE %]0[% END %] +[% IF user_status_result.fail %][% IF show_admin %][% END %][% user_status_result.fail %][% IF show_admin %][% END %][% ELSE %]0[% END %] +[% IF user_status_result.unclear %][% IF show_admin %][% END %][% user_status_result.unclear %][% IF show_admin %][% END %][% ELSE %]0[% END %] [% END %] @@ -274,4 +274,4 @@ - \ No newline at end of file + diff --git a/mozilla/webtools/litmus/templates/en/default/runtests/resultssubmitted.html.tmpl b/mozilla/webtools/litmus/templates/en/default/runtests/resultssubmitted.html.tmpl index f1569f47a03..68da6785ac8 100755 --- a/mozilla/webtools/litmus/templates/en/default/runtests/resultssubmitted.html.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/runtests/resultssubmitted.html.tmpl @@ -58,7 +58,7 @@ Results submitted [% IF testcount %] [% IF testcount > 1 %] [% plural = 's' %] [% END %] -

You have submitted [% testcount FILTER html %] test +

You have submitted [% testcount | html %] test result[% plural | html %].

[% END %] @@ -73,8 +73,8 @@ Results submitted [% count = 0 %] [% END %] - [% curresult FILTER html %]: - [% count FILTER html %] + [% curresult | html %]: + [% count | html %] [% END %] @@ -84,7 +84,7 @@ Results submitted [% FOREACH curchange=changedlist %] [% END %]
- Changes recorded for Test [% curchange FILTER html %] + Changes recorded for Test [% curchange | html %]
diff --git a/mozilla/webtools/litmus/templates/en/default/runtests/selectgroupsubgroup.html.tmpl b/mozilla/webtools/litmus/templates/en/default/runtests/selectgroupsubgroup.html.tmpl index 3d03cb0464f..10f4d419652 100755 --- a/mozilla/webtools/litmus/templates/en/default/runtests/selectgroupsubgroup.html.tmpl +++ b/mozilla/webtools/litmus/templates/en/default/runtests/selectgroupsubgroup.html.tmpl @@ -132,11 +132,11 @@ Select Testing Group [% selected = "" %] [% END %] - - [% testgroup.name FILTER html %] - [% personal_completed FILTER html %][% IF personal_completed != 'N/A' %]%[% END %] - [% community_completed FILTER html %][% IF community_completed != 'N/A' %]%[% END %] + [% testgroup.name | html %] + [% personal_completed | html %][% IF personal_completed != 'N/A' %]%[% END %] + [% community_completed | html %][% IF community_completed != 'N/A' %]%[% END %] [% END %] @@ -180,7 +180,7 @@ Please select a testing group with testcases, or that has not yet been tested in [% FOREACH testgroup = subgroups.keys %] [% cursubgrouplist = subgroups.$testgroup %] -