diff options
| -rw-r--r-- | skins/standard/attachment.css | 12 | ||||
| -rw-r--r-- | template/en/default/admin/admin.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/admin/params/advanced.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/admin/params/attachment.html.tmpl | 20 | ||||
| -rw-r--r-- | template/en/default/admin/params/auth.html.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/admin/params/core.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/admin/params/general.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/admin/params/ldap.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/admin/params/shadowdb.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/attachment/show-multiple.html.tmpl | 22 | ||||
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 16 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/pages/bug-writing.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/pages/linked.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/setup/strings.txt.pl | 4 |
15 files changed, 70 insertions, 64 deletions
diff --git a/skins/standard/attachment.css b/skins/standard/attachment.css index 3f037c956..3c596623c 100644 --- a/skins/standard/attachment.css +++ b/skins/standard/attachment.css @@ -210,6 +210,18 @@ div#update_container { margin-left: 2%; } +.viewall_desc { + width: 75%; + border: 1px solid black; + border-spacing: 0px; + border-collapse: collapse; +} + +.viewall_desc th, .viewall_desc td { + border: 1px solid black; + padding: 0.3em; +} + .viewall_frame { width: 75%; height: 350px; diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl index 38194e963..5c109dc3f 100644 --- a/template/en/default/admin/admin.html.tmpl +++ b/template/en/default/admin/admin.html.tmpl @@ -44,7 +44,7 @@ <dt id="sanitycheck" class="[% class %]"><a href="sanitycheck.cgi">Sanity Check</a></dt> <dd class="[% class %]">Run sanity checks to locate problems in your database. This may take several tens of minutes depending on the size of your installation. - You can also automate this check by running <tt>sanitycheck.pl</tt> from a cron job. + You can also automate this check by running <kbd>sanitycheck.pl</kbd> from a cron job. A notification will be sent per email to the specified user if errors are detected.</dd> [% class = (user.in_group('editusers') || user.can_bless) ? "" : "forbidden" %] diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl index 076d2dc7b..d2e38f34e 100644 --- a/template/en/default/admin/params/advanced.html.tmpl +++ b/template/en/default/admin/params/advanced.html.tmpl @@ -58,7 +58,7 @@ proxy_url => "$terms.Bugzilla may have to access the web to get notifications about" - _ " new releases (see the <tt>upgrade_notification</tt> parameter)." + _ " new releases (see the <var>upgrade_notification</var> parameter)." _ " If your $terms.Bugzilla server is behind a proxy, it may be" _ " necessary to enter its URL if the web server cannot access the" _ " HTTP_PROXY environment variable. If you have to authenticate," diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl index 6e0301908..e60753d90 100644 --- a/template/en/default/admin/params/attachment.html.tmpl +++ b/template/en/default/admin/params/attachment.html.tmpl @@ -19,29 +19,29 @@ _ "<p>This is a security restriction for installations where untrusted" _ " users may upload attachments that could be potentially damaging if" _ " viewed directly in the browser.</p>" - _ "<p>It is highly recommended that you set the <tt>attachment_base</tt>" + _ "<p>It is highly recommended that you set the <var>attachment_base</var>" _ " parameter if you turn this parameter on.", attachment_base => - "When the <tt>allow_attachment_display</tt> parameter is on, it is " + "When the <var>allow_attachment_display</var> parameter is on, it is " _ " possible for a malicious attachment to steal your cookies or" _ " perform an attack on $terms.Bugzilla using your credentials." _ "<p>If you would like additional security on attachments to avoid" _ " this, set this parameter to an alternate URL for your $terms.Bugzilla" - _ " that is not the same as <tt>urlbase</tt> or <tt>sslbase</tt>." + _ " that is not the same as <var>urlbase</var> or <var>sslbase</var>." _ " That is, a different domain name that resolves to this exact" _ " same $terms.Bugzilla installation.</p>" _ "<p>Note that if you have set the" - _ " <a href=\"editparams.cgi?section=advanced#cookiedomain_desc\"><tt>cookiedomain</tt>" - _" parameter</a>, you should set <tt>attachment_base</tt> to use a" + _ " <a href=\"editparams.cgi?section=advanced#cookiedomain_desc\"><var>cookiedomain</var>" + _" parameter</a>, you should set <var>attachment_base</var> to use a" _ " domain that would <em>not</em> be matched by" - _ " <tt>cookiedomain</tt>.</p>" - _ "<p>For added security, you can insert <tt>%bugid%</tt> into the URL," + _ " <var>cookiedomain</var>.</p>" + _ "<p>For added security, you can insert <var>%bugid%</var> into the URL," _ " which will be replaced with the ID of the current $terms.bug that" _ " the attachment is on, when you access an attachment. This will limit" _ " attachments to accessing only other attachments on the same" _ " ${terms.bug}. Remember, though, that all those possible domain names " - _ " (such as <tt>1234.your.domain.com</tt>) must point to this same" + _ " (such as <kbd>1234.your.domain.com</kbd>) must point to this same" _ " $terms.Bugzilla instance.", allow_attachment_deletion => "If this option is on, administrators will be able to delete " _ @@ -50,13 +50,13 @@ maxattachmentsize => "The maximum size (in kilobytes) of attachments to be stored " _ "in the database. If a file larger than this size is attached " _ "to ${terms.abug}, $terms.Bugzilla will look at the " _ - "<a href='#maxlocalattachment'><tt>maxlocalattachment</tt> parameter</a> " _ + "<a href=\"#maxlocalattachment\"><var>maxlocalattachment</var> parameter</a> " _ "to determine if the file can be stored locally on the web server. " _ "If the file size exceeds both limits, then the attachment is rejected. " _ "Settings both parameters to 0 will prevent attaching files to ${terms.bugs}.", maxlocalattachment => "The maximum size (in megabytes) of attachments to be stored " _ "locally on the web server. If set to a value lower than the " _ - "<a href='#maxattachmentsize'><tt>maxattachmentsize</tt> parameter</a>, " _ + "<a href=\"#maxattachmentsize\"><var>maxattachmentsize</var> parameter</a>, " _ "attachments will never be kept on the local filesystem." } %] diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl index 228609827..88d54ccf3 100644 --- a/template/en/default/admin/params/auth.html.tmpl +++ b/template/en/default/admin/params/auth.html.tmpl @@ -96,24 +96,24 @@ webservice_email_filter => "Filter email addresses returned by the WebService API depending on " _ "if the user is logged in or not. This works similarly to how the " _ - "web UI currently filters email addresses. If <tt>requirelogin</tt> " _ + "web UI currently filters email addresses. If <var>requirelogin</var> " _ "is enabled, then this parameter has no effect as users must be logged " _ "in to use ${terms.Bugzilla}.", emailregexp => "This defines the regular expression to use for legal email addresses. " _ "The default tries to match fully qualified email addresses. " _ - "Use <tt>.*</tt> to accept any email address following the " _ - "<a href='http://tools.ietf.org/html/rfc2822#section-3.4.1'>RFC 2822</a> " _ - "specification. Another popular value to put here is <tt>^[^@]+$</tt>, " _ + "Use <kbd>.*</kbd> to accept any email address following the " _ + "<a href=\"http://tools.ietf.org/html/rfc2822#section-3.4.1\">RFC 2822</a> " _ + "specification. Another popular value to put here is <kbd>^[^@]+$</kbd>, " _ "which means 'local usernames, no @ allowed.'", emailregexpdesc => "This description explains valid addresses that " _ - "are allowed by the <tt>emailregexp</tt> param.", + "are allowed by the <var>emailregexp</var> param.", emailsuffix => "This is a string to append to any email addresses when actually " _ "sending mail to that address. It is useful if you have changed " _ - "the <tt>emailregexp</tt> param to only allow local usernames, " _ + "the <var>emailregexp</var> param to only allow local usernames, " _ "but you want the mail to be delivered to username@my.local.hostname.", createemailregexp => "This defines the (case-insensitive) regexp to use for email addresses that are " _ diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl index fd839ed9b..cc533fc91 100644 --- a/template/en/default/admin/params/core.html.tmpl +++ b/template/en/default/admin/params/core.html.tmpl @@ -21,9 +21,9 @@ ssl_redirect => "When this is enabled, $terms.Bugzilla will ensure that every page is" _ " accessed over SSL, by redirecting any plain HTTP requests to HTTPS" - _ " using the <tt>sslbase</tt> parameter. Also, when this is enabled," - _ " $terms.Bugzilla will send out links using <tt>sslbase</tt> in emails" - _ " instead of <tt>urlbase</tt>.", + _ " using the <var>sslbase</var> parameter. Also, when this is enabled," + _ " $terms.Bugzilla will send out links using <var>sslbase</var> in emails" + _ " instead of <var>urlbase</var>.", cookiepath => "Path, relative to your web document root, to which to restrict " _ "$terms.Bugzilla cookies. Normally this is the URI portion of your URL " _ diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl index daa1f359e..369e495c7 100644 --- a/template/en/default/admin/params/general.html.tmpl +++ b/template/en/default/admin/params/general.html.tmpl @@ -19,7 +19,7 @@ docs_urlbase => "The URL that is the common initial leading part of all" _ " $terms.Bugzilla documentation URLs. It may be an absolute URL," - _ " or a URL relative to the <tt>urlbase</tt> parameter. Leave this" + _ " or a URL relative to the <var>urlbase</var> parameter. Leave this" _ " empty to suppress links to the documentation." _ "'%lang%' will be replaced by user's preferred language (if" _ " documentation is available in that language).", @@ -45,10 +45,10 @@ _ " display whatever is in this field at the top of every" _ " HTML page. The HTML you put in this field is not wrapped or" _ " enclosed in anything. You might want to wrap it inside a" - _ "<tt><div></tt>. Give the div <em>id=\"message\"</em> to get" + _ "<code><div></code>. Give the div <em>id=\"message\"</em> to get" _ " green text inside a red box, or <em>class=\"bz_private\"</em> for" _ " dark red on a red background. Anything defined in " - _ " <tt>skins/standard/global.css</tt> or <tt>skins/custom/global.css</tt>" + _ " <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>.", @@ -68,6 +68,6 @@ _ " <li>'disabled' will never notify you about new releases and no" _ " connection will be established to a remote server.</li></ul>" _ " <p>Note that if your $terms.Bugzilla server requires a proxy to" - _ " access the Internet, you may also need to set the <tt>proxy_url</tt>" + _ " access the Internet, you may also need to set the <var>proxy_url</var>" _ " parameter in the Advanced section.</p>", } %] diff --git a/template/en/default/admin/params/ldap.html.tmpl b/template/en/default/admin/params/ldap.html.tmpl index 64b3dbd52..7a10c3f64 100644 --- a/template/en/default/admin/params/ldap.html.tmpl +++ b/template/en/default/admin/params/ldap.html.tmpl @@ -40,6 +40,6 @@ " as the $terms.Bugzilla username. You may also want" _ " to set the \"emailsuffix\" parameter, in this case.", - LDAPfilter => "LDAP filter to AND with the <tt>LDAPuidattribute</tt> for " _ + LDAPfilter => "LDAP filter to AND with the <var>LDAPuidattribute</var> for " _ "filtering the list of valid users." } %] diff --git a/template/en/default/admin/params/shadowdb.html.tmpl b/template/en/default/admin/params/shadowdb.html.tmpl index 9f9f31491..5eb9ceff4 100644 --- a/template/en/default/admin/params/shadowdb.html.tmpl +++ b/template/en/default/admin/params/shadowdb.html.tmpl @@ -14,7 +14,7 @@ shadowdbhost => "The host the shadow database is on.", shadowdbport => "The port the shadow database is on. Ignored if " _ - "<tt>shadowdbhost</tt> is blank. Note: if the host is the local " _ + "<var>shadowdbhost</var> is blank. Note: if the host is the local " _ "machine, then MySQL will ignore this setting, and you must " _ "specify a socket below.", @@ -23,14 +23,14 @@ "ignores the port specified by the client and connects using " _ "its compiled-in socket path (on unix machines) when connecting " _ "from a client to a local server. If you leave this blank, and " _ - "have the database on localhost, then the <tt>shadowdbport</tt> " _ + "have the database on localhost, then the <var>shadowdbport</var> " _ "will be ignored.", shadowdb => "If non-empty, then this is the name of another database in " _ "which $terms.Bugzilla will use as a read-only copy of everything. " _ "This is done so that long slow read-only operations can be used " _ "against this db, and not lock up things for everyone else. This " _ - "database is on the <tt>shadowdbhost</tt>, and must exist. " _ + "database is on the <var>shadowdbhost</var>, and must exist. " _ "$terms.Bugzilla does not update it, if you use this parameter, then " _ "you need to set up replication for your database." } %] diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index be946ee89..173133199 100644 --- a/template/en/default/attachment/show-multiple.html.tmpl +++ b/template/en/default/attachment/show-multiple.html.tmpl @@ -31,18 +31,14 @@ [% FOREACH a = attachments %] <div align="center"> - <table class="attachment_info" cellspacing="0" cellpadding="4" border="1" width="75%"> + <table class="viewall_desc"> <tr> - <td colspan="6" class="bz_attach_footer"> - <big><b>Attachment #[% a.id %]</b></big> - </td> + <th colspan="6" class="bz_attach_footer">Attachment #[% a.id %]</th> </tr> <tr> - <td valign="top"> - [% a.description FILTER html FILTER obsolete(a.isobsolete) %] - </td> + <td>[% a.description FILTER html FILTER obsolete(a.isobsolete) %]</td> - <td valign="top"> + <td> [% IF a.ispatch %] <i>patch</i> [% ELSE %] @@ -50,10 +46,10 @@ [% END %] </td> - <td valign="top">[% a.attached FILTER time %]</td> - <td valign="top">[% a.datasize FILTER unitconvert %]</td> + <td>[% a.attached FILTER time %]</td> + <td>[% a.datasize FILTER unitconvert %]</td> - <td valign="top"> + <td> [% IF a.flags.size == 0 %] <i>no flags</i> [% ELSE %] @@ -68,9 +64,7 @@ [% END %] </td> - <td valign="top"> - <a href="attachment.cgi?id=[% a.id %]&action=edit">Details</a> - </td> + <td><a href="attachment.cgi?id=[% a.id %]&action=edit">Details</a></td> </tr> </table> diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 357baec4a..08ddace9d 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -64,13 +64,13 @@ [% ELSIF error == "chart_datafile_corrupt" %] The chart data file [% file FILTER html %] is corrupt. - + [% ELSIF error == "chart_dir_nonexistent" %] - One of the directories <tt>[% dir FILTER html %]</tt> and - <tt>[% graph_dir FILTER html %]</tt> does not exist. - + One of the directories <kbd>[% dir FILTER html %]</kbd> and + <kbd>[% graph_dir FILTER html %]</kbd> does not exist. + [% ELSIF error == "chart_file_open_fail" %] - Unable to open the chart datafile <tt>[% filename FILTER html %]</tt>. + Unable to open the chart datafile <kbd>[% filename FILTER html %]</kbd>. [% ELSIF error == "column_alter_nonexistent_fk" %] You attempted to modify the foreign key for @@ -430,15 +430,15 @@ with details of what you were doing at the time this message appeared. </p> -<tt> +<samp> <script type="text/javascript"> <!-- - document.write("<p>URL: " + + document.write("<p>URL: " + document.location.href.replace(/&/g,"&") .replace(/</g,"<") .replace(/>/g,">") + "</p>"); // --> </script> -</tt> +</samp> <table cellpadding="20"> <tr> diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 55379bda6..2018caee2 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -885,9 +885,9 @@ [% ELSIF error == "illegal_date" %] [% title = "Illegal Date" %] - '<tt>[% date FILTER html %]</tt>' is not a legal date. + '<kbd>[% date FILTER html %]</kbd>' is not a legal date. [% IF format %] - Please use the format '<tt>[% format FILTER html %]</tt>'. + Please use the format '<code>[% format FILTER html %]</code>'. [% END %] [% ELSIF error == "illegal_email_address" %] @@ -938,9 +938,9 @@ [% ELSIF error == "illegal_time" %] [% title = "Illegal Time" %] - '<tt>[% time FILTER html %]</tt>' is not a legal time. + '<kbd>[% time FILTER html %]</kbd>' is not a legal time. [% IF format %] - Please use the format '<tt>[% format FILTER html %]</tt>'. + Please use the format '<code>[% format FILTER html %]</code>'. [% END %] [% ELSIF error == "illegal_regexp" %] @@ -1064,7 +1064,7 @@ [% ELSIF error == "invalid_username" %] [% title = "Invalid Username" %] - The name <tt>[% name FILTER html %]</tt> is not a valid username. + The name <kbd>[% name FILTER html %]</kbd> is not a valid username. Either you misspelled it, or the person has not registered for a [% terms.Bugzilla %] account. @@ -1832,7 +1832,7 @@ [% ELSIF error == "user_match_failed" %] [% title = "Match Failed" %] - <tt>[% name FILTER html %]</tt> does not exist or you are not allowed + <kbd>[% name FILTER html %]</kbd> does not exist or you are not allowed to see that user. [% ELSIF error == "user_match_too_many" %] diff --git a/template/en/default/pages/bug-writing.html.tmpl b/template/en/default/pages/bug-writing.html.tmpl index 1fc097eda..22dd652a7 100644 --- a/template/en/default/pages/bug-writing.html.tmpl +++ b/template/en/default/pages/bug-writing.html.tmpl @@ -66,10 +66,10 @@ no-one else appears to have reported it, then:</p> A good summary should <b>quickly and uniquely identify [% terms.abug %] report</b>. It should explain the problem, not your suggested solution.<br> <ul> - <li>Good: "<tt>Cancelling a File Copy dialog crashes - File Manager</tt>"</li> - <li>Bad: "<tt>Software crashes</tt>"</li> - <li>Bad: "<tt>Browser should work with my web site</tt>"</li> + <li>Good: "<kbd>Cancelling a File Copy dialog crashes + File Manager</kbd>"</li> + <li>Bad: "<kbd>Software crashes</kbd>"</li> + <li>Bad: "<kbd>Browser should work with my web site</kbd>"</li> </ul> <b>Description:</b> diff --git a/template/en/default/pages/linked.html.tmpl b/template/en/default/pages/linked.html.tmpl index 92d0f5920..3fcf87952 100644 --- a/template/en/default/pages/linked.html.tmpl +++ b/template/en/default/pages/linked.html.tmpl @@ -25,7 +25,7 @@ <hr> <p> - If you place it in <tt><pre></tt> tags, + If you place it in <code><pre></code> tags, the text will end up looking like this: </p> diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index d388f998f..a7d687fe0 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -372,8 +372,8 @@ END <p> You <b>must not</b> execute this script from your web browser. To install or upgrade Bugzilla, run this script from - the command-line (e.g. <tt>bash</tt> or <tt>ssh</tt> on Linux - or <tt>cmd.exe</tt> on Windows), and follow instructions given there. + the command-line (e.g. <kbd>bash</kbd> or <kbd>ssh</kbd> on Linux + or <kbd>cmd.exe</kbd> on Windows), and follow instructions given there. </p> <p> |