[Jifty-commit] r775 - in jifty/trunk: . lib/Jifty t/Continuations/share t/Continuations/share/web t/Continuations/share/web/templates t/Continuations/web t/Mapper/share t/Mapper/share/web t/Mapper/share/web/templates t/Mapper/web t/TestApp/share t/TestApp/share/web t/TestApp/share/web/static t/TestApp/share/web/static/images t/TestApp/share/web/templates/dispatch t/TestApp/web

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Fri Mar 31 03:26:17 EST 2006 

Author: jesse
Date: Fri Mar 31 03:26:13 2006
New Revision: 775

Added:
   jifty/trunk/t/Continuations/share/
   jifty/trunk/t/Continuations/share/web/
   jifty/trunk/t/Continuations/share/web/templates/
   jifty/trunk/t/Continuations/share/web/templates/autohandler
   jifty/trunk/t/Continuations/share/web/templates/black-knight-color.html
   jifty/trunk/t/Continuations/share/web/templates/black-knight-name.html
   jifty/trunk/t/Continuations/share/web/templates/black-knight-quest.html
   jifty/trunk/t/Continuations/share/web/templates/black-knight.html
   jifty/trunk/t/Continuations/share/web/templates/help-help.html
   jifty/trunk/t/Continuations/share/web/templates/index-help.html
   jifty/trunk/t/Continuations/share/web/templates/index.html
   jifty/trunk/t/Mapper/share/
   jifty/trunk/t/Mapper/share/web/
   jifty/trunk/t/Mapper/share/web/templates/
   jifty/trunk/t/Mapper/share/web/templates/autohandler
   jifty/trunk/t/Mapper/share/web/templates/index.html
   jifty/trunk/t/TestApp/share/
   jifty/trunk/t/TestApp/share/web/
   jifty/trunk/t/TestApp/share/web/static/
   jifty/trunk/t/TestApp/share/web/static/images/
   jifty/trunk/t/TestApp/share/web/static/images/pony.jpg   (contents, props changed)
   jifty/trunk/t/TestApp/share/web/templates/
   jifty/trunk/t/TestApp/share/web/templates/dispatch/
   jifty/trunk/t/TestApp/share/web/templates/dispatch/basic
   jifty/trunk/t/TestApp/share/web/templates/dispatch/basic-show
   jifty/trunk/t/TestApp/share/web/templates/index.html
Removed:
   jifty/trunk/t/Continuations/web/
   jifty/trunk/t/Mapper/web/
   jifty/trunk/t/TestApp/web/
Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Config.pm

Log:
 r10647 at hualien:  jesse | 2006-03-31 13:44:49 +0900
 * Moved "web" under "share", since we have a sharedir now 


Modified: jifty/trunk/lib/Jifty/Config.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Config.pm	(original)
+++ jifty/trunk/lib/Jifty/Config.pm	Fri Mar 31 03:26:13 2006
@@ -228,13 +228,16 @@
             },
             Mailer     => 'Sendmail',
             MailerArgs => [],
+            L10N       => {
+                PoDir => 'share/po',
+            },
             Web        => {
                 Port => '8888',
                 BaseURL => 'http://localhost',
                 SessionDir  => "var/session",
                 DataDir     => "var/mason",
-                StaticRoot   => "web/static",
-                TemplateRoot => "web/templates",
+                StaticRoot   => "share/web/static",
+                TemplateRoot => "share/web/templates",
                 ServeStaticFiles => 1,
                 MasonConfig => {
                     autoflush    => 0,
@@ -262,6 +265,9 @@
     my $self = shift;
     return {
         framework => {
+            L10N => {
+                DefaultPoDir => Jifty::Util->share_root . '/po',
+            },
             Web => {
                 DefaultStaticRoot => Jifty::Util->share_root . '/web/static',
                 DefaultTemplateRoot => Jifty::Util->share_root . '/web/templates',

Added: jifty/trunk/t/Continuations/share/web/templates/autohandler
==============================================================================
--- (empty file)
+++ jifty/trunk/t/Continuations/share/web/templates/autohandler	Fri Mar 31 03:26:13 2006
@@ -0,0 +1,7 @@
+<% Jifty->web->render_messages %>
+
+<% $m->call_next %>
+
+<pre>
+<% YAML::Dump(Jifty->web->request->arguments) %>
+</pre>
\ No newline at end of file

Added: jifty/trunk/t/Continuations/share/web/templates/black-knight-color.html
==============================================================================
--- (empty file)
+++ jifty/trunk/t/Continuations/share/web/templates/black-knight-color.html	Fri Mar 31 03:26:13 2006
@@ -0,0 +1 @@
+What is your favorite color?

Added: jifty/trunk/t/Continuations/share/web/templates/black-knight-name.html
==============================================================================
--- (empty file)
+++ jifty/trunk/t/Continuations/share/web/templates/black-knight-name.html	Fri Mar 31 03:26:13 2006
@@ -0,0 +1 @@
+What is your name?

Added: jifty/trunk/t/Continuations/share/web/templates/black-knight-quest.html
==============================================================================
--- (empty file)
+++ jifty/trunk/t/Continuations/share/web/templates/black-knight-quest.html	Fri Mar 31 03:26:13 2006
@@ -0,0 +1 @@
+What is your quest?

Added: jifty/trunk/t/Continuations/share/web/templates/black-knight.html
==============================================================================
--- (empty file)
+++ jifty/trunk/t/Continuations/share/web/templates/black-knight.html	Fri Mar 31 03:26:13 2006
@@ -0,0 +1 @@
+You try to cross the bridge

Added: jifty/trunk/t/Continuations/share/web/templates/help-help.html
==============================================================================
--- (empty file)
+++ jifty/trunk/t/Continuations/share/web/templates/help-help.html	Fri Mar 31 03:26:13 2006
@@ -0,0 +1 @@
+Help about help. <% Jifty->web->return(label => "Done") %>
\ No newline at end of file

Added: jifty/trunk/t/Continuations/share/web/templates/index-help.html
==============================================================================
--- (empty file)
+++ jifty/trunk/t/Continuations/share/web/templates/index-help.html	Fri Mar 31 03:26:13 2006
@@ -0,0 +1,2 @@
+Help about the index.  <% Jifty->web->return(label => "Done") %>
+<% Jifty->web->tangent(label => "Get help", url => "/help-help.html") %>

Added: jifty/trunk/t/Continuations/share/web/templates/index.html
==============================================================================
--- (empty file)
+++ jifty/trunk/t/Continuations/share/web/templates/index.html	Fri Mar 31 03:26:13 2006
@@ -0,0 +1,10 @@
+<% Jifty->web->form->start %>
+
+% my $action = Jifty->web->form->add_action( class => 'GetGrail', moniker => 'grail');
+
+<% Jifty->web->form->submit( label => 'Get the holy grail') %>
+
+<% Jifty->web->tangent(label => "Get help", url => "/index-help.html") %>
+<% Jifty->web->tangent(label => "Help as button", url => "/index-help.html", submit => $action) %>
+
+<% Jifty->web->form->end %>

Added: jifty/trunk/t/Mapper/share/web/templates/autohandler
==============================================================================
--- (empty file)
+++ jifty/trunk/t/Mapper/share/web/templates/autohandler	Fri Mar 31 03:26:13 2006
@@ -0,0 +1,7 @@
+<% Jifty->web->render_messages %>
+
+<% $m->call_next %>
+
+<pre>
+<% YAML::Dump(Jifty->web->request->arguments) %>
+</pre>
\ No newline at end of file

Added: jifty/trunk/t/Mapper/share/web/templates/index.html
==============================================================================
--- (empty file)
+++ jifty/trunk/t/Mapper/share/web/templates/index.html	Fri Mar 31 03:26:13 2006
@@ -0,0 +1,27 @@
+<% Jifty->web->form->start %>
+
+% my $action = Jifty->web->form->add_action( class => 'GetGrail', moniker => 'grail');
+
+<% Jifty->web->form->submit( label => 'Get the holy grail') %>
+
+<% Jifty->web->form->end %>
+
+
+<% Jifty->web->form->start %>
+% my $grail_1  = Jifty->web->form->add_action( class => 'GetGrail', order => 1 );
+% my $bridge_1 = Jifty->web->new_action( class => 'CrossBridge',    order => 2 );
+<% $bridge_1->form_field( 'quest',  default_value => { result_of => $grail_1, name => 'castle' } ) %>
+<% $bridge_1->form_field( 'colour', default_value => 'Green' ) %>
+<% Jifty->web->form->submit( label => 'Do both') %>
+<% Jifty->web->form->end %>
+
+
+<% Jifty->web->form->start %>
+% my $grail_2  = Jifty->web->form->add_action( class => 'GetGrail', order => 1 );
+% my $bridge_2 = Jifty->web->new_action( class => 'CrossBridge', 
+%                                        order => 2,
+%                                        arguments => { quest => { result_of => $grail_2, name => 'castle' } } );
+<% $bridge_2->form_field( 'quest' ) %>
+<% $bridge_2->form_field( 'colour', default_value => 'Green' ) %>
+<% Jifty->web->form->submit( label => 'Do both') %>
+<% Jifty->web->form->end %>

Added: jifty/trunk/t/TestApp/share/web/static/images/pony.jpg
==============================================================================
Binary file. No diff available.

Added: jifty/trunk/t/TestApp/share/web/templates/dispatch/basic
==============================================================================
--- (empty file)
+++ jifty/trunk/t/TestApp/share/web/templates/dispatch/basic	Fri Mar 31 03:26:13 2006
@@ -0,0 +1,4 @@
+<&| /_elements/wrapper, title => "Test of dispatch" &>
+  Basic test.
+<% YAML::Dump(\%ARGS) %>
+</&>

Added: jifty/trunk/t/TestApp/share/web/templates/dispatch/basic-show
==============================================================================
--- (empty file)
+++ jifty/trunk/t/TestApp/share/web/templates/dispatch/basic-show	Fri Mar 31 03:26:13 2006
@@ -0,0 +1,4 @@
+<&| /_elements/wrapper, title => "Test of dispatch" &>
+  Basic test with forced show.
+<% YAML::Dump(\%ARGS) %>
+</&>

Added: jifty/trunk/t/TestApp/share/web/templates/index.html
==============================================================================
--- (empty file)
+++ jifty/trunk/t/TestApp/share/web/templates/index.html	Fri Mar 31 03:26:13 2006
@@ -0,0 +1,3 @@
+<&|/_elements/wrapper, title => 'Jifty Test Application' &>
+<img src="/images/pony.jpg" />
+</&>

More information about the Jifty-commit mailing list