[Jifty-commit] r2324 - in jifty/branches/template-declare: . lib/Jifty/Web/Form share/web/templates/__jifty/error

[jifty-commit at lists.jifty.org]

Author: audreyt
Date: Tue Dec  5 01:33:20 2006
New Revision: 2324

Modified:
   jifty/branches/template-declare/   (props changed)
   jifty/branches/template-declare/META.yml
   jifty/branches/template-declare/Makefile.PL
   jifty/branches/template-declare/lib/Jifty/Manual/RequestHandling.pod
   jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm
   jifty/branches/template-declare/share/web/templates/__jifty/error/mason_internal_error

Log:
* Merge down to template-declare branch.

Modified: jifty/branches/template-declare/META.yml
==============================================================================
--- jifty/branches/template-declare/META.yml	(original)
+++ jifty/branches/template-declare/META.yml	Tue Dec  5 01:33:20 2006
@@ -25,6 +25,8 @@
   Test::Base: 0.44
   Test::HTML::Lint: 0
   Test::HTTP::Server::Simple: 0.02
+  Test::MockModule: 0.05
+  Test::MockObject: 1.07
   Test::More: 0.62
   Test::Pod::Coverage: 0
   Test::WWW::Mechanize: 1.04

Modified: jifty/branches/template-declare/Makefile.PL
==============================================================================
--- jifty/branches/template-declare/Makefile.PL	(original)
+++ jifty/branches/template-declare/Makefile.PL	Tue Dec  5 01:33:20 2006
@@ -86,7 +86,7 @@
         recommends('DBD::SQLite' => 1.11 ),
         recommends('Test::Base' => 0.44 ),            # Test::Base::Filter
         recommends('Module::Install::Admin' => '0.50'),
-        recommends('Test::HTTP::Server::Simple' => '0.02' ),
+        ($^O ne 'MSWin32' ? recommends('Test::HTTP::Server::Simple' => '0.02' ) : ()),
         recommends('Test::HTML::Lint'),
         recommends('Test::More' => 0.62 ),
         recommends('Test::MockModule' => '0.05'),

Modified: jifty/branches/template-declare/lib/Jifty/Manual/RequestHandling.pod
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Manual/RequestHandling.pod	(original)
+++ jifty/branches/template-declare/lib/Jifty/Manual/RequestHandling.pod	Tue Dec  5 01:33:20 2006
@@ -1,15 +1,15 @@
 =head1 NAME
 
-Jifty::Manual::RequestHandling
+Jifty::Manual::RequestHandling - Jifty's request handling process
 
 =head1 DESCRIPTION
 
-This document outlines some of Jifty's inside in order to understand
+This document outlines some of Jifty's inside in order to help you to understand
 what happens during the request processing phase.
 
 =head1 THE HANDLER
 
-As soon as a http request (whatever the method might be like GET,
+As soon as a http request (whatever the method might be, like GET,
 POST, PUT, ...) arrives at Jifty's border, the request is forwarded to
 a handler. By default, C<< Jifty->handler >> points to a L<Jifty::Handler>
 object that is responsible for handling an incoming request. The
@@ -61,7 +61,7 @@
 
 Based on a cookie that is sent with every http response, the current
 user is assigned a unique session. The session is stored in a
-L<Jifty::Web::Session> object and can be accessed using with the
+L<Jifty::Web::Session> object and can be accessed using the
 C<< Jifty->web->session >> method.
 
 =item return from a continuation if requested
@@ -95,7 +95,7 @@
 This stage is responsible for working through all rules marked by
 words like C<under>, C<on>, C<when> and so on. This is a point where
 based on the URI or parameters the template to get displayed may still
-be modified, data retrieved, additional actions run or the template's
+be modified, data get retrieved, additional actions run or the template's
 parameters get adjusted.
 
 =item show the page
@@ -112,7 +112,7 @@
 =item cleanup several things
 
 Finally, the eventually modified session-record is flushed and some
-internally allocated structures deallocated.
+internally allocated structures get deallocated.
 
 =back
 

Modified: jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm	Tue Dec  5 01:33:20 2006
@@ -462,7 +462,7 @@
     $field .= qq! id="@{[ $self->element_id ]}"!;
     $field .= qq! value="@{[HTML::Entities::encode_entities($self->current_value)]}"! if defined $self->current_value;
     $field .= $self->_widget_class; 
-    $field .= qq! size="@{[ $self->length() ]}" maxlength=@{[ $self->length() ]}"! if ($self->length());
+    $field .= qq! size="@{[ $self->length() ]}" maxlength="@{[ $self->length() ]}"! if ($self->length());
     $field .= " " .$self->other_widget_properties;
     $field .= qq!  />\n!;
     Jifty->web->out($field);

Modified: jifty/branches/template-declare/share/web/templates/__jifty/error/mason_internal_error
==============================================================================
--- jifty/branches/template-declare/share/web/templates/__jifty/error/mason_internal_error	(original)
+++ jifty/branches/template-declare/share/web/templates/__jifty/error/mason_internal_error	Tue Dec  5 01:33:20 2006
@@ -25,17 +25,17 @@
 %     for (map {$_->[1]} @{Jifty->handler->mason->interp->comp_root}) {
 %       last if $path =~ s/^\Q$_\E//;
 %     }
-%     if ($path ne $file) {
+%    if ($path ne $file) {
 template <% Jifty->web->tangent( url =>"/__jifty/edit/mason_component$path",
                                  label => _("%1 line %2", $path, $line),
                                  parameters => { line => $line } ) %>
-%     } else {
+%    } else {
 <% Jifty->web->tangent( url =>"/__jifty/edit/library$path",
                         label => _("%1 line %2", $path, $line),
                         parameters => { line => $line } ) %>
-%   } else {
-<%_("%1 line %2", $path, $line)%>
 %   }
+%  } else {
+<% _("%1 line %2", $file, $line) %>
 % }
 </%def>