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=ef134b156f0ac41939f6bc905ae5c99d385e1d06;hb=746380d1782b04934f7fafe76d96d32c97379994;hpb=23eb3f513f7f03e9f84a441e0e0c78581e4c6c90 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index ef134b1..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. @@ -524,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"; @@ -554,25 +566,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; } @@ -584,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 { @@ -593,58 +607,51 @@ 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: - Fun, rewarding and quick.

+ This MVC + framework will make web development something you had + never expected it to be: Fun, rewarding and quick.

What to do now?

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
-

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

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

What to do next?

-

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

+

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. The main places to get - in touch are these.

+

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

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.

@@ -1617,6 +1620,10 @@ Andy Grundman Andy Wardley +Andreas Marienborg + +Andrew Bramble + Andrew Ford Andrew Ruthven @@ -1670,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