X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=89b7f9f20df59fe18231e07a30c2518c98642b57;hp=8cba4f41d68eef5fe1cb181c23f71a8d35201d77;hb=746380d1782b04934f7fafe76d96d32c97379994;hpb=d114e0339f19bd090b0ac9a9bc0eab0b0419aba5 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 8cba4f4..89b7f9f 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -17,7 +17,9 @@ use Time::HiRes qw/gettimeofday tv_interval/; use URI; use Scalar::Util qw/weaken/; -__PACKAGE__->mk_accessors(qw/counter depth request response state/); +__PACKAGE__->mk_accessors( + qw/counter depth request response state action namespace/ +); # Laziness++ *comp = \&component; @@ -167,6 +169,10 @@ Specify log level. =over 4 +=item $c->action + +Accessor for the current action + =item $c->comp($name) =item $c->component($name) @@ -251,6 +257,10 @@ from the function. sub forward { my $c = shift; $c->dispatcher->forward( $c, @_ ) } +=item $c->namespace + +Accessor to the namespace of the current action + =item $c->setup Setup. @@ -500,9 +510,17 @@ Contains the return value of the last executed action. Returns a hashref containing all your data. - $c->stash->{foo} ||= 'yada'; print $c->stash->{foo}; +Keys may be set in the stash by assigning to the hash reference, or by passing +either a single hash reference or a list of key/value pairs as arguments. + +For example: + + $c->stash->{foo} ||= 'yada'; + $c->stash( { moose => 'majestic', qux => 0 } ); + $c->stash( bar => 1, gorch => 2 ); + =cut sub stash { @@ -516,15 +534,17 @@ sub stash { return $c->{stash}; } -=head1 $c->welcome_message +=item $c->welcome_message Returns the Catalyst welcome HTML page. =cut sub welcome_message { - my $c = shift; - my $name = $c->config->{name}; + my $c = shift; + my $name = $c->config->{name}; + my $logo = $c->uri_for('/static/images/catalyst_logo.png'); + my $prefix = Catalyst::Utils::appprefix( ref $c ); return <<"EOF"; @@ -546,10 +566,13 @@ sub welcome_message { border: 1px solid #aaa; -moz-border-radius: 10px; } - p, h1, h2, a { + p, h1, h2 { margin-left: 20px; margin-right: 20px; - font-family: garamond, verdana, tahoma, sans-serif; + font-family: verdana, tahoma, sans-serif; + } + a { + font-family: verdana, tahoma, sans-serif; } :link, :visited { text-decoration: none; @@ -557,12 +580,15 @@ sub welcome_message { border-bottom: 1px dotted #bbb; } :link:hover, :visited:hover { - background-color: #fff; color: #555; } div#topbar { margin: 0px; } + pre { + margin: 10px; + padding: 8px; + } div#answers { padding: 8px; margin: 10px; @@ -571,7 +597,8 @@ sub welcome_message { -moz-border-radius: 10px; } h1 { - font-size: 1.2em; + font-size: 0.9em; + font-weight: normal; text-align: center; } h2 { @@ -580,64 +607,66 @@ sub welcome_message { p { font-size: 0.9em; } - p.signature { - text-align: right; - font-style: italic; + p img { + float: right; + margin-left: 10px; + } + b#appname { + font-size: 1.6em; }
-

$name on Catalyst $VERSION

+

$name on Catalyst + $VERSION

-

Welcome to the wonderfull world of Catalyst. - This MVC framework will make webdevelopment - something you had never expected it to be: - Fun, rewarding and quick.

+

+ +

+

Welcome to the wonderful world of Catalyst. + This MVC + framework will make web development something you had + never expected it to be: Fun, rewarding and quick.

What to do now?

-

That all depends really, on what you want to do. +

That really depends on what you want to do. We do, however, provide you with a few starting points.

If you want to jump right into web development with Catalyst - you might want to check out the following links.

- -

If you would like some background information on the - MVC-pattern, theese links might be able to help you out.

+ you might want to check out the documentation.

+ 
perldoc Catalyst::Manual::Intro
+perldoc Catalyst::Manual
+

What to do next?

+

Next it's time to write an actual application. Use the + helper scripts to generate controllers, + models and + views, + they can save you a lot of work.

+ 
script/${prefix}_create.pl -help
+

Also, be sure to check out the vast and growing + collection of plugins for Catalyst on CPAN, + you are likely to find what you need there. +

+ +

Need help?

+

Catalyst has a very active community. Here are the main places to + get in touch with us.

-

What to do next?

-

Next you need to create an actuall application. Use the - helper scripts for what they are worth, they can save you - alot of work getting everything set up. Also, be sure to - check out the vast array of plugins for Catalyst. - They can handle everything from Authentication to Static - files, and a whole lot in between.

In conclusion

-

The Catalyst team hope you will enjoy Catalyst as much as we enjoyed making it, and that rest asure that any and all - feedback is welcomed

-

-- there is no cabal, 2005

+

The Catalyst team hope you will enjoy using Catalyst as much + as we enjoyed making it. Please contact us if you have ideas + for improvement or other feedback.

@@ -1591,6 +1620,10 @@ Andy Grundman Andy Wardley +Andreas Marienborg + +Andrew Bramble + Andrew Ford Andrew Ruthven @@ -1644,7 +1677,7 @@ Sebastian Riedel, C =head1 LICENSE This library is free software . You can redistribute it and/or modify it under -the same terms as perl itself. +the same terms as Perl itself. =cut