X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=81117c91e6d45b6f53d370155b9c3d3c0d90b5da;hp=342ad2235b9890063d2b0948bc87b75404f444a8;hb=33108eafaedec785c7ebdef4eb65a8d935b3af55;hpb=16215972f3bf6c3f09e20ba8528215d33d79aac0 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 342ad22..81117c9 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 { @@ -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,31 +596,38 @@ 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 +

+ +

+

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 documentation.

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

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

+ MVC-pattern, these links might be of help to you.

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, and rest assured that any and all + feedback is welcomed.

@@ -1605,6 +1623,8 @@ Andy Grundman Andy Wardley +Andreas Marienborg + Andrew Ford Andrew Ruthven