diff options
| -rw-r--r-- | Bugzilla/Install/Localconfig.pm | 9 | ||||
| -rw-r--r-- | template/en/default/attachment/edit.html.tmpl | 10 | ||||
| -rw-r--r-- | template/en/default/global/textarea.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/request/queue.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/setup/strings.txt.pl | 14 |
5 files changed, 29 insertions, 10 deletions
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm index 1ee7aca67..1544e6fac 100644 --- a/Bugzilla/Install/Localconfig.pm +++ b/Bugzilla/Install/Localconfig.pm @@ -32,12 +32,13 @@ use strict; use Bugzilla::Constants; use Bugzilla::Install::Util qw(bin_loc install_string); -use Bugzilla::Util qw(generate_random_password); +use Bugzilla::Util qw(generate_random_password wrap_hard); use Data::Dumper; use File::Basename qw(dirname); use IO::File; use Safe; +use Term::ANSIColor; use base qw(Exporter); @@ -274,8 +275,10 @@ sub update_localconfig { if (@new_vars) { my $newstuff = join(', ', @new_vars); - print "\n", install_string('lc_new_vars', - { localconfig => $filename, new_vars => $newstuff }), "\n"; + print "\n"; + print colored(install_string('lc_new_vars', { localconfig => $filename, + new_vars => wrap_hard($newstuff, 70) }), + COLOR_ERROR), "\n"; exit; } 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 |