[Rt-commit] rt branch, development, updated. 4d374ef17d99d0c48ff6a26450831f8f128acc65

[Thomas Sibley]

The branch, development has been updated
       via  4d374ef17d99d0c48ff6a26450831f8f128acc65 (commit)
      from  328f489080cefa18d38af8f5feabeb7a9c7b3964 (commit)

Summary of changes:
 lib/RT/View/SetupWizard.pm           |   19 +++++----------
 share/web/static/css/setupwizard.css |   41 +++++++++++++++++++++++++++++----
 2 files changed, 43 insertions(+), 17 deletions(-)

- Log -----------------------------------------------------------------
commit 4d374ef17d99d0c48ff6a26450831f8f128acc65
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Jul 20 13:46:32 2010 -0400

    Refactor our button usage and polish the flow a little

diff --git a/lib/RT/View/SetupWizard.pm b/lib/RT/View/SetupWizard.pm
index 9d6af24..18597aa 100644
--- a/lib/RT/View/SetupWizard.pm
+++ b/lib/RT/View/SetupWizard.pm
@@ -61,6 +61,10 @@ sub setup_page (&) {
             form {
                 div {{ class is 'column left widest' };
                     $code->($self);
+
+                    if ( my $current = $self->intuit_current_step ) {
+                        show 'buttons', for => $current;
+                    }
                 }
                 div {{ class is 'column right thinnest' };
                     show 'steps';
@@ -94,20 +98,16 @@ template 'start' => setup_page {
     p {
         outs_raw _("This setup wizard was activated by the presence of <tt>SetupMode: 1</tt> in one of your configuration files. If you are seeing this erroneously, you may restore normal operation by adjusting the <tt>etc/site_config.yml</tt> file to have <tt>SetupMode: 0</tt> set under <tt>framework</tt>.");
     };
-
-    show 'buttons', for => 'index.html';
 };
 
 template 'database' => setup_page {
     show title => 'database';
     
-    p {{ class is 'warning' };
-        _("RT may ask you, after saving the database settings, to login again as root with the default password.");
-    };
-
     show 'database_widget';
 
-    show 'buttons', for => 'database';
+    p {{ class is 'note' };
+        _("RT may ask you, after saving the database settings, to login again as root with the default password.");
+    };
 };
 
 template 'root' => setup_page {
@@ -126,8 +126,6 @@ template 'root' => setup_page {
         $action => 'password_confirm',
         label   => 'Confirm Password',
     );
-    
-    show 'buttons', for => 'root';
 };
 
 template 'organization' => setup_page {
@@ -136,7 +134,6 @@ template 'organization' => setup_page {
     p { _("Now tell RT just the very basics about your organization.") };
 
     show 'rt_config_fields' => qw( rtname organization time_zone );
-    show 'buttons', for => 'organization';
 };
 
 template 'email' => setup_page {
@@ -147,7 +144,6 @@ template 'email' => setup_page {
     # XXX TODO: We should do a mail_command handler like the db chooser and then
     # show smtp/sendmail/etc specific options
     show 'rt_config_fields' => qw( owner_email correspond_address comment_address );
-    show 'buttons', for => 'email';
 };
 
 template 'web' => setup_page {
@@ -158,7 +154,6 @@ template 'web' => setup_page {
     # XXX TODO: How can we set the jifty BaseUrl and Port without respawning
     # the current server
     show 'rt_config_fields' => qw( web_path logo_url );
-    show 'buttons', for => 'web';
 };
 
 template 'done' => setup_page {
diff --git a/share/web/static/css/setupwizard.css b/share/web/static/css/setupwizard.css
index 3d6d435..8ef8a4f 100644
--- a/share/web/static/css/setupwizard.css
+++ b/share/web/static/css/setupwizard.css
@@ -58,6 +58,25 @@
     font-weight: bold;
 }
 
+/* DB config */
+
+#setupwizard .test-connectivity-result {
+    margin-left: 16%;
+}
+
+#setupwizard .note, #setupwizard .test-db-connectivity-drivers {
+    background: #ff9;
+    color: black;
+    border-radius: 0.5em;
+    -moz-border-radius: 0.5em;
+    -webkit-border-radius: 0.5em;
+    padding: 0.5em 1em;
+}
+
+#setupwizard .warning {
+    color: black;
+}
+
 /* RT specific config fields with doc */
 
 #setupwizard .config-field .form_field .label {
@@ -86,7 +105,7 @@
 }
 
 #setupwizard .button-line {
-    position: relative;
+    display: block;
     width: 100%;
     height: 2.5em;
     margin-top: 2em;
@@ -94,14 +113,26 @@
     border-top: 1px solid #ccc;
 }
 
+#setupwizard .button-line input {
+    margin-left: 0;
+}
+
 #setupwizard .button-line .prev-button {
-    position: absolute;
-    left: 1em;
+    clear: none;
+    float: left;
+    margin-left: 1em;
 }
 
 #setupwizard .button-line .next-button {
-    position: absolute;
-    right: 1em;
+    clear: none;
+    float: right;
+    margin-right: 1em;
+}
+
+#setupwizard .button-line .save-button {
+    clear: none;
+    float: right;
+    margin-right: 1em;
 }
 
 #setupwizard .submit_button {

-----------------------------------------------------------------------