From 2b574f4d63e4ada0db82ca5a56773b3acf771d78 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Tue, 7 Jan 2014 11:42:19 +0100 Subject: Bug 840407: Remove the "align" and "valign" attributes r/a=justdave --- template/en/default/account/prefs/email.html.tmpl | 159 ++++++++------------- .../en/default/account/prefs/permissions.html.tmpl | 48 +++---- .../default/account/prefs/saved-searches.html.tmpl | 5 +- .../en/default/account/prefs/settings.html.tmpl | 2 +- 4 files changed, 89 insertions(+), 125 deletions(-) (limited to 'template/en/default/account/prefs') diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index a085058c7..1eeb4c721 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -60,61 +60,36 @@ function SetCheckboxes(setting) { } } } - -document.write('\n'); -document.write('\n'); // --> + + +
- - - - +

Global options

+ +[% prefname = "email-$constants.REL_ANY-$constants.EVT_FLAG_REQUESTED" %] + + +
+[% prefname = "email-$constants.REL_ANY-$constants.EVT_REQUESTED_FLAG" %] + + - - - - - - - - [% IF user.is_global_watcher %] - - - - +

+ You are watching all [% terms.bugs %]. To be removed from this role, contact + [% Param("maintainer") %]. +

[% END %] -
- Global options: -
- [% prefname = "email-$constants.REL_ANY-$constants.EVT_FLAG_REQUESTED" %] - - -
-
- [% prefname = "email-$constants.REL_ANY-$constants.EVT_REQUESTED_FLAG" %] - - -
-
- You are watching all [% terms.bugs %]. To be removed from this role, - contact - [% Param("maintainer") %]. -
-Field/recipient specific options: -
-
+ +

Field/recipient specific options

[% events = [ { id = constants.EVT_ADDED_REMOVED, @@ -173,39 +148,33 @@ document.write(' - - - When my relationship to this [% terms.bug %] is: - - - I want to receive mail when: - + + + When my relationship to this [% terms.bug %] is: + + I want to receive mail when: [% FOREACH relationship = relationships %] - - [% relationship.description FILTER html %] - + [% relationship.description FILTER html %] [% END %] - + [% FOREACH event = events %] [% count = loop.count() %] [% FOREACH relationship = relationships %] - - + + [% END %] @@ -213,38 +182,30 @@ document.write(' -   - - - but not when (overrides above): - + + +   + but not when (overrides above): [% FOREACH event = neg_events %] [% count = loop.count() %] [% FOREACH relationship = relationships %] - - + + [% END %] - - [% event.description FILTER html %] - + [% event.description FILTER html %] [% END %] -
-User Watching + +

User Watching

If you watch a user, it is as if you are standing in their shoes for the @@ -253,22 +214,22 @@ preferences for their relationship to the [% terms.bug %] (e.g. Assignee).

-

[% IF watchedusers.size %] -You are watching everyone in the following list: -

+

You are watching everyone in the following list:


+ +
+

[% ELSE %] -You are currently not watching any users. +

You are currently not watching any users.

[% END %] -

+

Add users to my watch list (comma separated list): [% INCLUDE global/userselect.html.tmpl @@ -278,7 +239,7 @@ You are currently not watching any users. size => 60 multiple => 5 %] -

+

Users watching you:
[% IF watchers.size %] @@ -290,7 +251,9 @@ You are currently not watching any users. [% END %]

-Ignore [% terms.Bugs %] +
+ +

Ignore [% terms.Bugs %]

You can specify a list of [% terms.bugs %] from which you never want to get @@ -324,6 +287,8 @@ You are currently not watching any users.

[% END %] -

Add [% terms.bugs %]:
+

+ Add [% terms.bugs %]:

+ name="add_ignored_bugs" size="60"> +

diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl index 450765afc..53583f35b 100644 --- a/template/en/default/account/prefs/permissions.html.tmpl +++ b/template/en/default/account/prefs/permissions.html.tmpl @@ -17,12 +17,11 @@ # other people. #%] - - -
+
[% IF has_bits.size %] - You have the following permission bits set on your account: - +

You have the following permission bits set on your account:

+ +
[% FOREACH bit_description = has_bits %] @@ -34,46 +33,47 @@ [% FOREACH privs = ["editcomponents", "canconfirm", "editbugs"] %] [% SET products = ${"local_$privs"} %] [% IF products && products.size %] -

You also have local '[% privs FILTER html %]' privileges for the following products:

-

+

    [% FOREACH product = products %] - [% product.name FILTER html %]
    +
  • [% product.name FILTER html %]
    • [% END %] -

    +
[% END %] [% END %] [% ELSE %] - There are no permission bits set on your account. +

There are no permission bits set on your account.

[% END %] [% IF user.in_group('editusers') %] -
- You have editusers privileges. You can turn on and off - all permissions for all users. +

+ You have editusers privileges. You can turn on and off all + permissions for all users. +

[% ELSIF set_bits.size %] -
- And you can turn on or off the following bits for - other users: -
[% bit_description.name FILTER html %]
+

+ And you can turn on or off the following bits for + other users: +

+ +
[% FOREACH bit_description = set_bits %] [% END %] -
[% bit_description.name FILTER html %] [% bit_description.desc FILTER html_light %]
+
[% END %] [% IF user.in_group('bz_sudoers') %] -
- You are a member of the bz_sudoers group, so you can - impersonate someone else. +

+ You are a member of the bz_sudoers group, so you can + impersonate someone else. +

[% END %] - - - + diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl index 33df92255..76e553381 100644 --- a/template/en/default/account/prefs/saved-searches.html.tmpl +++ b/template/en/default/account/prefs/saved-searches.html.tmpl @@ -30,7 +30,6 @@

Your saved searches are as follows:

-
@@ -53,7 +52,7 @@ - @@ -120,12 +119,12 @@ [% END %]
Search +
+ [% IF user.can_bless %]

Note that for every search that has the "Add to footer" selected, a link to the shared search is added to the footer of every user that is a direct member of the group at the time you click Submit Changes.

[% END %] -
[% IF user.queries_available.size %]

You may use these searches saved and shared by others:

diff --git a/template/en/default/account/prefs/settings.html.tmpl b/template/en/default/account/prefs/settings.html.tmpl index d54441ddb..a7055c67f 100644 --- a/template/en/default/account/prefs/settings.html.tmpl +++ b/template/en/default/account/prefs/settings.html.tmpl @@ -34,7 +34,7 @@ [% default_name = name _ '-isdefault' %] [% default_val = settings.${name}.default_value %] - + [% setting_descs.$name OR name FILTER html %] -- cgit v1.2.3-24-g4f1b