[Rt-commit] r11808 - rt/branches/3.8-TESTING/html/installation

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Mon Apr 21 11:14:24 2008
New Revision: 11808

Modified:
   rt/branches/3.8-TESTING/html/installation/Step2.html
   rt/branches/3.8-TESTING/html/installation/Step3.html
   rt/branches/3.8-TESTING/html/installation/Step4.html
   rt/branches/3.8-TESTING/html/installation/Step6.html

Log:
small or typo fixes

Modified: rt/branches/3.8-TESTING/html/installation/Step2.html
==============================================================================
--- rt/branches/3.8-TESTING/html/installation/Step2.html	(original)
+++ rt/branches/3.8-TESTING/html/installation/Step2.html	Mon Apr 21 11:14:24 2008
@@ -75,7 +75,8 @@
 <tr title="<% $title{DatabaseRequireSSL} |n %>" >
 <td class="label"><% loc('DatabaseRequireSSL') %>:</td>
 <td>
-<input type="checkbox" name="DatabaseRequireSSL" value="1" />
+<input type="checkbox" name="DatabaseRequireSSL" value="1" <%
+$ARGS{DatabaseRequireSSL} ? 'checked="checked"' : '' %> />
 </td>
 </tr>
 % }
@@ -156,7 +157,7 @@
     else {
         for ( qw/DatabaseName DatabaseUser DatabasePassword DatabasePort
                 DatabaseHost DatabaseRequireSSL/ ) {
-            $session{InstallConfig}{$_} = $ARGS{$_} if $ARGS{$_};
+            $session{InstallConfig}{$_} = $ARGS{$_};
         }
         $session{TimeStamp} = time;
 

Modified: rt/branches/3.8-TESTING/html/installation/Step3.html
==============================================================================
--- rt/branches/3.8-TESTING/html/installation/Step3.html	(original)
+++ rt/branches/3.8-TESTING/html/installation/Step3.html	Mon Apr 21 11:14:24 2008
@@ -77,7 +77,7 @@
 <%init>
 my @results;
 
-my @types = qw/rtname Organization TimeZone MininumPasswordLength/;
+my @types = qw/rtname Organization TimeZone MinimumPasswordLength/;
 my %title = (
 rtname => <<'EOF'
 rtname is the string that RT will look for in mail messages to figure out what ticket a new piece of mail belongs to Your domain name is recommended, so as not to pollute the namespace.  once you start using a given tag, you should probably never change it.
@@ -92,7 +92,7 @@
 $Timezone is used to convert times entered by users into GMT and back again It should be set to a timezone recognized by your local unix box.
 EOF
 ,
-MininumPasswordLength => <<'EOF'
+MinimumPasswordLength => <<'EOF'
 $MinimumPasswordLength defines the minimum length for user passwords. Setting it to 0 disables this check
 EOF
 ,

Modified: rt/branches/3.8-TESTING/html/installation/Step4.html
==============================================================================
--- rt/branches/3.8-TESTING/html/installation/Step4.html	(original)
+++ rt/branches/3.8-TESTING/html/installation/Step4.html	Mon Apr 21 11:14:24 2008
@@ -66,7 +66,7 @@
 
 </table>
 <input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: Customize Sendmails') &>
+<& /Elements/Submit, Label => loc('Next: Customize Sendmail') &>
 </form>
 
 <%init>

Modified: rt/branches/3.8-TESTING/html/installation/Step6.html
==============================================================================
--- rt/branches/3.8-TESTING/html/installation/Step6.html	(original)
+++ rt/branches/3.8-TESTING/html/installation/Step6.html	Mon Apr 21 11:14:24 2008
@@ -52,6 +52,12 @@
 
 <& /Elements/ListActions, actions => \@results &>
 
+% unless ( @results ) {
+<div>
+This might takes a bit long
+</div>
+% }
+
 <form method="post">
 <input type="hidden" name="Run" value="1">
 <& /Elements/Submit, Label => loc('Initialize Database') &>
@@ -64,7 +70,7 @@
     @results = split /\n/, $msg;
 # XXX $? doesn't work here, so I decided to grep the strings to find if any
 # error happens
-    unless ( grep { /^ERROR:/ } @results ) {
+    unless ( grep { /^ERROR:|aborted/ } @results ) {
         RT::Interface::Web::Redirect(RT->Config->Get('WebURL') . 'installation/Step7.html');
     }
 }