Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 952795: Remove all style="..." attributes from HTML elements

Browse Source 
r/a=justdave


git-svn-id: svn://10.0.0.236/trunk@265156 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2013-12-28 20:00:52 +00:00
parent 48e9cda1a0
commit c8a484c23f
29 changed files with 266 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
8840
8841

40
mozilla/webtools/bugzilla/skins/standard/admin.css
View File

@ -43,6 +43,20 @@ p.areyoureallyreallysure {
font-weight: bold;
}
#admin_table {
border-collapse: collapse;
border: 1px solid black;
}
#admin_table th {
white-space: normal !important;
}
#admin_table th, #admin_table td {
border: 1px solid black;
padding: 0.3em;
}
tr.disabled {
background-color: lightgrey;
}
@ -140,3 +154,29 @@ th.title {
#flag_types_bugs .multiplicable, #flag_types_attachments .multiplicable {
display: block;
}
table.whining_list {
border: 1px solid black;
border-collapse: collapse;
width: 100%;
}
table.whining_list th, table.whining_list td {
padding: 0.3em;
}
table.whining_list th {
text-align: right;
font-weight: normal !important;
white-space: normal !important;
}
table.whining_list th.subtitle {
font-weight: bold !important;
text-align: left !important;
}
table.schedule_list th, table.search_list th {
text-align: center;
font-weight: bold !important;
}

4
mozilla/webtools/bugzilla/skins/standard/dependency-tree.css
View File

@ -78,3 +78,7 @@ ul.tree a.tree_link img {
color: #333;
font-weight: bold;
}
.dependency_tree_controls input[type=submit] {
min-width: 3em;
}

4
mozilla/webtools/bugzilla/skins/standard/editusers.css
View File

@ -34,12 +34,12 @@ table.groups tr.indirect {
}
table.groups th {
text-align: left;
padding: 0 0 0 1ex;
padding: 0 1ex;
}
table.groups td {
padding: 2px;
}
table.groups td.checkbox {
table.groups th.checkbox, table.groups td.checkbox {
text-align: center;
white-space: nowrap;
}

38
mozilla/webtools/bugzilla/skins/standard/global.css
View File

@ -397,10 +397,6 @@ dl dl > dt {
border-top: none;
}
#admin_table th {
white-space: normal !important;
}
/* Arrow buttons are buttons with only ↑, ↓, ← or → on
* them. We want these to look a little less spidery. */
.arrow_button {
@ -427,7 +423,7 @@ dl dl > dt {
font-size: smaller;
}
.bz_attach_flags, .bz_attach_footer {
.bz_attach_flags, .bz_attach_footer, .bz_flags, .nowrap {
white-space: nowrap;
}
@ -440,6 +436,10 @@ div.user_match {
margin-bottom: 1em;
}
.indented {
margin-left: 3em;
}
.box {
border: 1px solid black;
color: black;
@ -452,6 +452,12 @@ div.user_match {
display: none;
}
#serverpush_msg {
margin-top: 20%;
text-align: center;
font-size: xx-large;
}
/* Rules specific for printing */
@media print {
#header, #footer {
@ -480,9 +486,14 @@ div.user_match {
.field_help_link {
cursor: help;
}
.field_value, form#Create th, form#Create td {
.field_value, form#Create th, form#Create td, .top {
vertical-align: top;
}
.bottom {
vertical-align: bottom;
}
.field_value .text_input {
width: 100%;
min-width: 25em;
@ -578,10 +589,23 @@ input.required, select.required, span.required_explanation {
form th {
text-align: right;
}
th.left {
.left {
text-align: left;
}
.center {
text-align: center;
}
.right {
text-align: right;
}
.inline {
display: inline;
}
tr.shared_search {
background-color: #fff7cd;
color: #000;

28
mozilla/webtools/bugzilla/skins/standard/reports.css
View File

@ -106,4 +106,30 @@
.extra_info {
font-size: smaller;
font-style: italic;
}
}
#edit_series th, #create_chart th, #edit_charts th {
text-align: center;
}
#edit_series th, #edit_series td,
#create_chart th, #create_chart td {
vertical-align: top;
padding: 0.5em;
}
#edit_series select, #create_chart select {
width: 15em;
}
#edit_series input {
width: 95%;
}
#edit_series input#frequency {
width: 3em;
}
#edit_charts input#action-sum, #edit_charts input#action-remove {
width: 7em;
}

6
mozilla/webtools/bugzilla/skins/standard/summarize-time.css
View File

@ -35,3 +35,9 @@ td.subtotal {
/* the details headers */
.number .owner_header, .owner .bug_header { background: #ffffff }
.number .owner_header2, .owner .bug_header2 { background: #EFEFEF }
.warning_swapped_data {
border: 1px solid red;
margin: 1em;
padding: 0.5em;
}

25
mozilla/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl
View File

@ -23,10 +23,7 @@
[% PROCESS global/header.html.tmpl
title = title
style = "
table#form th { text-align: right; vertical-align: baseline; white-space: nowrap; }
table#form td { text-align: left; vertical-align: baseline; }
"
style_urls = ['skins/standard/admin.css']
onload="var f = document.forms['flagtype_properties'];
selectProduct(f.product, f.component, null, null, '__Any__');"
javascript_urls=["js/productform.js"]
@ -49,7 +46,7 @@
[%# Add a hidden button at the top of the form so that the user pressing "return"
# really submit the form, as expected. %]
<input type="submit" id="commit" value="Submit" style="display: none;">
<input type="submit" id="commit" value="Submit" class="bz_default_hidden">
<table id="form" cellspacing="0" cellpadding="4" border="0">
<tr>
@ -90,8 +87,8 @@
[% END %]
<table>
<tr>
<td style="vertical-align: top;">
<b>Product/Component:</b><br>
<th class="top left">
Product/Component:<br>
<select name="product" onchange="selectProduct(this, this.form.component, null, null, '__Any__');">
<option value="">__Any__</option>
[% FOREACH prod = products %]
@ -108,19 +105,19 @@
name="categoryAction-include" value="Include">
<input type="submit" id="categoryAction-exclude"
name="categoryAction-exclude" value="Exclude">
</td>
<td style="vertical-align: top;">
<b>Inclusions:</b><br>
</th>
<th class="top left">
Inclusions:<br>
[% PROCESS category_select name="inclusion_to_remove" categories = inclusions %]<br>
<input type="submit" id="categoryAction-removeInclusion"
name="categoryAction-removeInclusion" value="Remove Inclusion">
</td>
<td style="vertical-align: top;">
<b>Exclusions:</b><br>
</th>
<th class="top left">
Exclusions:<br>
[% PROCESS category_select name="exclusion_to_remove" categories = exclusions %]<br>
<input type="submit" id="categoryAction-removeExclusion"
name="categoryAction-removeExclusion" value="Remove Exclusion">
</td>
</th>
</tr>
</table>
</td>

4
mozilla/webtools/bugzilla/template/en/default/admin/params/common.html.tmpl
View File

@ -69,14 +69,14 @@
[% END %]
</select>
</td>
<td style="vertical-align: bottom">
<td class="bottom">
<button type="button"
onClick="sortedList_moveItem('[% param.name FILTER html %]', -1, '[% sortlist_separator %]');">&uarr;</button>
</td>
</tr>
<tr>
<td style="vertical-align: top">
<td class="top">
<button type="button"
onClick="sortedList_moveItem('[% param.name FILTER html %]', +1, '[% sortlist_separator %]');">&darr;</button>
</td>

3
mozilla/webtools/bugzilla/template/en/default/admin/params/general.html.tmpl
View File

@ -49,8 +49,7 @@
_ " green text inside a red box, or <em>class=\"bz_private\"</em> for"
_ " dark red on a red background. Anything defined in "
_ " <code>skins/standard/global.css</code> or <code>skins/custom/global.css</code>"
_ " will work. To get centered text, use <em>style=\"text-align: "
_ " center;\"</em>.",
_ " will work. To get centered text, use <em>class=\"center\"</em>.",
upgrade_notification =>
"$terms.Bugzilla can inform you when a new release is available."

2
mozilla/webtools/bugzilla/template/en/default/admin/products/updated.html.tmpl
View File

@ -39,7 +39,7 @@
<p>
Updated description to:
</p>
<p style="margin: 1em 3em 1em 3em">[% product.description FILTER html_light %]</p>
<p class="indented">[% product.description FILTER html_light %]</p>
[% END %]
[% IF changes.isactive.defined %]

4
mozilla/webtools/bugzilla/template/en/default/admin/table.html.tmpl
View File

@ -67,11 +67,11 @@
[%################### TABLE HEADER ######################%]
<table id="admin_table" border="1" cellpadding="4" cellspacing="0">
<table id="admin_table">
<tr class="column_header">
[% FOREACH c = columns %]
[%# Default to align left for headers %]
<th style="text-align:[% (c.align || 'left') FILTER html %];">
<th class="[% (c.align || 'left') FILTER css_class_quote %]">
[% c.heading FILTER html %]
</th>
[% END %]

2
mozilla/webtools/bugzilla/template/en/default/admin/users/edit.html.tmpl
View File

@ -52,7 +52,7 @@
</tr>
<tr>
[% IF editusers %]
<td style="text-align: center; font-weight: bold">|</td>
<th class="checkbox">|</th>
[% END %]
<th colspan="2">User is a member of these groups</th>
</tr>

6
mozilla/webtools/bugzilla/template/en/default/attachment/diff-file.html.tmpl
View File

@ -14,7 +14,11 @@
# considers the first row to determine column widths. If a colspan is found,
# it then share the width equally among all columns, which we don't want.
#%]
<table class="file_table"><thead><tr><td class="num"></td><td></td><td class="num"></td><td></td></tr><tr><td class="file_head" colspan="4"><a href="#" onclick="return twisty_click(this)">[% collapsed ? '(+)' : '(-)' %]</a><input type="checkbox" name="[% file.filename FILTER html %]"[% collapsed ? '' : ' checked' %] style="display: none">
<table class="file_table"><thead><tr><td class="num"></td><td></td><td
class="num"></td><td></td></tr><tr><td class="file_head" colspan="4"><a href="#"
onclick="return twisty_click(this)">[% collapsed ? '(+)' : '(-)' %]</a><input
type="checkbox" name="[% file.filename FILTER html %]"[% collapsed ? '' : ' checked' %]
class="bz_default_hidden">
[% IF lxr_prefix && !file.is_add %]
<a href="[% lxr_prefix %]">[% file.filename FILTER html %]</a>
[% ELSE %]

22
mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl
View File

@ -43,7 +43,9 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[% ELSE %]
<html>
<head>
<link href="[% 'skins/standard/attachment.css' FILTER mtime %]"
<link href="[% 'skins/standard/global.css' FILTER mtime %]"
rel="stylesheet" type="text/css">
<link href="[% 'skins/standard/attachment.css' FILTER mtime %]"
rel="stylesheet" type="text/css">
<script src="[% 'js/attachment.js' FILTER mtime %]"
type="text/javascript"></script>
@ -57,13 +59,15 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[% IF headers %]
<a href="[% PROCESS viewurl id=attachid %]">View</a>
| <a href="[% PROCESS editurl id=attachid %]">Details</a>
| <a href="[% PROCESS diffurl id=attachid %]&amp;context=[% context FILTER uri %]&amp;collapsed=[% collapsed FILTER uri %]&amp;headers=[% headers FILTER uri %]&amp;format=raw">Raw&nbsp;Unified</a>
| <a href="[% PROCESS diffurl id=attachid %]&amp;context=[%
context FILTER uri %]&amp;collapsed=[% collapsed FILTER uri %]&amp;headers=[%
headers FILTER uri %]&amp;format=raw">Raw&nbsp;Unified</a>
| Return to [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %]
[% END %]
[% IF other_patches.size > 0 %]
[% IF headers %] |[%END%]
Differences between
<form style="display: inline" action="attachment.cgi">
<form class="inline" action="attachment.cgi">
<select name="oldid">
[% FOREACH patch = other_patches %]
<option value="[% patch.id %]"
@ -99,7 +103,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[% IF do_context %]
[%# only happens for normal viewing, not interdiff %]
| <span style='font-weight: bold'>Context:</span>
| <strong>Context:</strong>
[% IF context == "patch" %]
(<strong>Patch</strong> /
[% ELSE %]
@ -115,7 +119,13 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[% context = 3 %]
[% END %]
[%# textbox for context %]
<form style="display: inline" action="attachment.cgi"><input type="hidden" name="action" value="diff"><input type="hidden" name="id" value="[% attachid %]"><input type="hidden" name="collapsed" value="[% collapsed FILTER html %]"><input type="hidden" name="headers" value="[% headers FILTER html %]"><input type="text" name="context" value="[% context FILTER html %]" size="3"></form>)
<form class="inline" action="attachment.cgi">
<input type="hidden" name="action" value="diff">
<input type="hidden" name="id" value="[% attachid %]">
<input type="hidden" name="collapsed" value="[% collapsed FILTER html %]">
<input type="hidden" name="headers" value="[% headers FILTER html %]">
<input type="text" name="context" value="[% context FILTER html %]" size="3">
</form>)
[% END %]
[% IF warning %]
@ -139,4 +149,4 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[%# Restore Stuff %]
<form name="checkboxform" action="attachment.cgi">
<input type="checkbox" name="restore_indicator" style="display: none">
<input type="checkbox" name="restore_indicator" class="bz_default_hidden">

1
mozilla/webtools/bugzilla/template/en/default/bug/create/create-guided.html.tmpl
View File

@ -62,7 +62,6 @@ function PutDescription() {
</p>
<iframe name="somebugs" id="somebugs"
style="border: 2px black solid"
src="duplicates.cgi?[% productstring %]&amp;format=simple">
</iframe>

29
mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl
View File

@ -166,9 +166,8 @@
<tr>
[%# Hide/show resolved button
Swaps text depending on the state of hide_resolved %]
<td align="center">
<form method="get" action="showdependencytree.cgi"
style="display: inline; margin: 0px;">
<td>
<form method="get" action="showdependencytree.cgi">
<input name="id" type="hidden" value="[% bugid %]">
[% IF maxdepth %]
<input name="maxdepth" type="hidden" value="[% maxdepth %]">
@ -188,11 +187,9 @@
</td>
<td>
<form method="get" action="showdependencytree.cgi"
style="display: inline; margin: 0px;">
<form method="get" action="showdependencytree.cgi">
[%# set to one form %]
<input type="submit" id="change_maxdepth"
value="&nbsp;1&nbsp;"
<input type="submit" id="change_maxdepth" value="1"
[% "disabled" IF realdepth < 2 || maxdepth == 1 %]>
<input name="id" type="hidden" value="[% bugid %]">
<input name="maxdepth" type="hidden" value="1">
@ -201,8 +198,7 @@
</td>
<td>
<form method="get" action="showdependencytree.cgi"
style="display: inline; margin: 0px;">
<form method="get" action="showdependencytree.cgi">
[%# Minus one form
Allow subtracting only when realdepth and maxdepth > 1 %]
<input name="id" type="hidden" value="[% bugid %]">
@ -211,14 +207,13 @@
: ( maxdepth ? maxdepth - 1 : realdepth - 1 )
%]">
<input name="hide_resolved" type="hidden" value="[% hide_resolved %]">
<input type="submit" id="decrease_depth" value="&nbsp;&lt;&nbsp;"
<input type="submit" id="decrease_depth" value="&lt;"
[% "disabled" IF realdepth < 2 || ( maxdepth && maxdepth < 2 ) %]>
</form>
</td>
<td>
<form method="get" action="showdependencytree.cgi"
style="display: inline; margin: 0px;">
<form method="get" action="showdependencytree.cgi">
[%# Limit entry form: the button cannot do anything when total depth
is less than two, so disable it %]
<input name="maxdepth" size="4" maxlength="4" value="[%
@ -234,8 +229,7 @@
</td>
<td>
<form method="get" action="showdependencytree.cgi"
style="display: inline; margin: 0px;">
<form method="get" action="showdependencytree.cgi">
[%# plus one form
Disable button if total depth < 2, or if depth set to unlimited %]
<input name="id" type="hidden" value="[% bugid %]">
@ -243,19 +237,18 @@
<input name="maxdepth" type="hidden" value="[% maxdepth + 1 %]">
[% END %]
<input name="hide_resolved" type="hidden" value="[% hide_resolved %]">
<input type="submit" id="increase_depth" value="&nbsp;&gt;&nbsp;"
<input type="submit" id="increase_depth" value="&gt;"
[% "disabled" IF realdepth < 2 || !maxdepth || maxdepth >= realdepth %]>
</form>
</td>
<td>
<form method="get" action="showdependencytree.cgi"
style="display: inline; margin: 0px;">
<form method="get" action="showdependencytree.cgi">
[%# Unlimited button %]
<input name="id" type="hidden" value="[% bugid %]">
<input name="hide_resolved" type="hidden" value="[% hide_resolved %]">
<input type="submit" id="remove_limit"
value="&nbsp;Unlimited&nbsp;"
value="Unlimited"
[% "disabled" IF maxdepth == 0 || maxdepth == realdepth %]>
</form>
</td>

17
mozilla/webtools/bugzilla/template/en/default/bug/summarize-time.html.tmpl
View File

@ -36,7 +36,7 @@
[%# parts contains date ranges (from, to). %]
[% part = parts.shift %]
<div align="right">
<h4 style="padding-right: 2em; margin: 0;">
<h4>
[% IF part.0 or part.1 %]
[% part.0 OR "Up" FILTER html %] to [% part.1 OR "now" FILTER html %]
[% ELSE %]
@ -52,7 +52,7 @@
[% END %]
[% IF detailed %]
<h4 style="margin: 0">
<h4>
Total of [% global.remaining FILTER format("%.2f") %]h remains from
original estimate of [% global.estimated FILTER format("%.2f") %]h
[% IF global.deadline %]
@ -62,13 +62,13 @@
[% END %]
[% IF monthly %]
<h4 style="margin: 0">Total of [% global.grand_total FILTER format("%.2f") %] hours worked</h4>
<h4>Total of [% global.grand_total FILTER format("%.2f") %] hours worked</h4>
<hr noshade size="1">
[% END %]
[% IF null.size > 0 %]
[% INCLUDE inactive_report %]
<h4 style="margin: 0">Total of [% null.size %] inactive [% terms.bugs %]</h4>
<h4>Total of [% null.size %] inactive [% terms.bugs %]</h4>
[% END %]
[% END %]
@ -255,15 +255,16 @@
[% BLOCK query_form %]
<hr noshade size=1>
<form method="post" name="summary" style="display: inline" action="summarize_time.cgi">
<form method="post" name="summary" action="summarize_time.cgi">
<input type="hidden" name="do_depends" value="[% do_depends FILTER html %]">
<input type="hidden" name="id" value="[% ids.join(",") FILTER html %]">
<input type="hidden" name="do_report" value="1">
[% IF warn_swap_dates %]
<h4 style="border: 1px solid red; margin: 1em; padding: 0.5em">The
end date specified occurs before the start date, which doesn't
make sense; the dates below have therefore been swapped.</h4>
<p class="warning_swapped_data">
The end date specified occurs before the start date, which doesn't
make sense; the dates below have therefore been swapped.
</p>
[% END %]
<table>

4
mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl
View File

@ -132,9 +132,8 @@
</select>
</td>
[% IF any_flags_requesteeble %]
<td>
<td class="bz_flags">
[% IF (type.is_active && type.is_requestable && type.is_requesteeble) || (flag && flag.requestee) %]
<span style="white-space: nowrap;">
[% SET grant_list = [] %]
[% IF Param('usemenuforusers') %]
[% grant_list = type.grant_list %]
@ -158,7 +157,6 @@
classes => ["requestee"]
custom_userlist => grant_list
%]
</span>
[% END %]
</td>
[% END %]

2
mozilla/webtools/bugzilla/template/en/default/global/textarea.html.tmpl
View File

@ -11,7 +11,6 @@
# id: (optional) The "id"-attribute of the textarea.
# name: (optional) The "name"-attribute of the textarea.
# accesskey: (optional) The "accesskey"-attribute of the textarea.
# style: (optional) The "style"-attribute of the textarea.
# classes: (optional) The "class"-attribute of the textarea.
# wrap: (deprecated; optional) The "wrap"-attribute of the textarea.
# disabled: (optional) Disable the textarea.
@ -33,7 +32,6 @@
<textarea [% IF name %]name="[% name FILTER html %]"[% END %]
[% IF id %] id="[% id FILTER html %]"[% END %]
[% IF accesskey %] accesskey="[% accesskey FILTER html %]"[% END %]
[% IF style %] style="[% style FILTER html %]"[% END %]
[% IF classes %] class="[% classes FILTER html %]"[% END %]
[% IF wrap %] wrap="[% wrap FILTER html %]"[% END %]
[% IF disabled %] disabled="disabled"[% END %]

21
mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
View File

@ -28,15 +28,16 @@
<hr>
<p style="font-size:smaller">
To change multiple [% terms.bugs %]:</p>
<ol style="font-size:smaller">
<li>Check the [% terms.bugs %] you want to change above.</li>
<li>Make your changes in the form fields below. If the change
you are making requires an explanation, include it in
the comments box.</li>
<li>Click the <em>Commit</em> button.</li>
</ol>
<div class="bz_info">
To change multiple [% terms.bugs %]:
<ol>
<li>Check the [% terms.bugs %] you want to change above.</li>
<li>Make your changes in the form fields below. If the change
you are making requires an explanation, include it in
the comments box.</li>
<li>Click the <em>Commit</em> button.</li>
</ol>
</div>
<table id="form">
<tr>
@ -355,7 +356,7 @@
</table>
[% IF foundinactive %]
<p style="font-size:smaller">(Note: [% terms.Bugs %] may not be added to [% FILTER inactive %]inactive
<p class="bz_info">(Note: [% terms.Bugs %] may not be added to [% FILTER inactive %]inactive
groups[% END %], only removed.)</p>
[% END %]

2
mozilla/webtools/bugzilla/template/en/default/list/server-push.html.tmpl
View File

@ -18,7 +18,7 @@
rel="stylesheet" type="text/css">
</head>
<body>
<h1 style="margin-top: 20%; text-align: center; font-size: xx-large;">Please stand by ...</h1>
<h1 id="serverpush_msg">Please stand by ...</h1>
[% IF debug %]
<p>[% query FILTER html %]</p>

4
mozilla/webtools/bugzilla/template/en/default/list/table.html.tmpl
View File

@ -177,12 +177,12 @@
[% END %]
<td class="first-child bz_id_column">
<a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a>
<span style="display: none">[%+ '[SEC]' IF bug.secure_mode %]</span>
<span class="bz_default_hidden">[%+ '[SEC]' IF bug.secure_mode %]</span>
</td>
[% FOREACH column = displaycolumns %]
[% col_abbrev = abbrev.$column %]
<td [% 'style="white-space: nowrap"' IF NOT col_abbrev.wrap %]
<td [% 'class="nowrap"' IF NOT col_abbrev.wrap %]
class="bz_[% column FILTER css_class_quote %]_column">
[% IF col_abbrev.maxlength %]
<span title="[%- display_value(column, bug.$column) FILTER html %]">

48
mozilla/webtools/bugzilla/template/en/default/reports/create-chart.html.tmpl
View File

@ -15,6 +15,7 @@
[% PROCESS global/header.html.tmpl
title = "Create Chart"
style_urls = [ "skins/standard/reports.css"]
%]
[% PROCESS "reports/series-common.html.tmpl"
@ -47,9 +48,9 @@ function subcatSelected() {
[% gttext = "Grand Total" %]
<form method="get" action="chart.cgi" name="chartform">
<table cellpadding="2" cellspacing="2" border="0">
<form method="get" action="chart.cgi" name="chartform">
<table id="create_chart">
[% IF NOT category OR category.size == 0 %]
<tr>
<td>
@ -58,39 +59,38 @@ function subcatSelected() {
</tr>
[% ELSE %]
<tr>
<th><label for="category">Category</label>:</th>
<th><label for="category">Category</label></th>
<th></th>
<th><label for="subcategory">Sub-category</label>:</th>
<th><label for="subcategory">Sub-category</label></th>
<th></th>
<th><label for="name" accesskey="N">Name</label></th>
<th></th>
<th><label for="name" accesskey="N">Name</label>:</th>
<th><br>
</th>
</tr>
<tr>
[% PROCESS series_select sel = { name => 'category',
size => 5,
onchange = "catSelected();
subcatSelected();" } %]
<td>
<noscript>
<input type="submit" name="action-assemble" value="Update --&gt;"
id="action-assemble">
</noscript>
</td>
[% PROCESS series_select sel = { name => 'subcategory',
size => 5,
onchange = "subcatSelected()" } %]
<td>
<noscript>
<input type="submit" name="action-assemble" value="Update --&gt;"
id="action-assemble2">
</noscript>
</td>
[% PROCESS series_select sel = { name => 'name',
size => 5,
multiple => 1,
@ -98,7 +98,7 @@ function subcatSelected() {
# not its name.
value_in_hash => 1 } %]
<td align="center" valign="middle">
<td>
<input type="submit" name="action-add" value="Add To List"
id="action-add"><br>
</td>
@ -109,15 +109,15 @@ function subcatSelected() {
<h3>List Of Data Sets To Plot</h3>
[% IF chart.lines.size %]
<table cellspacing="2" cellpadding="2">
<table id="edit_charts">
<tr>
<th style="width: 5em;">Select</th>
<th>Select</th>
<th>Label</th>
<th></th>
<th>Data Set</th>
<th></th>
</tr>
[%# The external loop has two counters; one which keeps track of where we
# are in the old labels array, and one which keeps track of the new
# indexes for the form elements. They are different if chart.lines has
@ -201,21 +201,19 @@ function subcatSelected() {
</tr>
<tr>
<td valign="bottom" style="text-align: center;">
<input type="submit" name="action-sum" value="Sum"
style="width: 5em;" id="action-sum"><br>
<input type="submit" name="action-remove" value="Remove"
style="width: 5em;" id="action-remove">
<td>
<input type="submit" id="action-sum" name="action-sum" value="Sum"><br>
<input type="submit" id="action-remove" name="action-remove" value="Remove">
</td>
<td style="text-align: right; vertical-align: bottom;">
<td class="right">
<label for="cumulate"><b>Cumulate</b></label>:
<input type="checkbox" name="cumulate" id="cumulate" value="1"
[% " checked" IF chart.cumulate %]>
</td>
<td></td>
<td valign="bottom">
<td>
<label for="datefrom"><b>Date Range</b></label>:
<input type="text" size="12" name="datefrom" id="datefrom"
value="[% time2str("%Y-%m-%d", chart.datefrom) IF chart.datefrom%]">
@ -224,7 +222,7 @@ function subcatSelected() {
value="[% time2str("%Y-%m-%d", chart.dateto) IF chart.dateto %]">
</td>
<td style="text-align: right" valign="bottom">
<td>
<input type="submit" name="action-wrap" value="Chart This List"
id="action-wrap">
</td>

4
mozilla/webtools/bugzilla/template/en/default/reports/edit-series.html.tmpl
View File

@ -13,7 +13,9 @@
[%+ default.name FILTER html %]
[% END %]
[% PROCESS global/header.html.tmpl %]
[% PROCESS global/header.html.tmpl
style_urls = [ "skins/standard/reports.css" ]
%]
<form method="get" action="chart.cgi" name="chartform">

4
mozilla/webtools/bugzilla/template/en/default/reports/series-common.html.tmpl
View File

@ -85,9 +85,9 @@ function checkNewState() {
[%###########################################################################%]
[% BLOCK series_select %]
<td align="left">
<td>
<select name="[% sel.name %]" id="[% sel.name %]"
size="[% sel.size %]" style="width: 15em"
size="[% sel.size %]"
[%+ 'multiple="multiple"' IF sel.multiple %]
[%+ "disabled=\"disabled\"" UNLESS ${sel.name}.keys.size || newtext %]
[%+ "onchange=\"$sel.onchange\"" IF sel.onchange %]>

44
mozilla/webtools/bugzilla/template/en/default/reports/series.html.tmpl
View File

@ -17,16 +17,14 @@
[% PROCESS "reports/series-common.html.tmpl"
newtext = "New (name below)"
%]
<table cellpadding="2" cellspacing="2" border="0"
style="text-align: left; margin-left: 20px">
<tbody>
<table id="edit_series">
<tr>
<th>Category:</th>
<th>Category</th>
<th></th>
<th>Sub-category</th>
<th>Name</th>
<th></th>
<th>Sub-category:</th>
<th>Name:</th>
<td></td>
</tr>
<tr>
[% PROCESS series_select sel = { name => 'category',
@ -38,41 +36,40 @@
id="action-edit">
</noscript>
</td>
[% PROCESS series_select sel = { name => 'subcategory',
size => 5,
onchange => "checkNewState()" } %]
<td valign="top" name="name">
<td>
<input type="text" name="name" maxlength="64"
value="[% default.name.0 FILTER html %]" size="25">
</td>
<td valign="top">
<span style="font-weight: bold;">Run every</span> &nbsp;
<input type="text" size="2" name="frequency"
<td>
Run every
<input type="text" size="2" id="frequency" name="frequency"
value="[% (default.frequency.0 OR 7) FILTER html %]">
<span style="font-weight: bold;">&nbsp;day(s)</span><br>
day(s)<br>
[%# Change 'admin' here and in Series.pm, or remove the check
completely, if you want to change who can make series public. %]
[% IF user.in_group('admin') %]
[% IF user.in_group('admin') %]
<input type="checkbox" name="public"
[%+ "checked='checked'" IF default.public.0 %]>
<span style="font-weight: bold;">Visible to all<br>
(within group restrictions)</span>
Visible to all<br>
(within group restrictions)
[% END %]
</td>
</tr>
<tr>
<td>
<input type="text" style="width: 100%" name="newcategory"
maxlength="64" value="[% default.newcategory.0 FILTER html %]">
<input type="text" name="newcategory" maxlength="64"
value="[% default.newcategory.0 FILTER html %]">
</td>
<td></td>
<td></td>
<td>
<input type="text" style="width: 100%" name="newsubcategory"
maxlength="64"
<input type="text" name="newsubcategory" maxlength="64"
value="[% default.newsubcategory.0 FILTER html %]">
</td>
<td></td>
@ -81,5 +78,4 @@
value="[% button_name FILTER html %]">
</td>
</tr>
</tbody>
</table>

2
mozilla/webtools/bugzilla/template/en/default/search/search-create-series.html.tmpl
View File

@ -22,7 +22,7 @@
yui = [ 'autocomplete', 'calendar' ]
javascript = js_data
javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
style_urls = [ "skins/standard/search_form.css" ]
style_urls = [ "skins/standard/reports.css", "skins/standard/search_form.css" ]
doc_section = "reporting.html#charts-new-series"
%]

84
mozilla/webtools/bugzilla/template/en/default/whine/schedule.html.tmpl
View File

@ -63,29 +63,25 @@
<form method="post" action="editwhines.cgi">
[%# This hidden submit button must be here to set default behavior when
the user presses return on a form input field #%]
<input type="submit" value="Update / Commit" name="commit"
style="display: none;" id="commit">
<input type="submit" value="Update / Commit" id="commit" name="commit"
class="bz_default_hidden">
<input type="hidden" name="update" value="1">
<input type="hidden" name="token" value="[% token FILTER html %]">
[% FOREACH event = events %]
<table cellspacing="2" cellpadding="2" style="border: 1px solid;">
<table class="whining_list">
<tr>
<th>
Event:
</th>
<td align="right" colspan="2">
<th class="subtitle">Event:</th>
<th colspan="2">
<input type="submit" value="Remove Event"
name="remove_event_[% event.key %]"
id="remove_event_[% event.key %]">
</td>
</th>
</tr>
<tr>
<td valign="top" align="right">
Email subject line:
</td>
<th>Email subject line:</th>
<td colspan="2">
<input type="text" name="event_[% event.key %]_subject"
size="60" maxlength="128" value="
@ -94,9 +90,7 @@
</tr>
<tr>
<td valign="top" align="right">
Descriptive text sent within whine message:
</td>
<th>Descriptive text sent within whine message:</th>
<td colspan="2">
[% INCLUDE global/textarea.html.tmpl
name = "event_${event.key}_body"
@ -110,9 +104,7 @@
</tr>
<tr>
<td valign="top" align="right">
Send a message even if there are no [% terms.bugs %] in the search result:
</td>
<th>Send a message even if there are no [% terms.bugs %] in the search result:</th>
<td colspan="2">
<input type="checkbox" name="event_[% event.key %]_mailifnobugs"
[%- IF event.value.mailifnobugs == 1 %] checked [% END %]>
@ -122,9 +114,7 @@
[% IF event.value.schedule.size == 0 %]
<tr>
<td valign="top" align="right">
Schedule:
</td>
<th>Schedule:</th>
<td class="unset" colspan="2">
Not scheduled to run<br>
<input type="submit" value="Add a new schedule"
@ -136,28 +126,23 @@
[% ELSE %]
<tr>
<td valign="top" align="right">
Schedule:
</td>
<th>Schedule:</th>
<td class="set" colspan="2">
<table>
<table class="schedule_list">
<tr>
<th>
Interval
</th>
<th>Interval</th>
<th>
[% IF mail_others %]
Mail to
[% END %]
</th>
<th>
</th>
<th></th>
</tr>
[% FOREACH schedule = event.value.schedule %]
<tr>
<td align="left">
<td>
[%# these hidden fields allow us to compare old values instead
of reading the database to tell if a field has changed %]
@ -168,7 +153,7 @@
[% PROCESS day_field val=schedule.day %]
[% PROCESS time_field val=schedule.time %]
</td>
<td align="left">
<td>
[% IF mail_others %]
<input type="hidden" name="orig_mailto_type_[% schedule.id %]"
value="[% schedule.mailto_type FILTER html %]">
@ -186,7 +171,7 @@
value="[% schedule.mailto FILTER html %]" size="30">
[% END %]
</td>
<td align="left">
<td>
<input type="submit" value="Remove"
name="remove_schedule_[% schedule.id %]"
id="remove_schedule_[% schedule.id %]">
@ -211,16 +196,14 @@
[% IF event.value.queries.size == 0 %]
<tr>
<td valign="top" align="right">
Searches:
</td>
<td align="left">
<th>Searches:</th>
<td>
No searches <br>
<input type="submit" value="Add a search"
name="add_query_[% event.key %]"
id="add_query_[% event.key %]">
</td>
<td align="right" valign="bottom">
<td class="right">
<input type="submit" value="Update / Commit" name="commit" id="update">
</td>
</tr>
@ -228,42 +211,39 @@
[% ELSE %]
<tr>
<td valign="top" align="right">
Searches:
</td>
<td align="left" colspan="2">
<th>Searches:</th>
<td colspan="2">
<table>
<table class="search_list">
<tr>
<th>Sort</th>
<th>Search</th>
<th>Title</th>
<th></th>
<th></th>
<th colspan="2"></th>
</tr>
[% FOREACH query = event.value.queries %]
<tr>
<td align="left">
<td>
<input type="text" name="query_sort_[% query.id %]"
size="3" value="[% query.sort %]">
<input type="hidden" value="[% query.sort %]"
name="orig_query_sort_[% query.id %]">
</td>
<td align="left">
<td>
<input type="hidden" value="[% query.name FILTER html %]"
name="orig_query_name_[% query.id %]">
[% PROCESS query_field thisquery=query.name %]
</td>
<td align="left">
<td>
<input type="hidden" value="[% query.title FILTER html %]"
name="orig_query_title_[% query.id %]">
<input type="text" name="query_title_[% query.id %]"
size="50" value="[% query.title FILTER html %]"
maxlength="64">
</td>
<td align="left">
<td>
<input type="hidden" value="[% query.onemailperbug FILTER html %]"
name="orig_query_onemailperbug_[% query.id %]">
<input type="checkbox" [% IF query.onemailperbug == 1 %] checked [% END %]
@ -271,7 +251,7 @@
name="query_onemailperbug_[% query.id %]">
<label for="query_onemailperbug_[% query.id %]">One message per [% terms.bug %]</label>
</td>
<td align="right">
<td>
<input type="submit" value="Remove"
name="remove_query_[% query.id %]"
id="remove_query_[% query.id %]">
@ -286,7 +266,7 @@
name="add_query_[% event.key %]"
id="add_query_[% event.key %]">
</td>
<td align="right" colspan="2">
<td colspan="2" class="right">
<input type="submit" value="Update / Commit" name="commit" id="update">
</td>
</tr>
@ -301,7 +281,7 @@
[% END %]
<p align="left">
<p>
<input type="submit" value="Add a new event" name="add_event" id="add_event">
</p>