[Jifty-commit] jifty branch, setupwizard-refactor, updated. f5fa09f0a30f3b45a9bbe741cb1d7eaa9516b90d

[Jifty commits]

The branch, setupwizard-refactor has been updated
       via  f5fa09f0a30f3b45a9bbe741cb1d7eaa9516b90d (commit)
       via  55bb1810caca1d787b9c9b3307688cbb7d05d27f (commit)
      from  58fc18bb5d71604bace0002b48b72de285a5f3b6 (commit)

Summary of changes:
 lib/Jifty/Plugin/SetupWizard/View/Helpers.pm |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 55bb1810caca1d787b9c9b3307688cbb7d05d27f
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Jun 23 18:42:24 2010 -0400

    Make sure we have an absolute path

diff --git a/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm b/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm
index 922af76..31a2f8e 100644
--- a/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm
+++ b/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm
@@ -280,7 +280,12 @@ Returns an absolute version of the relative path provided for use with regions.
 
 sub fragment_for {
     my $self = shift;
-    return current_base_path() . '/' . shift;
+    my $frag = shift;
+    return $frag if $frag =~ /^\//;
+
+    my $base = current_base_path();
+    $base = "/$base" unless $base =~ /^\//;
+    return "$base/$frag";
 }
 
 1;

commit f5fa09f0a30f3b45a9bbe741cb1d7eaa9516b90d
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Jun 23 18:42:42 2010 -0400

    Set result messages for the database widget

diff --git a/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm b/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm
index 31a2f8e..0255ad4 100644
--- a/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm
+++ b/lib/Jifty/Plugin/SetupWizard/View/Helpers.pm
@@ -62,6 +62,7 @@ private template 'database_widget' => sub {
     $self->config_field(
         field      => 'Driver',
         context    => '/framework/Database',
+        message    => 'Set the database engine',
         value_args => {
             label            => _('Database Engine'),
             render_as        => 'select',
@@ -73,6 +74,7 @@ private template 'database_widget' => sub {
     $self->config_field(
         field      => 'Database',
         context    => '/framework/Database',
+        message    => 'Set the database name',
         value_args => {
             label     => _('Database Name'),
         },
@@ -107,6 +109,7 @@ private template 'database_widget/configure_connectivity' => sub {
     $self->config_field(
         field   => 'Host',
         context => '/framework/Database',
+        message => 'Set the database server',
         value_args => {
             hints => _('The host name of your database server (for example, localhost or db.example.com)'),
         },
@@ -116,6 +119,7 @@ private template 'database_widget/configure_connectivity' => sub {
     $self->config_field(
         field   => 'Port',
         context => '/framework/Database',
+        message => 'Set the database port',
         value_args => {
             hints => _('Leave blank to use the default value for your database'),
         },
@@ -131,6 +135,7 @@ private template 'database_widget/configure_connectivity' => sub {
     $self->config_field(
         field   => 'User',
         context => '/framework/Database',
+        message => 'Set the database user',
         empty_is_undef => 1,
         value_args => \%user_value_args,
     );
@@ -138,6 +143,7 @@ private template 'database_widget/configure_connectivity' => sub {
     $self->config_field(
         field   => 'Password',
         context => '/framework/Database',
+        message => 'Set the database password',
         value_args => {
             render_as => 'password',
         },
@@ -160,6 +166,7 @@ template 'database_widget/Pg' => sub {
     $self->config_field(
         field   => 'RequireSSL',
         context => '/framework/Database',
+        message => 'Set the database to require SSL',
         value_args => {
             label     => _('Require SSL?'),
             render_as => 'checkbox',
@@ -173,7 +180,7 @@ template 'database_widget/test_connectivity' => sub {
     my $action = new_action(
         class   => 'Jifty::Plugin::SetupWizard::Action::TestDatabaseConnectivity',
         moniker => 'test-db-connectivity',
-        order   => 100, # after everything else
+        order   => 60, # after everything else
     );
 
     if ( my $result = Jifty->web->response->result('test-db-connectivity') ) {

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