[Jifty-commit] r3630 - in jifty/branches/trimclient: .
lib/Jifty/View/Declare
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Mon Jul 9 11:09:52 EDT 2007
Author: clkao
Date: Mon Jul 9 11:09:52 2007
New Revision: 3630
Modified:
jifty/branches/trimclient/ (props changed)
jifty/branches/trimclient/lib/Jifty/Plugin/Authentication/Password/View.pm
jifty/branches/trimclient/lib/Jifty/View/Declare/CRUD.pm
jifty/branches/trimclient/lib/Jifty/View/Declare/Page.pm
Log:
merge down for trimclient.
Modified: jifty/branches/trimclient/lib/Jifty/Plugin/Authentication/Password/View.pm
==============================================================================
--- jifty/branches/trimclient/lib/Jifty/Plugin/Authentication/Password/View.pm (original)
+++ jifty/branches/trimclient/lib/Jifty/Plugin/Authentication/Password/View.pm Mon Jul 9 11:09:52 2007
@@ -55,14 +55,14 @@
=cut
template login => page { title => _('Login!') } content {
- show('login_widget');
+ show('/login_widget');
};
=head2 login_widget
A handy template for embedding the login form. Just include it in your templates via:
- show('login_widget');
+ show('/login_widget');
See L<Jifty::Plugin::Authentication::Password::Action::Login>.
Modified: jifty/branches/trimclient/lib/Jifty/View/Declare/CRUD.pm
==============================================================================
--- jifty/branches/trimclient/lib/Jifty/View/Declare/CRUD.pm (original)
+++ jifty/branches/trimclient/lib/Jifty/View/Declare/CRUD.pm Mon Jul 9 11:09:52 2007
@@ -302,7 +302,6 @@
my $self = shift;
my ( $page ) = get(qw(page ));
- my $fragment_for_new_item = get('fragment_for_new_item') || $self->fragment_for('new_item');
my $item_path = get('item_path') || $self->fragment_for("view");
my $collection = $self->_current_collection();
@@ -310,7 +309,7 @@
show( './paging_top', $collection, $page );
show( './list_items', $collection, $item_path );
show( './paging_bottom', $collection, $page );
- show( './new_item_region', $fragment_for_new_item );
+ show( './new_item_region');
};
@@ -373,7 +372,7 @@
private template 'new_item_region' => sub {
my $self = shift;
- my $fragment_for_new_item = shift;
+ my $fragment_for_new_item = get('fragment_for_new_item') || $self->fragment_for('new_item');
my $object_type = $self->object_type;
if ($fragment_for_new_item) {
@@ -455,7 +454,7 @@
span {
{ class is 'prev-page' };
hyperlink(
- label => "Previous Page",
+ label => _("Previous Page"),
onclick => {
args => { page => $collection->pager->previous_page }
}
@@ -466,7 +465,7 @@
span {
{ class is 'next-page' };
hyperlink(
- label => "Next Page",
+ label => _"Next Page"),
onclick =>
{ args => { page => $collection->pager->next_page } }
);
Modified: jifty/branches/trimclient/lib/Jifty/View/Declare/Page.pm
==============================================================================
--- jifty/branches/trimclient/lib/Jifty/View/Declare/Page.pm (original)
+++ jifty/branches/trimclient/lib/Jifty/View/Declare/Page.pm Mon Jul 9 11:09:52 2007
@@ -82,8 +82,8 @@
div {
div {
- show 'salutation';
- show 'menu';
+ show '/salutation';
+ show '/menu';
};
div {
attr { id is 'content' };
@@ -143,7 +143,7 @@
my $self = shift;
my $oldt = get('title');
set( title => $self->_title );
- show 'heading_in_wrapper';
+ show '/heading_in_wrapper';
set( title => $oldt );
}
@@ -187,7 +187,7 @@
sub render_jifty_page_detritus {
- show('keybindings');
+ show('/keybindings');
with( id => "jifty-wait-message", style => "display: none" ),
div { _('Loading...') };
@@ -204,7 +204,7 @@
my $title = shift || '';
$title =~ s/<.*?>//g; # remove html
HTML::Entities::decode_entities($title);
- with( title => $title ), show('header');
+ with( title => $title ), show('/header');
}
1;
More information about the Jifty-commit
mailing list