X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=86886b0bbe75f1c8396507d9cc9eb1cd20b688f8;hp=aed8d01cbd0f67f781d4eaa66c2728b4827580bf;hb=b960cfb8d2267479c5b1ea040687ffdcb181bcea;hpb=4b8cb77860ecc4332de2155b78d47a996bb722da diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index aed8d01..86886b0 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -500,9 +500,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,7 +524,7 @@ sub stash { return $c->{stash}; } -=head1 $c->welcome_message +=item $c->welcome_message Returns the Catalyst welcome HTML page. @@ -525,6 +533,7 @@ Returns the Catalyst welcome HTML page. sub welcome_message { my $c = shift; my $name = $c->config->{name}; + my $logo = $c->uri_for('/static/images/catalyst_logo.png'); return <<"EOF"; @@ -546,25 +555,26 @@ 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: verdana, tahoma, sans-serif; } + a { + font-family: verdana, tahoma, sans-serif; + } :link, :visited { text-decoration: none; color: #b00; border-bottom: 1px dotted #bbb; } :link:hover, :visited:hover { - background-color: #fff; color: #555; } div#topbar { margin: 0px; } pre { - border: 1px dotted #555; margin: 10px; padding: 8px; } @@ -576,7 +586,8 @@ sub welcome_message { -moz-border-radius: 10px; } h1 { - font-size: 1.2em; + font-size: 0.9em; + font-weight: normal; text-align: center; } h2 { @@ -585,18 +596,25 @@ 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 wonderful world of Catalyst. This MVC framework will make web development something you had never expected it to be: @@ -606,8 +624,8 @@ sub welcome_message { 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 documentation.

- 
perldocCatalyst::Manual
-perldocCatalyst::Manual::Intro
+ 
perldoc Catalyst::Manual
+perldoc Catalyst::Manual::Intro

If you would like some background information on the MVC-pattern, these links might be of help to you.

In conclusion

-

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

-

-- #1. the first rule of the Cabal is, you do not - talk about the Cabal.
- #2. the second rule of the Cabal is, you DO NOT - talkk about the Cabal.

+

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.

@@ -1609,6 +1624,10 @@ Andy Grundman Andy Wardley +Andreas Marienborg + +Andrew Bramble + Andrew Ford Andrew Ruthven @@ -1662,7 +1681,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