[Rt-commit] r13562 - in rt/3.8/trunk: . share/html/Install
falcone at bestpractical.com
falcone at bestpractical.com
Tue Jun 24 13:01:52 EDT 2008
Author: falcone
Date: Tue Jun 24 13:01:50 2008
New Revision: 13562
Modified:
rt/3.8/trunk/ (props changed)
rt/3.8/trunk/lib/RT/Installer.pm
rt/3.8/trunk/share/html/Install/Basics.html
rt/3.8/trunk/share/html/Install/DatabaseDetails.html
rt/3.8/trunk/share/html/Install/DatabaseType.html
rt/3.8/trunk/share/html/Install/Finish.html
rt/3.8/trunk/share/html/Install/Global.html
rt/3.8/trunk/share/html/Install/Initialize.html
rt/3.8/trunk/share/html/Install/Sendmail.html
Log:
r34785 at ketch: falcone | 2008-06-24 13:01:35 -0400
* hint/label/error message updates
* added intro paragraphs
Modified: rt/3.8/trunk/lib/RT/Installer.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Installer.pm (original)
+++ rt/3.8/trunk/lib/RT/Installer.pm Tue Jun 24 13:01:50 2008
@@ -73,7 +73,7 @@
DatabaseHost => {
Widget => '/Widgets/Form/String',
WidgetArguments => {
- Description => 'Database host',
+ Description => 'Database host', #loc
Default => 1,
DefaultLabel => "Keep 'localhost' if you're not sure", #loc
Hints => "The domain name of your database server (like 'db.example.com').", #loc
@@ -85,7 +85,7 @@
Description => 'Database port', #loc
Default => 1,
DefaultLabel =>
- 'Leave empty to use a default value', #loc
+ 'Leave empty to use the default value for your database', #loc
},
},
DatabaseName => {
@@ -98,23 +98,25 @@
Widget => '/Widgets/Form/String',
WidgetArguments => {
Default => 1,
- DefaultLabel => "Leave this alone to use a default value", #loc
+ Hints => "Leave this alone to use the default dba username for your database type", #loc
Description => 'DBA username', # loc
+ DefaultLabel => '',
},
},
DatabaseAdminPassword => {
Widget => '/Widgets/Form/String',
WidgetArguments => {
- Description =>
- 'DBA password', #loc
- Hints => "The DBA's database password",#loc
+ Description => 'DBA password', #loc
+ DefaultLabel => "The DBA's database password",#loc
Type => 'password',
+ Hints => "You must provide the dba's password so we can create the RT database and user.",
},
},
DatabaseUser => {
Widget => '/Widgets/Form/String',
WidgetArguments => {
Description => 'Database username for RT', #loc
+ Hints => 'RT will connect to the database using this user. It will be created for you.', #loc
},
},
DatabasePassword => {
@@ -122,6 +124,7 @@
WidgetArguments => {
Description => 'Database password for RT', #loc
Type => 'password',
+ Hints => 'The password RT should use to connect to the database.',
},
},
DatabaseRequireSSL => {
@@ -134,7 +137,7 @@
Widget => '/Widgets/Form/String',
WidgetArguments => {
Description => 'Site name', #loc
- Hints => 'Set this to your internet domain. (ex: example.com)' #loc
+ Hints => 'RT will use this string to uniquely identify your installation and looks for it in the subject of emails to decide what ticket a message applies to. We recommend that you set this to your internet domain. (ex: example.com)' #loc
},
},
MinimumPasswordLength => {
@@ -154,8 +157,8 @@
OwnerEmail => {
Widget => '/Widgets/Form/String',
WidgetArguments => {
- Description => 'RT Administrator', #loc
- Hints => "When RT can't handle an email message, where should it be forwarded to?", #loc
+ Description => 'RT Administrator Email', #loc
+ Hints => "When RT can't handle an email message, where should it be forwarded?", #loc
},
},
CommentAddress => {
@@ -177,14 +180,15 @@
SendmailPath => {
Widget => '/Widgets/Form/String',
WidgetArguments => {
- Description => 'where is sendmail command', #loc
+ Hints => 'Where to find your sendmail binary.', #loc
+ Description => 'Path to sendmail', #loc
},
},
WebDomain => {
Widget => '/Widgets/Form/String',
WidgetArguments => {
Description => 'Domain name', #loc
- Hints => "like 'localhost', 'rt.example.com'", #loc
+ Hints => "Don't include http://, just something like 'localhost', 'rt.example.com'", #loc
},
},
WebPort => {
Modified: rt/3.8/trunk/share/html/Install/Basics.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Basics.html (original)
+++ rt/3.8/trunk/share/html/Install/Basics.html Tue Jun 24 13:01:50 2008
@@ -49,6 +49,14 @@
<& /Elements/ListActions, actions => \@results &>
+<p>
+<&|/l&>
+These configuration options cover some of the basics needed to get RT up and running. We need to know the name of
+your RT installation and the domain name where RT will live. You will also need to set a password for your defauly
+administrative user.
+</&>
+</p>
+
<form method="post">
<& /Widgets/BulkEdit, Types => \@Types,Meta => $RT::Installer->{Meta},
CurrentValue => RT::Installer->CurrentValues(@Types) &>
@@ -77,7 +85,7 @@
}
unless ( $ARGS{Password} ) {
- push @results, "Invalid password: it can't be null";
+ push @results, "You must enter an Administrative password";
}
if ( $Back ) {
Modified: rt/3.8/trunk/share/html/Install/DatabaseDetails.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/DatabaseDetails.html (original)
+++ rt/3.8/trunk/share/html/Install/DatabaseDetails.html Tue Jun 24 13:01:50 2008
@@ -49,6 +49,33 @@
<& /Elements/ListActions, actions => \@results &>
+% if ( $ConnectionSucceeded ) {
+
+<p>
+<&|/l&>
+We were able to find your database and connect as the DBA. You can click on 'Customize Basics' to continue
+customizing RT.
+</&>
+
+% } else {
+
+<p>
+<&|/l&>Tell us a little about how to find the database RT will be using</&>
+<p>
+<&|/l&>
+We need to know the name of the database RT will use and where to find it. We also need to know the username and
+password of the user RT should use. RT can create the database and user for you, which is why we ask for the
+username and password of a user with DBA privileges. During step 6 of the installation process we will use this
+information to create and initialize RT's database.
+</&>
+</p>
+<p>
+<&|/l&>
+When you click on 'Check Database Connectivity' there may be a small delay while RT tries to connect to your
+database
+</&>
+% }
+
<form method="post">
<& /Widgets/BulkEdit, Types => \@Types, Meta => $RT::Installer->{Meta},
CurrentValue => { %{RT::Installer->CurrentValues(@Types)},
@@ -62,7 +89,7 @@
&>
<input type="hidden" name="Run" value="1">
-% if ( @results && $results[0] eq 'Connection succeeded' ) {
+% if ( $ConnectionSucceeded ) {
<& /Elements/Submit, Label => loc('Next: ') . loc('Customize Basics'),
Back => 1, BackLabel => loc('Back: ') . loc('Select Database Type'),
Name => 'Next' &>
@@ -77,6 +104,7 @@
</&>
<%init>
my @results;
+my $ConnectionSucceeded;
my @Types = 'DatabaseName';
@@ -141,7 +169,7 @@
$sth->execute('RT_System');
if ( $sth->fetchrow_array ) {
$RT::Installer->{DatabaseAction} = 'none';
- push @results, "Database $RT::DatabaseName appears to be fully initialized.";
+ push @results, "Database $RT::DatabaseName appears to be fully initialized. We won't need to create any tables or insert metadata, but you can continue to customez RT by clicking 'Customize Basics' below";
}
else {
$RT::Installer->{DatabaseAction} = 'acl,coredata,insert';
@@ -168,7 +196,7 @@
push @results, $msg;
}
-
+$ConnectionSucceeded = ( @results && $results[0] eq 'Connection succeeded' ) ? 1 : 0;
}
</%init>
Modified: rt/3.8/trunk/share/html/Install/DatabaseType.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/DatabaseType.html (original)
+++ rt/3.8/trunk/share/html/Install/DatabaseType.html Tue Jun 24 13:01:50 2008
@@ -52,12 +52,12 @@
<div class="intro">
<p>
<&|/l&>
- RT works just great with a number of different databases. <b>MySQL</b>, <b>PostgreSQL</b>, <b>Oracle</b> and <b>SQLite</b> are all supported.
+ RT works with a number of different databases. <b>MySQL</b>, <b>PostgreSQL</b>, <b>Oracle</b> and <b>SQLite</b> are all supported.
</&>
</p>
<p>
<&|/l&>
- You should choose whichever database you or your local database administrator is most comfortable with.
+ You should choose the database you or your local database administrator is most comfortable with.
</&>
</p>
<p><b>
@@ -67,7 +67,7 @@
</b></p>
<p>
<&|/l, '<a href="http://search.cpan.org" target="_new">CPAN</a>' &>
-If your supported database isn't listed in the dropdown below, that means RT
+If your preferred database isn't listed in the dropdown below, that means RT
couldn't find a <i>database driver</i> for it installed locally. You may be
able to remedy this by using [_1] to download and install DBD::MySQL, DBD::Oracle or DBD::Pg.
</&>
Modified: rt/3.8/trunk/share/html/Install/Finish.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Finish.html (original)
+++ rt/3.8/trunk/share/html/Install/Finish.html Tue Jun 24 13:01:50 2008
@@ -56,14 +56,21 @@
<p>
<&|/l&>
-You should be taken directly to a login page. You'll be able to log in with username of <tt>root</tt>.
-But if you've changed web port, then you have to restart the server to use RT.
+You should be taken directly to a login page. You'll be able to log in with username of <tt>root</tt> and the
+password you set earlier.
+</&>
+</p>
+
+<p>
+<&|/l&>
+If you've change the Port that RT runs on, you'll need to restart the server in order to log in.
</&>
</p>
<p>
<&|/l, RT::Installer->ConfigFile &>
-The settings you've chosen are stored in [_1], the place you can refine your configuration further. Using `<tt>chmod -w '[_1]'</tt>` will prevent this installation wizard from being run again.
+The settings you've chosen are stored in [_1]. You can edit this file to refine your configuration further. You can
+prevent this installation wizard from being shown again by running `<tt>chmod -w '[_1]'</tt>`.
</&>
</p>
</div>
Modified: rt/3.8/trunk/share/html/Install/Global.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Global.html (original)
+++ rt/3.8/trunk/share/html/Install/Global.html Tue Jun 24 13:01:50 2008
@@ -49,6 +49,18 @@
<& /Elements/ListActions, actions => \@results &>
+<p><&|/l&>Help us set up some useful defaults for RT.</&></p>
+
+<p><&|/l&>
+When RT sends an email it sets the From: and Reply-To: headers so users can add to the conversation by just hitting
+Reply in their mail client. It uses different addresses for Replies and Comments. These can be changed for each of
+your queues. These addresses will need to be configured to use the <tt>rt-mailgate</tt> program.
+</&></p>
+
+<p><&|/l&>
+By default, RT will use the timezone of your system. This lets you set a global default for the display of dates
+and times in RT. Your users can choose a different Timezone in their preferences.
+</&></p>
<form method="post">
<& /Widgets/BulkEdit, Types => \@Types,Meta => $RT::Installer->{Meta},
CurrentValue => RT::Installer->CurrentValues(@Types)
Modified: rt/3.8/trunk/share/html/Install/Initialize.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Initialize.html (original)
+++ rt/3.8/trunk/share/html/Install/Initialize.html Tue Jun 24 13:01:50 2008
@@ -51,7 +51,7 @@
% unless ( @results ) {
<div>
-<&|/l&>Click "Initialize Database" to begin creating the database. This may take a few moments</&>
+<&|/l&>Click "Initialize Database" to create RT's database and insert initial metadata. This may take a few moments</&>
</div>
% }
Modified: rt/3.8/trunk/share/html/Install/Sendmail.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Sendmail.html (original)
+++ rt/3.8/trunk/share/html/Install/Sendmail.html Tue Jun 24 13:01:50 2008
@@ -49,20 +49,29 @@
<& /Elements/ListActions, actions => \@results &>
+<p>
+<&|/l&>
+RT can communicate with your users about new tickets or new correspondence on tickets.
+Tell us where to find sendmail (or a sendmail compatible binary such as the one provided by
+postifx). RT also needs to know who to notify when someone sends invalid email. This must not be an address that
+feeds back into RT.
+</&>
+</p>
+
<form method="post">
<& /Widgets/BulkEdit, Types => \@Types,Meta => $RT::Installer->{Meta},
CurrentValue => RT::Installer->CurrentValues(@Types)
&>
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: ') . loc( 'Customize Global'),
+<& /Elements/Submit, Label => loc('Next: ') . loc( 'Customize Global Defaults'),
Back => 1, BackLabel => loc('Back: ' ) . loc('Customize Basics') &>
</form>
</&>
<%init>
my @results;
-my @Types = qw/OwnerEmail SendmailPath/;
+my @Types = qw/SendmailPath OwnerEmail/;
if ( $Run ) {
@@ -81,7 +90,7 @@
}
if ( ! $ARGS{OwnerEmail} || $ARGS{OwnerEmail} !~ /.+ at .+/ ) {
- push @results, "Invalid OwnerEmail: not like an email address";
+ push @results, "Invalid Administrator Email: That doesn't look like an email address";
}
More information about the Rt-commit
mailing list