- standardize on shorter | call for template filters

- standardize how email addresses get filtered (| html | email | js)
- update selenium testcase associated with email filtering
- remove perl script and template files that are no longer used


git-svn-id: svn://10.0.0.236/trunk@236984 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ccooper%deadsquid.com 2007-10-01 13:36:08 +00:00
parent 376031fe6a
commit bf8acdce86
27 changed files with 97 additions and 659 deletions

View File

@ -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,

View File

@ -16,7 +16,7 @@
<tr>
<td>select</td>
<td>email</td>
<td>label=ccooper@deadsquid.com</td>
<td>label=ccooper&#64;deadsquid.com</td>
</tr>
<tr>
<td>clickAndWait</td>

View File

@ -112,7 +112,7 @@ function checkFormContents(f) {
[% FOREACH group=groups %]
<tr>
<td><input name="group_[%group.id | html %]" type="checkbox" value="1" [% IF user.inGroup(group) %] checked [%END%]></td>
<td>[% group.name FILTER html %]</td>
<td>[% group.name | html %]</td>
</tr>
[% END %]
</table>

View File

@ -34,7 +34,7 @@ And belonging to group(s):
[% id = group.group_id %]
<tr>
<td><input name="group_[%group.id | html %]" type="checkbox" value="1" [% IF checked.$id %] checked [%END%]></td>
<td>[% group.name FILTER html %]</td>
<td>[% group.name | html %]</td>
</tr>
[% END %]
</table>

View File

@ -42,8 +42,8 @@
[% IF params %]
[% FOREACH curdata = params.param() %]
[% IF ! params.param(curdata) %] [% NEXT %] [% END %]
<input name="[%curdata FILTER html %]" type="hidden"
value="[% params.param(curdata) FILTER html %]">
<input name="[%curdata | html %]" type="hidden"
value="[% params.param(curdata) | html %]">
[% END %]
[% END %]
[% END %]
@ -63,11 +63,11 @@
<div class="section-content">
<p>Thank you,[% IF realname != "" %] [% realname | html %],[% END %] your account has been created<p>
<p>For future testing sessions, you can login using your email address ([% email FILTER html %]) and your chosen password.</p>
<p>For future testing sessions, you can login using your email address ([% email | html %]) and your chosen password.</p>
<p>Thank you for your contribution to Mozilla QA.</p>
<form name="form" action="[% return_to FILTER html %]" method="post">
<form name="form" action="[% return_to | html %]" method="post">
[% INCLUDE create_hidden_fields %]
<input type="hidden" name="accountCreated" value="true" />
[% IF ! login_extension %]

View File

@ -45,8 +45,8 @@
[% FOREACH curdata = params.param() %]
[% IF ! params.param(curdata) %] [% NEXT %] [% END %]
[% FOREACH p = params.param(curdata) %]
<input name="[% curdata FILTER html %]" type="hidden"
value="[% p FILTER html %]">
<input name="[% curdata | html %]" type="hidden"
value="[% p | html %]">
[% END %]
[% END %]
[% END %]

View File

@ -40,7 +40,7 @@
<h1 class="errorHeading">Error</h1>
<div class="error">[% message FILTER html %]</div>
<div class="error">[% message | html %]</div>
</div> <!--END content-->

View File

@ -47,8 +47,8 @@
[% IF params %]
[% FOREACH curdata = params.param() %]
[% IF ! params.param(curdata) %] [% NEXT %] [% END %]
<input name="[%curdata FILTER html %]" type="hidden"
value="[% params.param(curdata) FILTER html %]">
<input name="[%curdata | html %]" type="hidden"
value="[% params.param(curdata) | html %]">
[% END %]
[% END %]
[% END %]

View File

@ -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 <gerv@gerv.net>
# Zach Lipton <zach@zachlipton.com>
# 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',
],
);

View File

@ -1,6 +1,6 @@
<input type="text" size="10" name="testcase_id"
value="[% IF defaults.testcase_id != '' %]
[% defaults.testcase_id FILTER html %]
[% defaults.testcase_id | html %]
[% ELSE %]-Testcase ID#-
[% END %]"
onFocus="if(this.value=='-Test #-'){this.value = '';}">

View File

@ -3,7 +3,7 @@
[% IF users %]
[% FOREACH user=users %]
<option[% IF defaults.email==user.email %] selected[% END %]
value="[% user.email | html | uri | email %]">[% user.email | html | uri | email%]</option>
value="[% user.email | html | email | js %]">[% user.email | html | email | js %]</option>
[% END %]
[% END %]
</select>
</select>

View File

@ -33,7 +33,7 @@
<html>
<head>
<title>Litmus - [% title FILTER html %]</title>
<title>Litmus - [% title | html %]</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="skins/litmus.css" rel="stylesheet" type="text/css">
@ -74,4 +74,4 @@ function MM_findObj(n) {
border="0" width="600" height="58"></span> </p>
<p id="banner-version"> <a href="index.cgi"><span>Litmus</span></a>
<span> - [% constants.litmus_version | html %]</span> </p>
</div>
</div>

View File

@ -44,14 +44,14 @@
[% IF defaultplatform %]
[% valuelist = defaultplatform.list.join(',') %]
<input name="platform[%testidflag FILTER html %]_default"
id="platform[%testidflag FILTER html %]_default"
<input name="platform[%testidflag | html %]_default"
id="platform[%testidflag | html %]_default"
type="hidden"
value="[%valuelist FILTER html%]">
value="[%valuelist | html%]">
[% END %]
<select name="platform[%testidflag | html %]"
id="platform[%testidflag FILTER html%]"
onchange="changePlatform([%testcase.testcase_id FILTER js%])"
id="platform[%testidflag | html%]"
onchange="changePlatform([%testcase.testcase_id | js%])"
class="select_platform">
</select>
[% END %]
@ -66,12 +66,12 @@
[% ELSE %] [% testidflag = "" %][% END %]
[% IF defaultopsys %]
[% valuelist = defaultopsys.list.join(',') %]
<input name="opsys[%testidflag FILTER html %]_default"
id="opsys[%testidflag FILTER html %]_default"
<input name="opsys[%testidflag | html %]_default"
id="opsys[%testidflag | html %]_default"
type="hidden"
value="[%valuelist FILTER html%]">
value="[%valuelist | html%]">
[% END %]
<select name="opsys[%testidflag FILTER html%]" id="opsys[%testidflag FILTER html%]"
<select name="opsys[%testidflag | html%]" id="opsys[%testidflag | html%]"
class="select_opsys">
</select>
[% END %]
@ -86,12 +86,12 @@
[% ELSE %] [% testidflag = "" %][% END %]
[% IF defaultbranch %]
[% valuelist = defaultbranch.list.join(',') %]
<input name="branch[%testidflag FILTER html %]_default"
id="branch[%testidflag FILTER html %]_default"
<input name="branch[%testidflag | html %]_default"
id="branch[%testidflag | html %]_default"
type="hidden"
value="[%valuelist FILTER html%]">
value="[%valuelist | html%]">
[% END %]
<select name="branch[%testidflag FILTER html%][% nameextra %]" id="branch[%testidflag FILTER html%][% nameextra %]"[% IF multiple %] multiple[% END %][% IF size %] size="[% size %]"[% END %][% IF onchange %] onchange="[% onchange %]"[% END %]
<select name="branch[%testidflag | html%][% nameextra %]" id="branch[%testidflag | html%][% nameextra %]"[% IF multiple %] multiple[% END %][% IF size %] size="[% size %]"[% END %][% IF onchange %] onchange="[% onchange %]"[% END %]
class="select_branch">
</select>
[% END %]
@ -106,12 +106,12 @@
[% ELSE %] [% testidflag = "" %][% END %]
[% IF defaultbranch %]
[% valuelist = defaultlocale.list.join(',') %]
<input name="locale[%testidflag FILTER html %]_default"
id="locale[%testidflag FILTER html %]_default"
<input name="locale[%testidflag | html %]_default"
id="locale[%testidflag | html %]_default"
type="hidden"
value="[%valuelist FILTER html%]">
value="[%valuelist | html%]">
[% END %]
<select name="locale[%testidflag FILTER html%]" id="locale[%testidflag FILTER html%]"
<select name="locale[%testidflag | html%]" id="locale[%testidflag | html%]"
class="select_locale">
</select>
[% END %]
@ -128,13 +128,13 @@
[% ELSE %] [% testidflag = "" %][% END %]
[% IF default %]
[% valuelist = default.list.join(',') %]
<input name="testgroup[%testidflag FILTER html %]_default"
id="testgroup[%testidflag FILTER html %]_default"
<input name="testgroup[%testidflag | html %]_default"
id="testgroup[%testidflag | html %]_default"
type="hidden"
value="[%default FILTER html%]">
value="[%default | html%]">
[% END %]
<select name="testgroup[%testidflag FILTER html%][%nameextra%]" id="testgroup[%testidflag FILTER html%][%nameextra%]"
onchange="[% IF onchange %][% onchange %][% ELSE %]changeTestgroup([%testcase.testcase_id FILTER js%])[%END%]"
<select name="testgroup[%testidflag | html%][%nameextra%]" id="testgroup[%testidflag | html%][%nameextra%]"
onchange="[% IF onchange %][% onchange %][% ELSE %]changeTestgroup([%testcase.testcase_id | js%])[%END%]"
class="select_testgroup">
</select>
[% END %]
@ -151,12 +151,12 @@
[% ELSE %] [% testidflag = "" %][% END %]
[% IF default %]
[% valuelist = default.list.join(',') %]
<input name="subgroup[%testidflag FILTER html %]_default"
id="subgroup[%testidflag FILTER html %]_default"
<input name="subgroup[%testidflag | html %]_default"
id="subgroup[%testidflag | html %]_default"
type="hidden"
value="[%valuelist FILTER html%]">
value="[%valuelist | html%]">
[% END %]
<select name="subgroup[%testidflag FILTER html%][%nameextra%]" id="subgroup[%testidflag FILTER html%][%nameextra%]"
<select name="subgroup[%testidflag | html%][%nameextra%]" id="subgroup[%testidflag | html%][%nameextra%]"
class="select_subgroup"
[%IF onchange %]onchange="[%onchange%]"[%END%]>
</select>
@ -175,13 +175,13 @@
[% ELSE %] [% testidflag = "" %][% END %]
[% IF selected %]
[% valuelist = selected.list.join(',') %]
<input name="product[%testidflag FILTER html %]_default"
id="product[%testidflag FILTER html %]_default"
<input name="product[%testidflag | html %]_default"
id="product[%testidflag | html %]_default"
type="hidden"
value="[%valuelist FILTER html%]">
value="[%valuelist | html%]">
[% END %]
<select name="product[%testidflag FILTER html%][%nameextra%]" id="product[%testidflag FILTER html%][%nameextra%]"
onchange="[% IF onchange %][% onchange %][% ELSE %]changeProduct([%testcase.testcase_id FILTER js%])[% END %]"
<select name="product[%testidflag | html%][%nameextra%]" id="product[%testidflag | html%][%nameextra%]"
onchange="[% IF onchange %][% onchange %][% ELSE %]changeProduct([%testcase.testcase_id | js%])[% END %]"
class="select_product"[% IF disabled %] disabled[% END %]>
</select>
[% END %]
[% END %]

View File

@ -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 <zach@zachlipton.com>
#%]
[%# 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' %]
<div class="menubox">
<p>
<strong>
<font size="+3">
Main Menu</font>
</strong>
</p>
<form name="runtests" method="get" action="run_tests.cgi">
<font size="+2">
Run Tests:
</font>
<br>
<table border="0">
<tr>
<td>
<div align="right">
<strong>
Product:
</strong>
</div>
</td>
<td>
<select name="product" id="product">
[% FOREACH curproduct = products %]
<option value="[% curproduct.id FILTER html %]">
[% curproduct.name FILTER html %]
</option>
[% END %]
</select>
</td>
<br>
<tr>
<td>
</td>
<td>
<input name="runtests" type="submit" id="runtests" value="Go">
</td>
</table>
</table>
</form>
<hr>
<strong>Enter a test ID:</strong>
<br />
<form name="search" method="get" action="show_test.cgi">
<input name="id" type="text" size="7">
<input name="search" type="submit" id="search" value="View Test">
</form>
<!--
<hr>
<ul>
<li>
<a href="#">
Browse tests
</a>
</li>
<li>
<a href="#">
Query tests
</a>
</li>
<li>
<a href="#">
Reports
</a>
</li>
</ul>
<hr>
<strong>
Quick Links:
</strong>
<br>
<ul>
<li>
Trunk
<ul>
<li>
<a href="#">
Hotlist
</a>
</li>
<li>
<a href="#">
Failures:
</a>
<ul>
<li>
<a href="#">
Confirmed
</a>
</li>
<li>
<a href="#">
Unconfirmed
</a>
</li>
</ul>
</li>
<li>
To be run:
<ul>
<li>
<a href="#">
Windows
</a>
</li>
<li>
<a href="#">
Linux
</a>
</li>
<li>
<a href="#">
Mac
</a>
</li>
</ul>
</li>
</ul>
</li>
<li>
Branch
<ul>
<li>
<a href="#">
Hotlist
</a>
</li>
<li>
<a href="#">
Failures:
</a>
<ul>
<li>
<a href="#">
Confirmed
</a>
</li>
<li>
<a href="#">
Unconfirmed
</a>
</li>
</ul>
</li>
<li>
To be run:
<ul>
<li>
<a href="#">
Windows
</a>
</li>
<li>
<a href="#">
Linux
</a>
</li>
<li>
<a href="#">
Mac
</a>
</li>
</ul>
</li>
</ul>
</li>
</ul>
-->
</div>
<div class="menu_content">
<div class="suitelist">
<p>
<strong>
<font size="+3">
Test Groups</font>
</strong>
</p>
<table width="100%" border="0">
<tr>
[% FOREACH curproduct = products %]
<td><div align="center"><strong>
<a href="#">[% curproduct.name FILTER html %]</a>
</strong></div></td>
[% END %]
</tr><tr>
[% FOREACH curproduct = products %]
<td><ul>
[% FOREACH curgroup = curproduct.testgroups %]
<li><a href="run_tests.cgi?product=[% curproduct.productid FILTER html %]&testgroup=[% curgroup.testgroupid FILTER html %]">
[% curgroup.name FILTER html %]</a></li>
[% END %]
</ul></td>
[% END %]
</tr>
</table>
</div>
[% INCLUDE hotlist title='Testing Hotlist - Top 15 Confirmed Failures' hotlist = hotlist %]
</div>
[% INCLUDE global/footer.html.tmpl style="position: absolute;" %]

View File

@ -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 <zach@zachlipton.com>
#%]
[%# INTERFACE:
# @testlist - list of test objects to display
#
#%]
[% INCLUDE global/header.html.tmpl title = "Test List" %]
<p class="pagetitle">Query Results</p>
<table width="75%" border="0">
<tr>
<th width="5%"><div align="center"><strong>Testcase #</strong></div>
</th>
<th width="4%"><div align="center">Product</div>
</th>
<th width="53%"><div align="center"><strong>Summary</strong></div>
</th>
<th width="10%"><div align="center"><strong>Results</strong></div>
</th>
<th width="8%"><div align="center"><strong>Status</strong></div>
</th>
</tr>
[% FOREACH testcase=testlist %]
<tr>
<td><div align="center">
<a href="show_test.cgi?id=[% testcase.testcase_id FILTER html | uri %]">[% testcase.testcase_id FILTER html %]</a>
</div></td>
<td><div align="center">[% INCLUDE product_to_img product=testcase.product %]</div></td>
<td><div align="center">[% testcase.summary FILTER html %]</div></td>
<td><div align="center">[% INCLUDE platformtable testcase=testcase %]</div></td>
<td><div align="center">[% testcase.status.name FILTER html %]</div></td>
</tr>
[% END %]
</table>
[% INCLUDE global/footer.html.tmpl %]

View File

@ -34,7 +34,7 @@
<div id="content">
<h1 class="firstHeading">[% title FILTER html %]</h1>
<h1 class="firstHeading">[% title | html %]</h1>
You have been successfully logged out of Litmus.
</div> <!--END content-->

View File

@ -71,7 +71,7 @@
<p>
[% IF testcount %]
[% IF testcount > 1 %] [% plural = 's' %] [% END %]
You have submitted <strong>[% testcount FILTER html %]</strong>
You have submitted <strong>[% testcount | html %]</strong>
test result[% plural | html %].
[% END %]
Thank you for your testing efforts.</p>
@ -85,9 +85,9 @@ Thank you for your testing efforts.</p>
[% ELSE %]
[% count = 0 %]
[% END %]
<tr class="[% curresult.search('unclear') ? 'unclear' : curresult FILTER lower %]">
<td><strong>[% curresult FILTER html %]:</strong></td>
<td>[% count FILTER html %]</td>
<tr class="[% curresult.search('unclear') ? 'unclear' : curresult | lower %]">
<td><strong>[% curresult | html %]:</strong></td>
<td>[% count | html %]</td>
</tr>
[% END %]
</table>
@ -97,7 +97,7 @@ Thank you for your testing efforts.</p>
<table border="1">
[% FOREACH curchange=changedlist %]
<tr><td>
<strong>Changes recorded for Test [% curchange FILTER html %]</strong>
<strong>Changes recorded for Test [% curchange | html %]</strong>
</td></tr>
[% END %]
</table>

View File

@ -93,7 +93,7 @@ Summary Information
<tr class="odd">
[% display_name = result.user.getDisplayName %]
<td>Submitted by:</td><td>[% IF display_name != "" %]
[% IF show_admin %]<a href="mailto:[% result.user.email | html | uri | email %]?subject='Litmus test result submission #[% result.testresult_id | html | uri %]'">[% END %][% display_name.replace('\@.*','') %][% IF show_admin %]</a>[% END %]
[% IF show_admin %]<a href="mailto:[% result.user.email | html | email | js %]?subject='Litmus test result submission #[% result.testresult_id | html | uri %]'">[% END %][% display_name.replace('\@.*','') %][% IF show_admin %]</a>[% END %]
[% ELSE %]
Not provided
[% END %]</td>
@ -105,7 +105,7 @@ Not provided
</tr>
<tr class="odd">
<td>Vetted By:</td>
<td>[% IF result.vetted_by_user.email %][% result.vetted_by_user.email | html | uri | email %][% ELSE %]Not yet vetted[% END %]</td>
<td>[% IF result.vetted_by_user.email %][% result.vetted_by_user.email | html | email | js %][% ELSE %]Not yet vetted[% END %]</td>
</tr>
<tr class="even">
<td>Vetted on:</td><td>[% IF result.vetted_timestamp %][% result.vetted_timestamp | html %][% ELSE %]Not yet vetted[% END %]</td>
@ -229,14 +229,14 @@ You must log in before you can leave comments.
<p><em>------- Comment <a name="c[% comment_num | uri | html %]"
href="#c[% comment_num | uri | html%]">#[% comment_num | html %]</a> From
[% IF comment.user.email %]
<a href="mailto:[% comment.user.email FILTER html | uri | email %]">
[% comment.user.email FILTER html | email %]</a>
<a href="mailto:[% comment.user.email | html | email | js %]">
[% comment.user.email | html | email | js %]</a>
[% ELSE %]
Anonymous
[% END %]
[% comment.submission_time.strftime("%Y-%m-%d %T %Z") | html %] -------</em></p>
<p>[% comment.comment FILTER html %]</p>
<p>[% comment.comment | html %]</p>
[% comment_num=comment_num+1 %]
[% END %]

View File

@ -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 %]<hr/>[% END %]<p class='comment'><b>[% IF show_admin %]<a href=\"mailto:[% comment.user.email | html | email | uri %]\">[% END %][% comment.user.getDisplayName | html | js | email %][% IF show_admin %]</a>[% END %]<br/>[% comment.submission_time.strftime("%Y-%m-%d&nbsp;%T") %]</b><br/>[% commenticon | none %]&nbsp;[% comment.comment | js | html %]<br/></p>[% END %][% END %]";
comments[[% subscript | js %]] = "[% IF result.comments %][% FOREACH comment=result.comments %][% IF loop.count>1 %]<hr/>[% END %]<p class='comment'><b>[% IF show_admin %]<a href=\"mailto:[% comment.user.email | html | email | js %]\">[% END %][% comment.user.getDisplayName | html | email | js %][% IF show_admin %]</a>[% END %]<br/>[% comment.submission_time.strftime("%Y-%m-%d&nbsp;%T") %]</b><br/>[% commenticon | none %]&nbsp;[% comment.comment | js | html %]<br/></p>[% END %][% END %]";
[% subscript=subscript+1 %]
[% END %]
</script>
@ -95,7 +95,7 @@
</td>
<td align="left"><a href="show_test.cgi?id=[% result.testcase_id | html | uri %]">
[% result.testcase_id | html %]</a>: [% result.summary | html %]</td>
[% IF show_admin==1 %]<td align="center">[% result.email | html | uri | email %]</td>[% END %]
[% IF show_admin==1 %]<td align="center">[% result.email | html | email | js %]</td>[% END %]
<td align="center">[% result.product_name | html %]</td>
<td align="center">[% IF result.iconpath %]<img height="16" src="[% result.iconpath %]" alt="[% result.platform_name | html %]" title="[% result.platform_name | html %]" />[% ELSE %][% result.platform_name | html %][% END %]</td>
<td align="center">[% result.branch_name | html %]</td>

View File

@ -58,8 +58,8 @@
[% rowstyle = 'odd' %]
[% END %]
<tr class="[% rowstyle %]">
<td align="center">[% IF loop.first OR user_result.num_results == num_results %][% num_results = user_result.num_results %]<img src="images/trophy.gif" alt="Trophy!" align="absmiddle" />&nbsp;[% END %][% IF show_admin %]<a href="mailto:[% user_result.email | email %]">[% 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 %]</a>[% END %]</td>
<td align="center">[% IF show_admin %]<a href="advanced_search.cgi?email=[% user_result.email %]&amp;start_date=[% test_event.getStartTimestamp %]&amp;end_date=[% test_event.getFinishTimestamp %]&amp;limit=[% user_result.num_results %]">[% END %][% user_result.num_results %][% IF show_admin %]</a>[% END %]</td>
<td align="center">[% IF loop.first OR user_result.num_results == num_results %][% num_results = user_result.num_results %]<img src="images/trophy.gif" alt="Trophy!" align="absmiddle" />&nbsp;[% END %][% IF show_admin %]<a href="mailto:[% user_result.email | html | email | js %]">[% 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 %]</a>[% END %]</td>
<td align="center">[% IF show_admin %]<a href="advanced_search.cgi?email=[% user_result.email | html | email | js %]&amp;start_date=[% test_event.getStartTimestamp %]&amp;end_date=[% test_event.getFinishTimestamp %]&amp;limit=[% user_result.num_results %]">[% END %][% user_result.num_results %][% IF show_admin %]</a>[% END %]</td>
</tr>
[% END %]
</table>
@ -94,10 +94,10 @@
</tr>
[% FOR user_status_result IN user_status_results %]
<tr>
<td align="center">[% IF show_admin %]<a href="mailto:[% user_status_result.email | email %]">[% 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 %]</a>[% END %]</td>
<td class="pass" align="center">[% IF user_status_result.pass %][% IF show_admin %]<a href="advanced_search.cgi?email=[% user_status_result.email %]&amp;start_date=[% test_event.getStartTimestamp %]&amp;end_date=[% test_event.getFinishTimestamp %]&amp;result_status=pass&amp;limit=[% user_status_result.pass %]">[% END %][% user_status_result.pass %][% IF show_admin %]</a>[% END %][% ELSE %]0[% END %]</td>
<td class="fail" align="center">[% IF user_status_result.fail %][% IF show_admin %]<a href="advanced_search.cgi?email=[% user_status_result.email %]&amp;start_date=[% test_event.getStartTimestamp %]&amp;end_date=[% test_event.getFinishTimestamp %]&amp;result_status=fail&amp;limit=[% user_status_result.fail %]">[% END %][% user_status_result.fail %][% IF show_admin %]</a>[% END %][% ELSE %]0[% END %]</td>
<td class="unclear" align="center">[% IF user_status_result.unclear %][% IF show_admin %]<a href="advanced_search.cgi?email=[% user_status_result.email %]&amp;start_date=[% test_event.getStartTimestamp %]&amp;end_date=[% test_event.getFinishTimestamp %]&amp;result_status=unclear&amp;limit=[% user_status_result.unclear %]">[% END %][% user_status_result.unclear %][% IF show_admin %]</a>[% END %][% ELSE %]0[% END %]</td>
<td align="center">[% IF show_admin %]<a href="mailto:[% user_status_result.email | html | email | js %]">[% 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 %]</a>[% END %]</td>
<td class="pass" align="center">[% IF user_status_result.pass %][% IF show_admin %]<a href="advanced_search.cgi?email=[% user_status_result.email | html | email | js %]&amp;start_date=[% test_event.getStartTimestamp %]&amp;end_date=[% test_event.getFinishTimestamp %]&amp;result_status=pass&amp;limit=[% user_status_result.pass %]">[% END %][% user_status_result.pass %][% IF show_admin %]</a>[% END %][% ELSE %]0[% END %]</td>
<td class="fail" align="center">[% IF user_status_result.fail %][% IF show_admin %]<a href="advanced_search.cgi?email=[% user_status_result.email | html| email | js %]&amp;start_date=[% test_event.getStartTimestamp %]&amp;end_date=[% test_event.getFinishTimestamp %]&amp;result_status=fail&amp;limit=[% user_status_result.fail %]">[% END %][% user_status_result.fail %][% IF show_admin %]</a>[% END %][% ELSE %]0[% END %]</td>
<td class="unclear" align="center">[% IF user_status_result.unclear %][% IF show_admin %]<a href="advanced_search.cgi?email=[% user_status_result.email | html | email | js %]&amp;start_date=[% test_event.getStartTimestamp %]&amp;end_date=[% test_event.getFinishTimestamp %]&amp;result_status=unclear&amp;limit=[% user_status_result.unclear %]">[% END %][% user_status_result.unclear %][% IF show_admin %]</a>[% END %][% ELSE %]0[% END %]</td>
</tr>
[% END %]
</table>
@ -274,4 +274,4 @@
</table>
</div>
</div>

View File

@ -58,7 +58,7 @@ Results submitted
[% IF testcount %]
[% IF testcount > 1 %] [% plural = 's' %] [% END %]
<p class="pageinstruction"> You have submitted [% testcount FILTER html %] test
<p class="pageinstruction"> You have submitted [% testcount | html %] test
result[% plural | html %].
</p>
[% END %]
@ -73,8 +73,8 @@ Results submitted
[% count = 0 %]
[% END %]
<tr>
<td><strong>[% curresult FILTER html %]:</strong></td>
<td>[% count FILTER html %]</td>
<td><strong>[% curresult | html %]:</strong></td>
<td>[% count | html %]</td>
</tr>
[% END %]
</table>
@ -84,7 +84,7 @@ Results submitted
<table border="1">
[% FOREACH curchange=changedlist %]
<tr><td>
<strong>Changes recorded for Test [% curchange FILTER html %]</strong>
<strong>Changes recorded for Test [% curchange | html %]</strong>
</td></tr>
[% END %]
</table>

View File

@ -132,11 +132,11 @@ Select Testing Group
[% selected = "" %]
[% END %]
<td><input [% IF personal_completed == 'N/A' %]disabled [% END %] type="radio" id="testgroup" name="testgroup" value="[% testgroup.testgroup_id FILTER html %]"
<td><input [% IF personal_completed == 'N/A' %]disabled [% END %] type="radio" id="testgroup" name="testgroup" value="[% testgroup.testgroup_id | html %]"
onClick="showsubgroup()" [% selected | none %]>
[% testgroup.name FILTER html %]</td>
<td align="center">[% personal_completed FILTER html %][% IF personal_completed != 'N/A' %]%[% END %]</td>
<td align="center">[% community_completed FILTER html %][% IF community_completed != 'N/A' %]%[% END %]</td>
[% testgroup.name | html %]</td>
<td align="center">[% personal_completed | html %][% IF personal_completed != 'N/A' %]%[% END %]</td>
<td align="center">[% community_completed | html %][% IF community_completed != 'N/A' %]%[% END %]</td>
</tr>
[% 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 %]
<div id="divsubgroup_[% testgroup FILTER html %]" style="display: none;">
<div id="divsubgroup_[% testgroup | html %]" style="display: none;">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td>
@ -224,12 +224,12 @@ Please select a testing group with testcases, or that has not yet been tested in
[% END %]
<tr class="[% groupstyle | none %]">
<td align="left"><table class="none"><tr><td><input [% IF ! counttests %]disabled [% ELSE %][% IF select_first_avail_subgroup==1 && personal_completed != 'N/A' && personal_completed < 100 %][% select_first_avail_subgroup=0 %]checked [% ELSE %][% IF loop.first %]checked [% END %][% END %][% END %]type="radio" id="subgroup_[% testgroup FILTER html %]" name="subgroup_[% testgroup FILTER html %]"
value="[% cursubgroup.id FILTER html %]" /></td>
<td>[% cursubgroup.name FILTER html %]</td></tr></table></td>
<td align="left"><table class="none"><tr><td><input [% IF ! counttests %]disabled [% ELSE %][% IF select_first_avail_subgroup==1 && personal_completed != 'N/A' && personal_completed < 100 %][% select_first_avail_subgroup=0 %]checked [% ELSE %][% IF loop.first %]checked [% END %][% END %][% END %]type="radio" id="subgroup_[% testgroup | html %]" name="subgroup_[% testgroup | html %]"
value="[% cursubgroup.id | html %]" /></td>
<td>[% cursubgroup.name | html %]</td></tr></table></td>
<td align="center">[% IF ! counttests %] 0 [% ELSE %] [% counttests %] [% END %]</td>
<td align="center">[% personal_completed FILTER html %][% IF personal_completed != 'N/A' %]%[% END %]</td>
<td align="center">[% community_completed FILTER html %][% IF community_completed != 'N/A' %]%[% END %]</td>
<td align="center">[% personal_completed | html %][% IF personal_completed != 'N/A' %]%[% END %]</td>
<td align="center">[% community_completed | html %][% IF community_completed != 'N/A' %]%[% END %]</td>
</tr>
[% END %]
</table>

View File

@ -57,7 +57,7 @@
<form action="process_test.cgi" method="post" name="form" id="form">
<input type="hidden" id="test_run_id" name="test_run_id" value="[% test_run.test_run_id %]"/>
<input id="isTestResult" name="isTestResult" type="hidden" value="true" />
<input id="testgroup" name="testgroup" type="hidden" value="[% testgroup.testgroup_id FILTER html %]" />
<input id="testgroup" name="testgroup" type="hidden" value="[% testgroup.testgroup_id | html %]" />
<div class="section-full">
<div class="sec_head">

View File

@ -8,16 +8,16 @@
<tr>
<td>
<div class="dh">Product:</div><div class="dv">[% sysconfig.product.name FILTER html %]</div>
<div class="dh">Locale:</div><div class="dv">[% sysconfig.locale.name FILTER html %] ([% sysconfig.locale.locale_abbrev FILTER html %])</div>
<div class="dh">Product:</div><div class="dv">[% sysconfig.product.name | html %]</div>
<div class="dh">Locale:</div><div class="dv">[% sysconfig.locale.name | html %] ([% sysconfig.locale.locale_abbrev | html %])</div>
</td>
<td>
<div class="dh">Platform:</div><div class="dv">[% sysconfig.platform.name FILTER html %]</div>
<div class="dh">Opsys:</div><div class="dv">[% sysconfig.opsys.name FILTER html %]</div>
<div class="dh">Platform:</div><div class="dv">[% sysconfig.platform.name | html %]</div>
<div class="dh">Opsys:</div><div class="dv">[% sysconfig.opsys.name | html %]</div>
</td>
<td>
<div class="dh">Branch:</div><div class="dv">[% sysconfig.branch.name FILTER html %]</div>
<div class="dh">Build ID:</div><div class="dv">[% sysconfig.build_id FILTER html %]</div>
<div class="dh">Branch:</div><div class="dv">[% sysconfig.branch.name | html %]</div>
<div class="dh">Build ID:</div><div class="dv">[% sysconfig.build_id | html %]</div>
</td>
</tr>
<tr>

View File

@ -1,3 +1,3 @@
<div id="header">
<h1><a href="index.cgi" title="Litmus - [% constants.litmus_version FILTER html %] - Return to home page" accesskey="1">Litmus</a></h1>
<h1><a href="index.cgi" title="Litmus - [% constants.litmus_version | html %] - Return to home page" accesskey="1">Litmus</a></h1>
</div>

View File

@ -52,11 +52,11 @@ General Statistics
<div class="section-content">
<ul>
<li>Testcases - [% numtests FILTER html %] testcases</li>
<li>Subgroups - [% numsubgroups FILTER html %] subgroups</li>
<li>Testgroups - [% numtestgroups FILTER html %] test groups</li>
<li>Users - [% numusers FILTER html %] users</li>
<li>Results - [% numresults FILTER html %] results</li>
<li>Testcases - [% numtests | html %] testcases</li>
<li>Subgroups - [% numsubgroups | html %] subgroups</li>
<li>Testgroups - [% numtestgroups | html %] test groups</li>
<li>Users - [% numusers | html %] users</li>
<li>Results - [% numresults | html %] results</li>
</ul>
</td>
</tr>
@ -83,7 +83,7 @@ Top Testers
<tr [% IF not (loop.count % 2) %]class="even"[% ELSE %]class="odd"[% END %]>
<td align="center">[% loop.count %]</td>
<td align="center">
[% IF show_admin %]<a href="mailto:[% curtester.email | html | uri | email %]">[% END %][% curtester.getDisplayName | html | email %][% IF show_admin %]</a>[% END %]</td>
[% IF show_admin %]<a href="mailto:[% curtester.email | html | email | js %]">[% END %][% curtester.getDisplayName | html | email | js %][% IF show_admin %]</a>[% END %]</td>
<td align="center">[% curtester.num_results | html %]</td>
</tr>
[% END %]

View File

@ -1,196 +0,0 @@
[%# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1
#
# 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
# The Mozilla Corporation.
# Portions created by the Initial Developer are Copyright (C) 2006
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Chris Cooper <ccooper@deadsquid.com>
# Zach Lipton <zach@zachlipton.com>
#
# ***** END LICENSE BLOCK *****
#%]
[%# INTERFACE:
# none
#%]
[% # General utility functions for templates %]
[% # select box for platform/os/branch/etc %]
[% # selname - the name of the widget
# obj - the object to retrieve values from
# name - method to retrieve display name
# value - method to retrieve form value
# onchange (optional) - js action to be performed on change
# selected (optional) - form value for the default selection
%]
[% BLOCK select %]
[% IF onchange %]
[% onchangereal = "onchange=\"$onchange\"" %]
[% END %]
<select name="[% selname %]" id="[% selname %]" [% onchangereal %]>
[% FOREACH cur=obj %]
<option value="[% cur.${value} FILTER html %]"
[% IF selected == cur.${value} %]selected[% END %]>
[% cur.${name} FILTER html %]
</option>
[% END %]
</select>
[% END %]
[% # given a platform object, return either an <img> tag with the
# object for that platform, or a shortened version of the name
#
# platform - the platform object
%]
[% BLOCK platform_to_img %]
[% IF platform.iconpath %]
<img src="skins/icons/platform/[% platform.iconpath FILTER html%]"
width="20" height="22">
[% ELSE %]
[% platform.name | truncate(6) | html %]
[% END %]
[% END %]
[% # given a product object, return either an <img> tag with the
# object for that product, or a shortened version of the name
#
# product - the product object
%]
[% BLOCK product_to_img %]
[% IF product.iconpath %]
<img src="skins/icons/product/[% product.iconpath FILTER html %]"
width="36" height="13">
[% ELSE %]
[% product.name FILTER html | truncate(6) %]
[% END %]
[% END %]
[% # build a small table for a test list describing the platform status %]
[% # test - the test to create the table for
%]
[% BLOCK platformtable %]
<table border="0">
<tr>
[% FOREACH curplat = test.product.platforms %]
<td style="[% test.state(curplat).style | html %]">
[% INCLUDE platform_to_img platform=curplat %]
</td>
[% END %]
</tr>
</table>
[% END %]
[% # hotlist box %]
[% # title - the title for the hotlist
# hotlist - an array of tests to display
%]
[% BLOCK hotlist %]
<div class="hotlist">
<p>
<font size="+2">
[% title FILTER html %]
</font>
</p>
<table width="100%" border="0">
<tr>
<th width="7%">
<div align="center">
<strong>
Test #
</strong>
</div>
</th>
<th width="7%">
<div align="center">
Product
</div>
</th>
<th width="70%">
<div align="center">
<strong>
Summary
</strong>
</div>
</th>
<th width="9%">
<div align="center">
<strong>
Platform
</strong>
</div>
</th>
<th width="9%">
<strong>
Branch
</strong>
</th>
<th width="7%">
<div align="center">
<strong>
Bug #
</strong>
</div>
</th>
</tr>
[% FOREACH curtest = hotlist %]
<tr>
<td>
<div align="right">
<a href="show_test.cgi?id=[%curtest.testcase_id | uri | html %]">
[% curtest.testcase_id FILTER html %]
</a>
</div>
</td>
<td height="20">
<div align="center">
[% INCLUDE product_to_img product=curtest.product %]
</div>
</td>
<td nowrap>
[% curtest.summary FILTER html | truncate(50) %]
</td>
<td nowrap>
[% INCLUDE platformtable test=curtest %]
</td>
<td>
<div align="center">
*
</div>
</td>
<td>
<a href="#">
*
</a>
</td>
</tr>
[% END %]
</table>
[% UNLESS hotlist.0 %]
<p><strong>Zarro tests found.</strong></p>
[% END %]
<a href="#">
Show all confirmed failures
</a>
</div>
[% END %]