[Rt-commit] r13536 - in rt/3.8/trunk: share/html/Install share/html/NoAuth/css/web2

sunnavy at bestpractical.com sunnavy at bestpractical.com
Mon Jun 23 11:24:45 EDT 2008


Author: sunnavy
Date: Mon Jun 23 11:23:49 2008
New Revision: 13536

Added:
   rt/3.8/trunk/share/html/Install/Global.html
      - copied, changed from r13535, /rt/3.8/trunk/share/html/Install/Emails.html
Removed:
   rt/3.8/trunk/share/html/Install/Emails.html
Modified:
   rt/3.8/trunk/   (props changed)
   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/Initialize.html
   rt/3.8/trunk/share/html/Install/Sendmail.html
   rt/3.8/trunk/share/html/NoAuth/css/web2/nav.css

Log:
 r13734 at sunnavys-mb:  sunnavy | 2008-06-23 23:20:21 +0800
 reorder install pages: deleted Emails.html, added Global.html after Sendmail.html


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	Mon Jun 23 11:23:49 2008
@@ -54,7 +54,7 @@
     CurrentValue => RT::Installer->CurrentValues(@Types) &>
 
 <input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: ') . loc('Customize Email Addresses'), Back => 1, BackLabel => loc('Back: ' ) . loc( 'Customize Database Details') &>
+<& /Elements/Submit, Label => loc('Next: ') . loc('Customize Email Configuration'),Back => 1, BackLabel => loc('Back: ' ) . loc( 'Customize Database Details') &>
 </form>
 </&>
 
@@ -62,7 +62,7 @@
 <%init>
 my @results;
 
-my @Types = qw/rtname WebDomain WebPort Timezone Password/;
+my @Types = qw/rtname WebDomain WebPort Password/;
 
 if ( $Run ) {
 
@@ -87,7 +87,7 @@
 
     unless ( @results ) {
         RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
-'Install/Emails.html');
+'Install/Sendmail.html');
     }
 }
 

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	Mon Jun 23 11:23:49 2008
@@ -145,7 +145,7 @@
                     }
                     else {
                         $RT::Installer->{DatabaseAction} = 'acl,coredata,insert';
-                        push @results, "Database $RT::DatabaseName already exists and has RT's tables in place, but does not contain RT's metadata. The 'Initialize Database' step later on can insert metadata into this existing database. If this is acceptable, click 'Customize Basic' below to continue customizing RT.";
+                        push @results, "Database $RT::DatabaseName already exists and has RT's tables in place, but does not contain RT's metadata. The 'Initialize Database' step later on can insert metadata into this existing database. If this is acceptable, click 'Customize Basics' below to continue customizing RT.";
                     }
                 }
                 else {

Copied: rt/3.8/trunk/share/html/Install/Global.html (from r13535, /rt/3.8/trunk/share/html/Install/Emails.html)
==============================================================================
--- /rt/3.8/trunk/share/html/Install/Emails.html	(original)
+++ rt/3.8/trunk/share/html/Install/Global.html	Mon Jun 23 11:23:49 2008
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 4, 7 ) . loc('Customize Email Addresses') &> 
+<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 5, 7 ) . loc('Customize Email Addresses') &> 
 
 <& /Elements/ListActions, actions => \@results &>
 
@@ -55,14 +55,15 @@
 &>
 
 <input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: ') . loc( 'Email Configuration'), 
-    Back => 1, BackLabel => loc('Back: ' ) . loc( 'Customize Basics') &>
+<& /Elements/Submit, Label => $RT::Installer->{DatabaseAction} eq 'none' ?
+loc('Next: ') . loc('Finish') : loc('Next: ') . loc( 'Initialize Database'),
+    Back => 1, BackLabel => loc('Back: ' ) . loc('Customize Email Configuration') &>
 </form>
 </&>
 <%init>
 my @results;
 
-my @Types = qw/CommentAddress CorrespondAddress/;
+my @Types = qw/CommentAddress CorrespondAddress Timezone/;
 
 if ( $Run ) {
 
@@ -72,12 +73,28 @@
 
     if ( $Back ) {
         RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
-'Install/Basics.html');
+'Install/Sendmail.html');
     }
 
     unless ( @results ) {
-        RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
-'Install/Sendmail.html');
+        my ( $status, $msg ) = RT::Installer->SaveConfig;
+
+        if ( $status ) {
+            delete $INC{'RT_SiteConfig.pm'};
+            RT->LoadConfig;
+
+            if ( $RT::Installer->{DatabaseAction} ne 'none' ) {
+                RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
+'Install/Initialize.html');
+            }
+            else {
+                RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
+'Install/Finish.html');
+            }
+        }
+        else {
+            push @results, $msg;
+        }
     }
 }
 

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	Mon Jun 23 11:23:49 2008
@@ -58,7 +58,7 @@
 <form method="post">
 <input type="hidden" name="Run" value="1">
 <& /Elements/Submit, Label => loc('Initialize Database'), Back => 1,
-    BackLabel => loc('Back: ') . loc('Customize Sendmail') &>
+    BackLabel => loc('Back: ') . loc('Customize Global') &>
 </form>
 </&>
 <%init>
@@ -66,7 +66,7 @@
 if ( $Run ) {
     if ( $Back ) {
         RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
-'Install/Sendmail.html');
+'Install/Global.html');
     }
 
     my @actions = split /,/, $RT::Installer->{DatabaseAction};

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	Mon Jun 23 11:23:49 2008
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<&|Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 5, 7 ) . loc('Email Configuration') &> 
+<&|Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 4, 7 ) . loc('Email Configuration') &> 
 
 <& /Elements/ListActions, actions => \@results &>
 
@@ -55,9 +55,8 @@
 &>
 
 <input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => $RT::Installer->{DatabaseAction} eq 'none' ?
-loc('Next: ') . loc('Finish') : loc('Next: ') . loc( 'Initialize Database'),
-    Back => 1, BackLabel => loc('Back: ' ) . loc('Customize Email Addresses') &>
+<& /Elements/Submit, Label => loc('Next: ') . loc( 'Customize Global'),
+    Back => 1, BackLabel => loc('Back: ' ) . loc('Customize Basics') &>
 </form>
 </&>
 <%init>
@@ -73,7 +72,7 @@
 
     if ( $Back ) {
         RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
-'Install/Emails.html');
+'Install/Basics.html');
     }
 
 
@@ -87,25 +86,8 @@
 
 
     unless ( @results ) {
-
-        my ( $status, $msg ) = RT::Installer->SaveConfig;
-
-        if ( $status ) {
-            delete $INC{'RT_SiteConfig.pm'};
-            RT->LoadConfig;
-
-            if ( $RT::Installer->{DatabaseAction} ne 'none' ) {
-                RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
-'Install/Initialize.html');
-            }
-            else {
-                RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
-'Install/Finish.html');
-            }
-        }
-        else {
-            push @results, $msg;
-        }
+        RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
+'Install/Global.html');
     }
 }
 

Modified: rt/3.8/trunk/share/html/NoAuth/css/web2/nav.css
==============================================================================
--- rt/3.8/trunk/share/html/NoAuth/css/web2/nav.css	(original)
+++ rt/3.8/trunk/share/html/NoAuth/css/web2/nav.css	Mon Jun 23 11:23:49 2008
@@ -49,7 +49,7 @@
  position: absolute;
  left: 0;
  font-size: 0.9em;
- top: 3.2em;
+ top: 5.2em;
  width: 10.5em;
  background: #fff;
  -moz-border-radius-bottomright: 0.5em;


More information about the Rt-commit mailing list