summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-01-11 07:11:04 +0100
committerDave Lawrence <dlawrence@mozilla.com>2012-01-11 07:11:04 +0100
commit4a58678de6f0cd1e25b2b3d2f3dd42e0f973f324 (patch)
tree030d3faa56c7d92f3a4d13917f9f7685ce3f1788 /template/en/default
parente23fa261d61319ece1ccfe87a64cf860b02f0eaa (diff)
parent320b36d4a9aa69e0fa806cd25c84c42d5a36966e (diff)
downloadbugzilla-4a58678de6f0cd1e25b2b3d2f3dd42e0f973f324.tar.gz
bugzilla-4a58678de6f0cd1e25b2b3d2f3dd42e0f973f324.tar.xz
merged with bugzilla/4.2
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/attachment/edit.html.tmpl10
-rw-r--r--template/en/default/global/textarea.html.tmpl3
-rw-r--r--template/en/default/request/queue.html.tmpl3
-rw-r--r--template/en/default/setup/strings.txt.pl14
4 files changed, 23 insertions, 7 deletions
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index fbe3a9c79..95ad4d335 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -197,6 +197,16 @@
[% END %]
</a>
</p>
+ [% ELSIF attachment.contenttype == "text/html" %]
+ [%# For security reasons (clickjacking, embedded scripts), we never
+ # render HTML pages from here. The source code is displayed instead. %]
+ [% INCLUDE global/textarea.html.tmpl
+ id = 'viewFrame'
+ minrows = 10
+ cols = 80
+ defaultcontent = attachment.data
+ readonly = 'readonly'
+ %]
[% ELSE %]
<iframe id="viewFrame" src="attachment.cgi?id=[% attachment.id %]">
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
diff --git a/template/en/default/global/textarea.html.tmpl b/template/en/default/global/textarea.html.tmpl
index c158615bd..ac7ab04ec 100644
--- a/template/en/default/global/textarea.html.tmpl
+++ b/template/en/default/global/textarea.html.tmpl
@@ -21,6 +21,8 @@
# 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.
+ # readonly: (optional) Prevent the textarea from being edited.
# minrows: (required) Number of rows the textarea shall have initially
# and when not having focus.
# maxrows: (optional) Number of rows the textarea shall have if
@@ -42,6 +44,7 @@
[% IF classes %] class="[% classes FILTER html %]"[% END %]
[% IF wrap %] wrap="[% wrap FILTER html %]"[% END %]
[% IF disabled %] disabled="disabled"[% END %]
+ [% IF readonly %] readonly="readonly"[% END %]
[% IF defaultrows && user.settings.zoom_textareas.value == 'off' %]
rows="[% defaultrows FILTER html %]"
[% ELSE %]
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index d99dadc9b..57650de55 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -30,8 +30,9 @@
table#filtering th { text-align: right; }
"
onload="var f = document.request_form; selectProduct(f.product, f.component, null, null, 'Any');"
- javascript_urls=["js/productform.js"]
+ javascript_urls=["js/productform.js", "js/field.js"]
style_urls = ['skins/standard/buglist.css']
+ yui = ['autocomplete']
%]
<script type="text/javascript">
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 6faf7844c..36c3fe252 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -60,7 +60,7 @@ EOT
commands_optional => 'COMMANDS TO INSTALL OPTIONAL MODULES:',
commands_required => <<EOT,
COMMANDS TO INSTALL REQUIRED MODULES (You *must* run all these commands
-and then re-run this script):
+and then re-run checksetup.pl):
EOT
continue_without_answers => <<'END',
Re-run checksetup.pl in interactive mode (without an 'answers' file)
@@ -139,12 +139,14 @@ END
ERROR: Using install-module.pl requires that you install "make".
END
lc_new_vars => <<'END',
-This version of Bugzilla contains some variables that you may want to
-change and adapt to your local settings. Please edit the file
-##localconfig## and then rerun checksetup.pl.
+This version of Bugzilla contains some variables that you may want to
+change and adapt to your local settings. The following variables are
+new to ##localconfig## since you last ran checksetup.pl:
-The following variables are new to ##localconfig## since you last ran
-checksetup.pl: ##new_vars##
+##new_vars##
+
+Please edit the file ##localconfig## and then re-run checksetup.pl
+to complete your installation.
END
lc_old_vars => <<'END',
The following variables are no longer used in ##localconfig##, and