[Jifty-commit] r3012 - in jifty/trunk: . lib/Jifty/Plugin/Authentication/Password/Action lib/Jifty/Plugin/SkeletonApp lib/Jifty/Plugin/User/Mixin/Model lib/Jifty/View/Declare

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sat Mar 17 15:16:25 2007
New Revision: 3012

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm
   jifty/trunk/lib/Jifty/Plugin/Authentication/Password/View.pm
   jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm
   jifty/trunk/lib/Jifty/Plugin/User/Mixin/Model/User.pm
   jifty/trunk/lib/Jifty/View/Declare/Helpers.pm

Log:
 r53592 at pinglin:  jesse | 2007-03-17 15:15:48 -0400
 * minor cleanup based on attempted use of the login/signup plugin


Modified: jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm	Sat Mar 17 15:16:25 2007
@@ -52,7 +52,6 @@
         $self->result->error($msg); 
         return undef;
     }
-    else { warn $msg }
 
     # Set up our login message
     $self->result->message( _("Welcome to %1, %2. " , Jifty->config->framework('ApplicationName') , $u->name) ." "

Modified: jifty/trunk/lib/Jifty/Plugin/Authentication/Password/View.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Authentication/Password/View.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Authentication/Password/View.pm	Sat Mar 17 15:16:25 2007
@@ -32,7 +32,7 @@
     Jifty->web->form->start( call => $next );
     render_param( $action => 'name' , focus => 1);
     render_param( $action => $_ ) for ( grep {$_ ne 'name'} $action->argument_names );
-    form_submit( label => _('Signup'), submit => $action );
+    form_return( label => _('Signup'), submit => $action );
     Jifty->web->form->end();
 };
 
@@ -58,7 +58,7 @@
             Jifty->web->form->start( call => $next );
             render_param( $action, 'email', focus => 1 );
             render_param( $action, $_ ) for (qw(password remember));
-            form_submit( label => _(q{Login}), submit => $action );
+            form_return( label => _(q{Login}), submit => $action );
             hyperlink(
                 label => _("Lost your password?"),
                 url   => "/lost_password"

Modified: jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/SkeletonApp/View.pm	Sat Mar 17 15:16:25 2007
@@ -28,7 +28,7 @@
         {
             my $u      = Jifty->web->current_user->user_object;
             my $method = $u->_brief_description;
-            _( 'Hiya, %1.', $u->$method() );
+            eval {_( 'Hiya, %1.', $u->$method() )};
         }
         else {
             _("You're not currently signed in.");

Modified: jifty/trunk/lib/Jifty/Plugin/User/Mixin/Model/User.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/User/Mixin/Model/User.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/User/Mixin/Model/User.pm	Sat Mar 17 15:16:25 2007
@@ -93,6 +93,5 @@
 }
 
 
-
 1;
 

Modified: jifty/trunk/lib/Jifty/View/Declare/Helpers.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/Helpers.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Declare/Helpers.pm	Sat Mar 17 15:16:25 2007
@@ -6,7 +6,7 @@
 use base qw/Exporter/;
 use Template::Declare::Tags;
 
-our @EXPORT = ( qw(form hyperlink tangent redirect new_action form_submit form_next_page page wrapper request get set render_param current_user render_action render_region), @Template::Declare::Tags::EXPORT);
+our @EXPORT = ( qw(form hyperlink tangent redirect new_action form_submit form_return  form_next_page page wrapper request get set render_param current_user render_action render_region), @Template::Declare::Tags::EXPORT);
 
 
 =head1 NAME
@@ -143,6 +143,17 @@
     }
 }
 
+=head2 form_return
+
+Shortcut for L<Jifty::Web/return>.
+
+=cut
+
+sub form_return(@) {
+    outs_raw( Jifty->web->return(@_) );
+    '';
+}
+
 =head2 form_submit
 
 Shortcut for L<Jifty::Web::Form/submit>.
@@ -267,7 +278,7 @@
     my $done_header;
     my $render_header = sub {
         no warnings qw( uninitialized redefine once );
-        $title ||= Jifty->config('framework')->{'ApplicationName'};
+        $title ||= Jifty->config->framework('ApplicationName');
 
         #   defined $title or return;
         return if $done_header++;