[Jifty-commit] r2400 - in jifty/branches/template-declare: . debian
lib/Jifty/Action lib/Jifty/Manual lib/Jifty/Plugin share/po
share/web/static/css share/web/static/css/yui/tabview
share/web/static/js/yui share/web/templates/__jifty/admin
share/web/templates/__jifty/admin/fragments/list
share/web/templates/__jifty/admin/model
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Mon Dec 18 05:32:54 EST 2006
Author: clkao
Date: Mon Dec 18 05:32:52 2006
New Revision: 2400
Added:
jifty/branches/template-declare/share/web/static/css/yui/tabview/
jifty/branches/template-declare/share/web/static/css/yui/tabview/border_tabs.css
jifty/branches/template-declare/share/web/static/css/yui/tabview/tabs.css
jifty/branches/template-declare/share/web/static/js/yui/tabview.js
Modified:
jifty/branches/template-declare/ (props changed)
jifty/branches/template-declare/MANIFEST
jifty/branches/template-declare/debian/README
jifty/branches/template-declare/lib/Jifty/Action.pm
jifty/branches/template-declare/lib/Jifty/Action/Record.pm
jifty/branches/template-declare/lib/Jifty/ClassLoader.pm
jifty/branches/template-declare/lib/Jifty/Logger.pm
jifty/branches/template-declare/lib/Jifty/Manual/Models.pod
jifty/branches/template-declare/lib/Jifty/Manual/Tutorial_de.pod
jifty/branches/template-declare/lib/Jifty/Plugin/ClassLoader.pm
jifty/branches/template-declare/lib/Jifty/Web.pm
jifty/branches/template-declare/share/po/en.po
jifty/branches/template-declare/share/po/fr.po
jifty/branches/template-declare/share/po/ja.po
jifty/branches/template-declare/share/po/zh_cn.po
jifty/branches/template-declare/share/po/zh_tw.po
jifty/branches/template-declare/share/web/static/css/base.css
jifty/branches/template-declare/share/web/templates/__jifty/admin/fragments/list/list
jifty/branches/template-declare/share/web/templates/__jifty/admin/index.html
jifty/branches/template-declare/share/web/templates/__jifty/admin/model/dhandler
Log:
Merge down from trunk.
Modified: jifty/branches/template-declare/MANIFEST
==============================================================================
--- jifty/branches/template-declare/MANIFEST (original)
+++ jifty/branches/template-declare/MANIFEST Mon Dec 18 05:32:52 2006
@@ -450,6 +450,7 @@
t/09-url.t
t/10-i18n.t
t/11-config-files.t
+t/12-param-schema.t
t/99-pod-coverage.t
t/99-pod.t
t/Continuations/bin/jifty
Modified: jifty/branches/template-declare/debian/README
==============================================================================
--- jifty/branches/template-declare/debian/README (original)
+++ jifty/branches/template-declare/debian/README Mon Dec 18 05:32:52 2006
@@ -2,25 +2,14 @@
There is a debian repository at:
-deb http://jifty.bunting.net.au/ ./
-
-Containing all my packages.
-There are still some packages required from ubuntu edgy that are perl
-only modules. Things should work with dapper with the addition of the
-perl modules from edgy.
+ deb http://ftp.univ-metz.fr/debian sarge jifty
-This is as yet hardly tested so don't be surprised if things break.
+It contains jifty packages as well as some jifty plugins, updates for
+sarge and ubuntu 6.06 LTS
-Please let me know if they do and I'll try and fix them.
+Please let us know if there are any issues by sending mail to the
+jifty mailing list and we'll try and fix them.
Bart Bunting
-
-And others packages since cpan 0.60912 here :
- deb http://ftp.univ-metz.fr/debian sarge jifty
-
-with some plugins packages, update for sarge and ubuntu 6.06 LTS
-
Yves Agostini
-We work on harmonizing and cleaning this ...
-
Modified: jifty/branches/template-declare/lib/Jifty/Action.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Action.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Action.pm Mon Dec 18 05:32:52 2006
@@ -501,7 +501,7 @@
sub register {
my $self = shift;
- Jifty->web->out( qq!<div><input type="hidden"! .
+ Jifty->web->out( qq!<div class="hidden"><input type="hidden"! .
qq! name="@{[$self->register_name]}"! .
qq! id="@{[$self->register_name]}"! .
qq! value="@{[ref($self)]}"! .
Modified: jifty/branches/template-declare/lib/Jifty/Action/Record.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Action/Record.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Action/Record.pm Mon Dec 18 05:32:52 2006
@@ -131,7 +131,6 @@
return $self->_cached_arguments if $self->_cached_arguments;
-
my $field_info = {};
my @fields = $self->possible_fields;
Modified: jifty/branches/template-declare/lib/Jifty/ClassLoader.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/ClassLoader.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/ClassLoader.pm Mon Dec 18 05:32:52 2006
@@ -160,6 +160,7 @@
. "1;" );
} elsif ( $module =~ m!^(?:$base)::Action::(Create|Update|Delete|Search)([^\.]+)$! ) {
my $modelclass = $base . "::Model::" . $2;
+
Jifty::Util->require($modelclass);
return undef unless eval { $modelclass->table };
@@ -184,6 +185,8 @@
sub return_class {
my $self = shift;
my $content = shift;
+
+
open my $fh, '<', \$content;
return $fh;
Modified: jifty/branches/template-declare/lib/Jifty/Logger.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Logger.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Logger.pm Mon Dec 18 05:32:52 2006
@@ -138,7 +138,7 @@
} elsif ( -f $log_config and -r $log_config ) {
Log::Log4perl->init($log_config);
} else {
- my $log_level = Jifty->config->framework('LogLevel');
+ my $log_level = uc Jifty->config->framework('LogLevel');
my %default = (
'log4perl.rootLogger' => "$log_level,Screen",
'#log4perl.logger.SchemaTool' => "$log_level,Screen",
Modified: jifty/branches/template-declare/lib/Jifty/Manual/Models.pod
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Manual/Models.pod (original)
+++ jifty/branches/template-declare/lib/Jifty/Manual/Models.pod Mon Dec 18 05:32:52 2006
@@ -38,7 +38,7 @@
To create the database schema for a model inside an application you
could simply run:
- jifty schema --name TextLine
+ jifty model --name TextLine
from inside your application's directory and Jifty will create exactly
this class structure for you (minus the I<column> line, to be
@@ -278,9 +278,11 @@
may get called more than once, specifying one single condition with
each call.
-Every use of C<limit> constructs either a I<clause> or a I<subclause>
-depending on the existence of the C<subclause> attribute when calling
-C<limit>. Every clause is built up by combining its subclauses (if
+Every use of C<limit> constructs either a I<clause> or a I<subclause>.
+A subclause is built either if the C<subclause> attribute is used or a
+column is used repeatedly.
+
+Every clause is built up by combining its subclauses (if
any) using the C<entry_aggregator> operator (whose default is I<OR>)
as a combining operator. Clauses are then I<AND>ed together to yield
the final restriction that is finally used to retrieve the records in
@@ -293,7 +295,7 @@
C<ENDSWITH>).
# combining restrictions with "AND"
- # note that "AND" is implicit here
+ # note that "AND" is implicit here unless a column name is repeated
$collection->limit(column => 'col1', value => '...');
$collection->limit(column => 'col2', value => '...');
Modified: jifty/branches/template-declare/lib/Jifty/Manual/Tutorial_de.pod
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Manual/Tutorial_de.pod (original)
+++ jifty/branches/template-declare/lib/Jifty/Manual/Tutorial_de.pod Mon Dec 18 05:32:52 2006
@@ -282,6 +282,13 @@
# ./bin/jifty server
INFO - You can connect to your server at http://localhost:8888/
+Starten Sie diese Kommandofolge immer im Hauptverzeichnis Ihrer Jifty
+Applikation, andernfalls werden etliche Fehlermeldungen die Folge
+sein.
+
+Auf den meisten Plattformen wird ein einfaches "jifty server" Kommando
+ebenfalls funktionieren. :)
+
=head2 Erstellung der Benutzeroberfläche
Die Administrations-Umgebung gibt Ihnen zwar alles, was Sie brauchen,
@@ -298,10 +305,10 @@
Sie sicher, daß diese so aussieht:
<%init>
- my $action = Jifty->web->new_action(class =>'CreatePost');
+ my $action = Jifty->web->new_action(class => 'CreatePost');
</%init>
- <&|/_elements/wrapper, title => "Post Eintrag Erstellen" &>
+ <&| /_elements/wrapper, title => "Post Eintrag Erstellen" &>
<% Jifty->web->form->start() %>
<% Jifty->web->form->next_page( url => '/') %>
<% $action->form_field('title') %>
@@ -310,6 +317,13 @@
<% Jifty->web->form->end() %>
</&>
+Ja, dies ist eine Template Datei in L<HTML::Mason> Syntax. Wenn Sie
+noch nicht genug über Mason wissen, empfehlen wir dessen Online
+Dokumentation für mehr Details. I<Mason Templates> sollten jeweils in
+der ersten Spalte der Datei beginnen. Besonders wichtig sind die
+C<E<lt>%initE<gt>> und C<E<lt>/%initE<gt>> Blöcke, die unbedingt
+lingsbündig geschrieben werden müssen.
+
=head3 Anzeige
Es ist relativ einfach, eine I<einfache> Auflistung von Einträgen zu
@@ -333,11 +347,11 @@
$posts->unlimit();
</%init>
- <&|/_elements/wrapper, title => Jifty->config->framework('ApplicationName') &>
+ <&| /_elements/wrapper, title => Jifty->config->framework('ApplicationName') &>
<dl>
% while (my $post = $posts->next) {
- <dt><%$post->title%></dt>
- <dd><%$post->body%></dd>
+ <dt><% $post->title %></dt>
+ <dd><% $post->body %></dd>
% }
</dl>
</&>
@@ -362,7 +376,7 @@
F<share/web/templates/index.html> in Ihrem Editor. Befüllen Sie die
Datei mit:
- <&|/_elements/wrapper, title => Jifty->config->framework('ApplicationName') &>
+ <&| /_elements/wrapper, title => Jifty->config->framework('ApplicationName') &>
<% Jifty->web->region(name => "myweblog-posts",
path => "/fragments/page_of_posts") %>
@@ -390,8 +404,8 @@
% }
<dl class="list">
% while (my $post = $posts->next) {
- <dt><%$post->title%></dt>
- <dd><%$post->body%></dd>
+ <dt><% $post->title %></dt>
+ <dd><% $post->body %></dd>
% }
</dl>
@@ -528,6 +542,8 @@
=item * Continuations (Fortsetzungen) und deren Einsatz
+=item * Anpassungen der Darstellung (Benutzerdefinierte Wrapper und CSS)
+
=back
=cut
Modified: jifty/branches/template-declare/lib/Jifty/Plugin/ClassLoader.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Plugin/ClassLoader.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Plugin/ClassLoader.pm Mon Dec 18 05:32:52 2006
@@ -104,6 +104,8 @@
my $plugin = $self->{plugin};
return undef unless ( $module and $base and $plugin);
+
+
# Canonicalize $module to :: style rather than / and .pm style;
$module =~ s/.pm$//;
$module =~ s{/}{::}g;
@@ -116,7 +118,7 @@
# this is a class the plugin intends to autocreate
if ( $module =~ m{^(?:$base)::(Notification|CurrentUser)$} ) {
my $method = "${plugin}::$1";
- return $self->return_class(
+ return Jifty::ClassLoader->return_class(
"use warnings; use strict; package $module;\n"
. "use base qw/$method/;\n"
. "sub _autogenerated { 1 };\n"
@@ -127,14 +129,14 @@
my $method = $1;
# Check to see if this is an action for a model that this plugin
- # doesn't support
+ # doesn't provide
if ( $method =~ m/^(?:Create|Update|Delete)([^\.]+)$/ ) {
my $model = "${plugin}::Model::$1";
return undef unless Jifty::Util->already_required($model);
}
$method = "${plugin}::Action::$method";
- return $self->return_class(
+ return Jifty::ClassLoader->return_class(
"use warnings; use strict; package $module;\n"
. "use base qw/$method/;\n"
. "sub autogenerated { 1 };\n"
@@ -145,21 +147,6 @@
return undef;
}
-=head2 return_class CODE
-
-A helper method; takes CODE as a string and returns an open filehandle
-containing that CODE.
-
-=cut
-
-sub return_class {
- my $self = shift;
- my $content = shift;
- open my $fh, '<', \$content;
- return $fh;
-
-}
-
=head2 require
Loads all of the application's Actions and Models. It additionally
@@ -174,6 +161,7 @@
my $base = $self->{plugin};
+
# if we don't even have an application class, this trick will not work
return unless ($base);
Jifty::Util->require($base);
Modified: jifty/branches/template-declare/lib/Jifty/Web.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Web.pm Mon Dec 18 05:32:52 2006
@@ -62,6 +62,7 @@
yui/dom.js
yui/event.js
yui/calendar.js
+ yui/tabview.js
app.js
app_behaviour.js
css_browser_selector.js
Modified: jifty/branches/template-declare/share/po/en.po
==============================================================================
--- jifty/branches/template-declare/share/po/en.po (original)
+++ jifty/branches/template-declare/share/po/en.po Mon Dec 18 05:32:52 2006
@@ -19,12 +19,12 @@
msgid "!=>< allowed"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:115 lib/Jifty/z:26
+#: lib/Jifty/Action/Record/Search.pm:115
#. ($label)
msgid "%1 after"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:116 lib/Jifty/z:27
+#: lib/Jifty/Action/Record/Search.pm:116
#. ($label)
msgid "%1 before"
msgstr ""
@@ -34,12 +34,17 @@
msgid "%1 contains"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:123 lib/Jifty/z:35
+#: share/web/templates/__jifty/admin/fragments/list/list:87
+#. ($collection-> count)
+msgid "%1 entries"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:123
#. ($label)
msgid "%1 greater or equal to"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:121 lib/Jifty/z:32
+#: lib/Jifty/Action/Record/Search.pm:121
#. ($label)
msgid "%1 greater than"
msgstr ""
@@ -54,18 +59,19 @@
msgid "%1 lacks"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:124 lib/Jifty/z:36
+#: lib/Jifty/Action/Record/Search.pm:124
#. ($label)
msgid "%1 less or equal to"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:122 lib/Jifty/z:33
+#: lib/Jifty/Action/Record/Search.pm:122
#. ($label)
msgid "%1 less than"
msgstr ""
-#: share/web/templates/__jifty/error/mason_internal_error:30 share/web/templates/__jifty/error/mason_internal_error:34 share/web/templates/__jifty/error/mason_internal_error:38
+#: share/web/templates/__jifty/error/mason_internal_error:31 share/web/templates/__jifty/error/mason_internal_error:35 share/web/templates/__jifty/error/mason_internal_error:39
#. ($path, $line)
+#. ($file, $line)
msgid "%1 line %2"
msgstr ""
@@ -74,12 +80,12 @@
msgid "%1 seconds"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:117 lib/Jifty/z:28
+#: lib/Jifty/Action/Record/Search.pm:117
#. ($label)
msgid "%1 since"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:118 lib/Jifty/z:29
+#: lib/Jifty/Action/Record/Search.pm:118
#. ($label)
msgid "%1 until"
msgstr ""
@@ -125,7 +131,7 @@
msgid "Calendar"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/update:28
+#: share/web/templates/__jifty/admin/fragments/list/update:31
msgid "Cancel"
msgstr ""
@@ -133,11 +139,11 @@
msgid "Close window"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/view:29
+#: share/web/templates/__jifty/admin/fragments/list/view:31
msgid "Confirm delete?"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/new_item:17
+#: share/web/templates/__jifty/admin/fragments/list/new_item:25
msgid "Create"
msgstr ""
@@ -154,7 +160,7 @@
msgid "Database Administration"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/view:26
+#: share/web/templates/__jifty/admin/fragments/list/view:29
msgid "Delete"
msgstr ""
@@ -162,7 +168,7 @@
msgid "Deleted"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/view:37
+#: share/web/templates/__jifty/admin/fragments/list/view:40
msgid "Edit"
msgstr ""
@@ -200,7 +206,7 @@
msgid "Models"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/list:73
+#: share/web/templates/__jifty/admin/fragments/list/list:113
msgid "Next Page"
msgstr ""
@@ -208,6 +214,10 @@
msgid "No field contains"
msgstr ""
+#: share/web/templates/__jifty/admin/fragments/list/list:85
+msgid "No items found"
+msgstr ""
+
#: lib/Jifty/Web.pm:297
msgid "No request to handle"
msgstr ""
@@ -216,7 +226,7 @@
msgid "Online Documentation"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/list:45
+#: share/web/templates/__jifty/admin/fragments/list/list:80
#. ($page, $collection->pager->last_page)
msgid "Page %1 of %2"
msgstr ""
@@ -225,7 +235,7 @@
msgid "Permission denied"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/list:68
+#: share/web/templates/__jifty/admin/fragments/list/list:108
msgid "Previous Page"
msgstr ""
@@ -237,7 +247,7 @@
msgid "SQL Statements"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/update:18
+#: share/web/templates/__jifty/admin/fragments/list/update:21
msgid "Save"
msgstr ""
@@ -257,7 +267,7 @@
msgid "Table of Contents"
msgstr ""
-#: lib/Jifty/Action.pm:874
+#: lib/Jifty/Action.pm:873
msgid "That doesn't look like a correct value"
msgstr ""
@@ -281,7 +291,7 @@
msgid "To disable this administrative console, add \"AdminMode: 0\" under the \"framework:\" settings in the config file (etc/config.yml)."
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/list:38
+#: share/web/templates/__jifty/admin/fragments/list/list:72
msgid "Toggle search"
msgstr ""
@@ -301,7 +311,7 @@
msgid "You got to a page that we don't think exists. Anyway, the software has logged this error. Sorry about this."
msgstr ""
-#: lib/Jifty/Action.pm:861
+#: lib/Jifty/Action.pm:860
msgid "You need to fill in this field"
msgstr ""
@@ -313,3 +323,11 @@
#: share/web/templates/_elements/sidebar:7
msgid "You're not currently signed in."
msgstr ""
+
+#: share/web/templates/__jifty/admin/fragments/list/header:22
+msgid "asc"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/fragments/list/header:41
+msgid "desc"
+msgstr ""
Modified: jifty/branches/template-declare/share/po/fr.po
==============================================================================
--- jifty/branches/template-declare/share/po/fr.po (original)
+++ jifty/branches/template-declare/share/po/fr.po Mon Dec 18 05:32:52 2006
@@ -19,12 +19,12 @@
msgid "!=>< allowed"
msgstr "!=>< autorisés"
-#: lib/Jifty/Action/Record/Search.pm:115 lib/Jifty/z:26
+#: lib/Jifty/Action/Record/Search.pm:115
#. ($label)
msgid "%1 after"
msgstr "%1 aprés"
-#: lib/Jifty/Action/Record/Search.pm:116 lib/Jifty/z:27
+#: lib/Jifty/Action/Record/Search.pm:116
#. ($label)
msgid "%1 before"
msgstr "%1 avant"
@@ -34,12 +34,17 @@
msgid "%1 contains"
msgstr "%1 contient"
-#: lib/Jifty/Action/Record/Search.pm:123 lib/Jifty/z:35
+#: share/web/templates/__jifty/admin/fragments/list/list:87
+#. ($collection-> count)
+msgid "%1 entries"
+msgstr "%1 enregistements"
+
+#: lib/Jifty/Action/Record/Search.pm:123
#. ($label)
msgid "%1 greater or equal to"
msgstr "%1 supérieur ou égal à"
-#: lib/Jifty/Action/Record/Search.pm:121 lib/Jifty/z:32
+#: lib/Jifty/Action/Record/Search.pm:121
#. ($label)
msgid "%1 greater than"
msgstr "%1 supérieur à"
@@ -54,18 +59,19 @@
msgid "%1 lacks"
msgstr "%1 ne contient pas"
-#: lib/Jifty/Action/Record/Search.pm:124 lib/Jifty/z:36
+#: lib/Jifty/Action/Record/Search.pm:124
#. ($label)
msgid "%1 less or equal to"
msgstr "%1 inférieur ou égal"
-#: lib/Jifty/Action/Record/Search.pm:122 lib/Jifty/z:33
+#: lib/Jifty/Action/Record/Search.pm:122
#. ($label)
msgid "%1 less than"
msgstr "%1 inférieur à"
-#: share/web/templates/__jifty/error/mason_internal_error:30 share/web/templates/__jifty/error/mason_internal_error:34 share/web/templates/__jifty/error/mason_internal_error:38
+#: share/web/templates/__jifty/error/mason_internal_error:31 share/web/templates/__jifty/error/mason_internal_error:35 share/web/templates/__jifty/error/mason_internal_error:39
#. ($path, $line)
+#. ($file, $line)
msgid "%1 line %2"
msgstr "%1 ligne %2"
@@ -74,12 +80,12 @@
msgid "%1 seconds"
msgstr "%1 secondes"
-#: lib/Jifty/Action/Record/Search.pm:117 lib/Jifty/z:28
+#: lib/Jifty/Action/Record/Search.pm:117
#. ($label)
msgid "%1 since"
msgstr "%1 depuis le"
-#: lib/Jifty/Action/Record/Search.pm:118 lib/Jifty/z:29
+#: lib/Jifty/Action/Record/Search.pm:118
#. ($label)
msgid "%1 until"
msgstr "%1 depuis"
@@ -125,7 +131,7 @@
msgid "Calendar"
msgstr "Calendrier"
-#: share/web/templates/__jifty/admin/fragments/list/update:28
+#: share/web/templates/__jifty/admin/fragments/list/update:31
msgid "Cancel"
msgstr "Annuler"
@@ -133,11 +139,11 @@
msgid "Close window"
msgstr "Fermer la fenêtre"
-#: share/web/templates/__jifty/admin/fragments/list/view:29
+#: share/web/templates/__jifty/admin/fragments/list/view:31
msgid "Confirm delete?"
msgstr "Confirmer l'effacement ?"
-#: share/web/templates/__jifty/admin/fragments/list/new_item:17
+#: share/web/templates/__jifty/admin/fragments/list/new_item:25
msgid "Create"
msgstr "Enregistrer"
@@ -154,7 +160,7 @@
msgid "Database Administration"
msgstr "Administration de la Base de Données"
-#: share/web/templates/__jifty/admin/fragments/list/view:26
+#: share/web/templates/__jifty/admin/fragments/list/view:29
msgid "Delete"
msgstr "Effacer"
@@ -162,7 +168,7 @@
msgid "Deleted"
msgstr "Effacé"
-#: share/web/templates/__jifty/admin/fragments/list/view:37
+#: share/web/templates/__jifty/admin/fragments/list/view:40
msgid "Edit"
msgstr "Editer"
@@ -200,7 +206,7 @@
msgid "Models"
msgstr "Modèles"
-#: share/web/templates/__jifty/admin/fragments/list/list:73
+#: share/web/templates/__jifty/admin/fragments/list/list:113
msgid "Next Page"
msgstr "Page Suivante"
@@ -208,6 +214,10 @@
msgid "No field contains"
msgstr "Aucun champs contient"
+#: share/web/templates/__jifty/admin/fragments/list/list:85
+msgid "No items found"
+msgstr "Aucun enregistrement"
+
#: lib/Jifty/Web.pm:297
msgid "No request to handle"
msgstr "Aucune requête à traiter"
@@ -216,7 +226,7 @@
msgid "Online Documentation"
msgstr "Documentation en ligne"
-#: share/web/templates/__jifty/admin/fragments/list/list:45
+#: share/web/templates/__jifty/admin/fragments/list/list:80
#. ($page, $collection->pager->last_page)
msgid "Page %1 of %2"
msgstr "Page %1 / %2"
@@ -225,7 +235,7 @@
msgid "Permission denied"
msgstr "Autorisation refusée"
-#: share/web/templates/__jifty/admin/fragments/list/list:68
+#: share/web/templates/__jifty/admin/fragments/list/list:108
msgid "Previous Page"
msgstr "Page précédente"
@@ -241,7 +251,7 @@
msgid "SQL Statements"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/update:18
+#: share/web/templates/__jifty/admin/fragments/list/update:21
msgid "Save"
msgstr "Enregistrer"
@@ -261,7 +271,7 @@
msgid "Table of Contents"
msgstr "Table des matières"
-#: lib/Jifty/Action.pm:874
+#: lib/Jifty/Action.pm:873
msgid "That doesn't look like a correct value"
msgstr "Valeur incorecte"
@@ -285,7 +295,7 @@
msgid "To disable this administrative console, add \"AdminMode: 0\" under the \"framework:\" settings in the config file (etc/config.yml)."
msgstr "Pour désactiver cette console d'administration, ajoutez \"AdminMode: 0\" dans la rubrique \"framework:\" du fichier de configuration (etc/config.yml)."
-#: share/web/templates/__jifty/admin/fragments/list/list:38
+#: share/web/templates/__jifty/admin/fragments/list/list:72
msgid "Toggle search"
msgstr "Rechercher"
@@ -305,7 +315,7 @@
msgid "You got to a page that we don't think exists. Anyway, the software has logged this error. Sorry about this."
msgstr "Cette page n'existe pas."
-#: lib/Jifty/Action.pm:861
+#: lib/Jifty/Action.pm:860
msgid "You need to fill in this field"
msgstr "Information obligatoire"
@@ -317,3 +327,11 @@
#: share/web/templates/_elements/sidebar:7
msgid "You're not currently signed in."
msgstr "Vous n'êtes pas encore connecté."
+
+#: share/web/templates/__jifty/admin/fragments/list/header:22
+msgid "asc"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/fragments/list/header:41
+msgid "desc"
+msgstr ""
Modified: jifty/branches/template-declare/share/po/ja.po
==============================================================================
--- jifty/branches/template-declare/share/po/ja.po (original)
+++ jifty/branches/template-declare/share/po/ja.po Mon Dec 18 05:32:52 2006
@@ -19,12 +19,12 @@
msgid "!=>< allowed"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:115 lib/Jifty/z:26
+#: lib/Jifty/Action/Record/Search.pm:115
#. ($label)
msgid "%1 after"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:116 lib/Jifty/z:27
+#: lib/Jifty/Action/Record/Search.pm:116
#. ($label)
msgid "%1 before"
msgstr ""
@@ -34,12 +34,17 @@
msgid "%1 contains"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:123 lib/Jifty/z:35
+#: share/web/templates/__jifty/admin/fragments/list/list:87
+#. ($collection-> count)
+msgid "%1 entries"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:123
#. ($label)
msgid "%1 greater or equal to"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:121 lib/Jifty/z:32
+#: lib/Jifty/Action/Record/Search.pm:121
#. ($label)
msgid "%1 greater than"
msgstr ""
@@ -54,18 +59,19 @@
msgid "%1 lacks"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:124 lib/Jifty/z:36
+#: lib/Jifty/Action/Record/Search.pm:124
#. ($label)
msgid "%1 less or equal to"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:122 lib/Jifty/z:33
+#: lib/Jifty/Action/Record/Search.pm:122
#. ($label)
msgid "%1 less than"
msgstr ""
-#: share/web/templates/__jifty/error/mason_internal_error:30 share/web/templates/__jifty/error/mason_internal_error:34 share/web/templates/__jifty/error/mason_internal_error:38
+#: share/web/templates/__jifty/error/mason_internal_error:31 share/web/templates/__jifty/error/mason_internal_error:35 share/web/templates/__jifty/error/mason_internal_error:39
#. ($path, $line)
+#. ($file, $line)
msgid "%1 line %2"
msgstr ""
@@ -74,12 +80,12 @@
msgid "%1 seconds"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:117 lib/Jifty/z:28
+#: lib/Jifty/Action/Record/Search.pm:117
#. ($label)
msgid "%1 since"
msgstr ""
-#: lib/Jifty/Action/Record/Search.pm:118 lib/Jifty/z:29
+#: lib/Jifty/Action/Record/Search.pm:118
#. ($label)
msgid "%1 until"
msgstr ""
@@ -125,7 +131,7 @@
msgid "Calendar"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/update:28
+#: share/web/templates/__jifty/admin/fragments/list/update:31
msgid "Cancel"
msgstr ""
@@ -133,11 +139,11 @@
msgid "Close window"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/view:29
+#: share/web/templates/__jifty/admin/fragments/list/view:31
msgid "Confirm delete?"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/new_item:17
+#: share/web/templates/__jifty/admin/fragments/list/new_item:25
msgid "Create"
msgstr ""
@@ -154,7 +160,7 @@
msgid "Database Administration"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/view:26
+#: share/web/templates/__jifty/admin/fragments/list/view:29
msgid "Delete"
msgstr ""
@@ -162,7 +168,7 @@
msgid "Deleted"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/view:37
+#: share/web/templates/__jifty/admin/fragments/list/view:40
msgid "Edit"
msgstr ""
@@ -200,7 +206,7 @@
msgid "Models"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/list:73
+#: share/web/templates/__jifty/admin/fragments/list/list:113
msgid "Next Page"
msgstr ""
@@ -208,6 +214,10 @@
msgid "No field contains"
msgstr ""
+#: share/web/templates/__jifty/admin/fragments/list/list:85
+msgid "No items found"
+msgstr ""
+
#: lib/Jifty/Web.pm:297
msgid "No request to handle"
msgstr ""
@@ -216,7 +226,7 @@
msgid "Online Documentation"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/list:45
+#: share/web/templates/__jifty/admin/fragments/list/list:80
#. ($page, $collection->pager->last_page)
msgid "Page %1 of %2"
msgstr ""
@@ -225,7 +235,7 @@
msgid "Permission denied"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/list:68
+#: share/web/templates/__jifty/admin/fragments/list/list:108
msgid "Previous Page"
msgstr ""
@@ -237,7 +247,7 @@
msgid "SQL Statements"
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/update:18
+#: share/web/templates/__jifty/admin/fragments/list/update:21
msgid "Save"
msgstr ""
@@ -257,7 +267,7 @@
msgid "Table of Contents"
msgstr ""
-#: lib/Jifty/Action.pm:874
+#: lib/Jifty/Action.pm:873
msgid "That doesn't look like a correct value"
msgstr ""
@@ -281,7 +291,7 @@
msgid "To disable this administrative console, add \"AdminMode: 0\" under the \"framework:\" settings in the config file (etc/config.yml)."
msgstr ""
-#: share/web/templates/__jifty/admin/fragments/list/list:38
+#: share/web/templates/__jifty/admin/fragments/list/list:72
msgid "Toggle search"
msgstr ""
@@ -301,7 +311,7 @@
msgid "You got to a page that we don't think exists. Anyway, the software has logged this error. Sorry about this."
msgstr ""
-#: lib/Jifty/Action.pm:861
+#: lib/Jifty/Action.pm:860
msgid "You need to fill in this field"
msgstr ""
@@ -313,3 +323,11 @@
#: share/web/templates/_elements/sidebar:7
msgid "You're not currently signed in."
msgstr ""
+
+#: share/web/templates/__jifty/admin/fragments/list/header:22
+msgid "asc"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/fragments/list/header:41
+msgid "desc"
+msgstr ""
Modified: jifty/branches/template-declare/share/po/zh_cn.po
==============================================================================
--- jifty/branches/template-declare/share/po/zh_cn.po (original)
+++ jifty/branches/template-declare/share/po/zh_cn.po Mon Dec 18 05:32:52 2006
@@ -18,12 +18,12 @@
msgid "!=>< allowed"
msgstr "å¯ä½¿ç”¨ !=>< 符å·"
-#: lib/Jifty/Action/Record/Search.pm:115 lib/Jifty/z:26
+#: lib/Jifty/Action/Record/Search.pm:115
#. ($label)
msgid "%1 after"
msgstr "%1 晚于"
-#: lib/Jifty/Action/Record/Search.pm:116 lib/Jifty/z:27
+#: lib/Jifty/Action/Record/Search.pm:116
#. ($label)
msgid "%1 before"
msgstr "%1 早于"
@@ -33,12 +33,17 @@
msgid "%1 contains"
msgstr "%1 包å«"
-#: lib/Jifty/Action/Record/Search.pm:123 lib/Jifty/z:35
+#: share/web/templates/__jifty/admin/fragments/list/list:87
+#. ($collection-> count)
+msgid "%1 entries"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:123
#. ($label)
msgid "%1 greater or equal to"
msgstr "%1 至少为"
-#: lib/Jifty/Action/Record/Search.pm:121 lib/Jifty/z:32
+#: lib/Jifty/Action/Record/Search.pm:121
#. ($label)
msgid "%1 greater than"
msgstr "%1 大于"
@@ -53,18 +58,19 @@
msgid "%1 lacks"
msgstr "%1 ä¸åŒ…å«"
-#: lib/Jifty/Action/Record/Search.pm:124 lib/Jifty/z:36
+#: lib/Jifty/Action/Record/Search.pm:124
#. ($label)
msgid "%1 less or equal to"
msgstr "%1 至多为"
-#: lib/Jifty/Action/Record/Search.pm:122 lib/Jifty/z:33
+#: lib/Jifty/Action/Record/Search.pm:122
#. ($label)
msgid "%1 less than"
msgstr "%1 å°äºŽ"
-#: share/web/templates/__jifty/error/mason_internal_error:30 share/web/templates/__jifty/error/mason_internal_error:34 share/web/templates/__jifty/error/mason_internal_error:38
+#: share/web/templates/__jifty/error/mason_internal_error:31 share/web/templates/__jifty/error/mason_internal_error:35 share/web/templates/__jifty/error/mason_internal_error:39
#. ($path, $line)
+#. ($file, $line)
msgid "%1 line %2"
msgstr "%1 第 %2 列"
@@ -73,12 +79,12 @@
msgid "%1 seconds"
msgstr "%1 秒"
-#: lib/Jifty/Action/Record/Search.pm:117 lib/Jifty/z:28
+#: lib/Jifty/Action/Record/Search.pm:117
#. ($label)
msgid "%1 since"
msgstr "%1 自"
-#: lib/Jifty/Action/Record/Search.pm:118 lib/Jifty/z:29
+#: lib/Jifty/Action/Record/Search.pm:118
#. ($label)
msgid "%1 until"
msgstr "%1 至"
@@ -124,7 +130,7 @@
msgid "Calendar"
msgstr "日历"
-#: share/web/templates/__jifty/admin/fragments/list/update:28
+#: share/web/templates/__jifty/admin/fragments/list/update:31
msgid "Cancel"
msgstr "å–消"
@@ -132,11 +138,11 @@
msgid "Close window"
msgstr "å…³é—窗å£"
-#: share/web/templates/__jifty/admin/fragments/list/view:29
+#: share/web/templates/__jifty/admin/fragments/list/view:31
msgid "Confirm delete?"
msgstr "确定è¦åˆ 除?"
-#: share/web/templates/__jifty/admin/fragments/list/new_item:17
+#: share/web/templates/__jifty/admin/fragments/list/new_item:25
msgid "Create"
msgstr "建立"
@@ -151,9 +157,9 @@
#: share/web/templates/__jifty/admin/index.html:3
msgid "Database Administration"
-msgstr "æ•°æ®ç˜¤ç®¡ç†"
+msgstr "æ•°æ®åº“管ç†"
-#: share/web/templates/__jifty/admin/fragments/list/view:26
+#: share/web/templates/__jifty/admin/fragments/list/view:29
msgid "Delete"
msgstr "åˆ é™¤"
@@ -165,7 +171,7 @@
msgid "Dismiss"
msgstr "å…³é—"
-#: share/web/templates/__jifty/admin/fragments/list/view:37
+#: share/web/templates/__jifty/admin/fragments/list/view:40
msgid "Edit"
msgstr "编辑"
@@ -203,7 +209,7 @@
msgid "Models"
msgstr "模型"
-#: share/web/templates/__jifty/admin/fragments/list/list:73
+#: share/web/templates/__jifty/admin/fragments/list/list:113
msgid "Next Page"
msgstr "下一页"
@@ -211,6 +217,10 @@
msgid "No field contains"
msgstr "没有å—段包å«"
+#: share/web/templates/__jifty/admin/fragments/list/list:85
+msgid "No items found"
+msgstr ""
+
#: lib/Jifty/Web.pm:297
msgid "No request to handle"
msgstr "没有å¯å¤„ç†çš„è¦æ±‚"
@@ -219,7 +229,7 @@
msgid "Online Documentation"
msgstr "线上文件"
-#: share/web/templates/__jifty/admin/fragments/list/list:45
+#: share/web/templates/__jifty/admin/fragments/list/list:80
#. ($page, $collection->pager->last_page)
msgid "Page %1 of %2"
msgstr "第 %1 页, 共 %2 页"
@@ -228,7 +238,7 @@
msgid "Permission denied"
msgstr "æƒé™ä¸è¶³."
-#: share/web/templates/__jifty/admin/fragments/list/list:68
+#: share/web/templates/__jifty/admin/fragments/list/list:108
msgid "Previous Page"
msgstr "上一页"
@@ -244,7 +254,7 @@
msgid "SQL Statements"
msgstr "SQL 陈述å¼"
-#: share/web/templates/__jifty/admin/fragments/list/update:18
+#: share/web/templates/__jifty/admin/fragments/list/update:21
msgid "Save"
msgstr "储å˜"
@@ -264,7 +274,7 @@
msgid "Table of Contents"
msgstr "目录"
-#: lib/Jifty/Action.pm:874
+#: lib/Jifty/Action.pm:873
msgid "That doesn't look like a correct value"
msgstr "å—æ®µæ ¼å¼é”™è¯¯."
@@ -288,7 +298,7 @@
msgid "To disable this administrative console, add \"AdminMode: 0\" under the \"framework:\" settings in the config file (etc/config.yml)."
msgstr "如欲åœç”¨ç®¡ç†ç•Œé¢, 请在设定档 (etc/config.yml) çš„ \"framework:\" è®¾å®šå†…åŠ ä¸Š \"AdminMode: 0\" å³å¯."
-#: share/web/templates/__jifty/admin/fragments/list/list:38
+#: share/web/templates/__jifty/admin/fragments/list/list:72
msgid "Toggle search"
msgstr "切æ¢æœå¯»ç”»é¢"
@@ -308,7 +318,7 @@
msgid "You got to a page that we don't think exists. Anyway, the software has logged this error. Sorry about this."
msgstr "抱æ‰, æ¤é¡µé¢ä¸å˜åœ¨, 系统已留下纪录."
-#: lib/Jifty/Action.pm:861
+#: lib/Jifty/Action.pm:860
msgid "You need to fill in this field"
msgstr "æ¤å—段ä¸èƒ½ç•™ç©º."
@@ -320,3 +330,11 @@
#: share/web/templates/_elements/sidebar:7
msgid "You're not currently signed in."
msgstr "您目å‰å°šæœªç™»å…¥."
+
+#: share/web/templates/__jifty/admin/fragments/list/header:22
+msgid "asc"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/fragments/list/header:41
+msgid "desc"
+msgstr ""
Modified: jifty/branches/template-declare/share/po/zh_tw.po
==============================================================================
--- jifty/branches/template-declare/share/po/zh_tw.po (original)
+++ jifty/branches/template-declare/share/po/zh_tw.po Mon Dec 18 05:32:52 2006
@@ -18,12 +18,12 @@
msgid "!=>< allowed"
msgstr "å¯ä½¿ç”¨ !=>< 符號"
-#: lib/Jifty/Action/Record/Search.pm:115 lib/Jifty/z:26
+#: lib/Jifty/Action/Record/Search.pm:115
#. ($label)
msgid "%1 after"
msgstr "%1 晚於"
-#: lib/Jifty/Action/Record/Search.pm:116 lib/Jifty/z:27
+#: lib/Jifty/Action/Record/Search.pm:116
#. ($label)
msgid "%1 before"
msgstr "%1 æ—©æ–¼"
@@ -33,12 +33,17 @@
msgid "%1 contains"
msgstr "%1 包å«"
-#: lib/Jifty/Action/Record/Search.pm:123 lib/Jifty/z:35
+#: share/web/templates/__jifty/admin/fragments/list/list:87
+#. ($collection-> count)
+msgid "%1 entries"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:123
#. ($label)
msgid "%1 greater or equal to"
msgstr "%1 至少為"
-#: lib/Jifty/Action/Record/Search.pm:121 lib/Jifty/z:32
+#: lib/Jifty/Action/Record/Search.pm:121
#. ($label)
msgid "%1 greater than"
msgstr "%1 大於"
@@ -53,18 +58,19 @@
msgid "%1 lacks"
msgstr "%1 ä¸åŒ…å«"
-#: lib/Jifty/Action/Record/Search.pm:124 lib/Jifty/z:36
+#: lib/Jifty/Action/Record/Search.pm:124
#. ($label)
msgid "%1 less or equal to"
msgstr "%1 至多為"
-#: lib/Jifty/Action/Record/Search.pm:122 lib/Jifty/z:33
+#: lib/Jifty/Action/Record/Search.pm:122
#. ($label)
msgid "%1 less than"
msgstr "%1 å°æ–¼"
-#: share/web/templates/__jifty/error/mason_internal_error:30 share/web/templates/__jifty/error/mason_internal_error:34 share/web/templates/__jifty/error/mason_internal_error:38
+#: share/web/templates/__jifty/error/mason_internal_error:31 share/web/templates/__jifty/error/mason_internal_error:35 share/web/templates/__jifty/error/mason_internal_error:39
#. ($path, $line)
+#. ($file, $line)
msgid "%1 line %2"
msgstr "%1 第 %2 列"
@@ -73,12 +79,12 @@
msgid "%1 seconds"
msgstr "%1 秒"
-#: lib/Jifty/Action/Record/Search.pm:117 lib/Jifty/z:28
+#: lib/Jifty/Action/Record/Search.pm:117
#. ($label)
msgid "%1 since"
msgstr "%1 自"
-#: lib/Jifty/Action/Record/Search.pm:118 lib/Jifty/z:29
+#: lib/Jifty/Action/Record/Search.pm:118
#. ($label)
msgid "%1 until"
msgstr "%1 至"
@@ -124,7 +130,7 @@
msgid "Calendar"
msgstr "日曆"
-#: share/web/templates/__jifty/admin/fragments/list/update:28
+#: share/web/templates/__jifty/admin/fragments/list/update:31
msgid "Cancel"
msgstr "å–消"
@@ -132,11 +138,11 @@
msgid "Close window"
msgstr "關閉視窗"
-#: share/web/templates/__jifty/admin/fragments/list/view:29
+#: share/web/templates/__jifty/admin/fragments/list/view:31
msgid "Confirm delete?"
msgstr "確定è¦åˆªé™¤?"
-#: share/web/templates/__jifty/admin/fragments/list/new_item:17
+#: share/web/templates/__jifty/admin/fragments/list/new_item:25
msgid "Create"
msgstr "建立"
@@ -151,9 +157,9 @@
#: share/web/templates/__jifty/admin/index.html:3
msgid "Database Administration"
-msgstr "資料瘤管ç†"
+msgstr "資料庫管ç†"
-#: share/web/templates/__jifty/admin/fragments/list/view:26
+#: share/web/templates/__jifty/admin/fragments/list/view:29
msgid "Delete"
msgstr "刪除"
@@ -165,7 +171,7 @@
msgid "Dismiss"
msgstr "關閉"
-#: share/web/templates/__jifty/admin/fragments/list/view:37
+#: share/web/templates/__jifty/admin/fragments/list/view:40
msgid "Edit"
msgstr "編輯"
@@ -203,7 +209,7 @@
msgid "Models"
msgstr "模型"
-#: share/web/templates/__jifty/admin/fragments/list/list:73
+#: share/web/templates/__jifty/admin/fragments/list/list:113
msgid "Next Page"
msgstr "下一é "
@@ -211,6 +217,10 @@
msgid "No field contains"
msgstr "沒有欄ä½åŒ…å«"
+#: share/web/templates/__jifty/admin/fragments/list/list:85
+msgid "No items found"
+msgstr ""
+
#: lib/Jifty/Web.pm:297
msgid "No request to handle"
msgstr "沒有å¯è™•ç†çš„è¦æ±‚"
@@ -219,7 +229,7 @@
msgid "Online Documentation"
msgstr "線上文件"
-#: share/web/templates/__jifty/admin/fragments/list/list:45
+#: share/web/templates/__jifty/admin/fragments/list/list:80
#. ($page, $collection->pager->last_page)
msgid "Page %1 of %2"
msgstr "第 %1 é , å…± %2 é "
@@ -228,7 +238,7 @@
msgid "Permission denied"
msgstr "權é™ä¸è¶³."
-#: share/web/templates/__jifty/admin/fragments/list/list:68
+#: share/web/templates/__jifty/admin/fragments/list/list:108
msgid "Previous Page"
msgstr "上一é "
@@ -244,7 +254,7 @@
msgid "SQL Statements"
msgstr "SQL 陳述å¼"
-#: share/web/templates/__jifty/admin/fragments/list/update:18
+#: share/web/templates/__jifty/admin/fragments/list/update:21
msgid "Save"
msgstr "儲å˜"
@@ -264,7 +274,7 @@
msgid "Table of Contents"
msgstr "目錄"
-#: lib/Jifty/Action.pm:874
+#: lib/Jifty/Action.pm:873
msgid "That doesn't look like a correct value"
msgstr "欄ä½æ ¼å¼éŒ¯èª¤."
@@ -288,7 +298,7 @@
msgid "To disable this administrative console, add \"AdminMode: 0\" under the \"framework:\" settings in the config file (etc/config.yml)."
msgstr "如欲åœç”¨ç®¡ç†ç•Œé¢, 請在è¨å®šæª” (etc/config.yml) çš„ \"framework:\" è¨å®šå…§åŠ 上 \"AdminMode: 0\" å³å¯."
-#: share/web/templates/__jifty/admin/fragments/list/list:38
+#: share/web/templates/__jifty/admin/fragments/list/list:72
msgid "Toggle search"
msgstr "切æ›æœå°‹ç•«é¢"
@@ -308,7 +318,7 @@
msgid "You got to a page that we don't think exists. Anyway, the software has logged this error. Sorry about this."
msgstr "抱æ‰, æ¤é é¢ä¸å˜åœ¨, 系統已留下紀錄."
-#: lib/Jifty/Action.pm:861
+#: lib/Jifty/Action.pm:860
msgid "You need to fill in this field"
msgstr "æ¤æ¬„ä½ä¸èƒ½ç•™ç©º."
@@ -320,3 +330,11 @@
#: share/web/templates/_elements/sidebar:7
msgid "You're not currently signed in."
msgstr "您目å‰å°šæœªç™»å…¥."
+
+#: share/web/templates/__jifty/admin/fragments/list/header:22
+msgid "asc"
+msgstr ""
+
+#: share/web/templates/__jifty/admin/fragments/list/header:41
+msgid "desc"
+msgstr ""
Modified: jifty/branches/template-declare/share/web/static/css/base.css
==============================================================================
--- jifty/branches/template-declare/share/web/static/css/base.css (original)
+++ jifty/branches/template-declare/share/web/static/css/base.css Mon Dec 18 05:32:52 2006
@@ -57,6 +57,7 @@
top: 10px;
right: 10px;
z-index: 42;
+ float: right;
}
Added: jifty/branches/template-declare/share/web/static/css/yui/tabview/border_tabs.css
==============================================================================
--- (empty file)
+++ jifty/branches/template-declare/share/web/static/css/yui/tabview/border_tabs.css Mon Dec 18 05:32:52 2006
@@ -0,0 +1,44 @@
+.yui-navset .yui-nav li a, .yui-navset .yui-content {
+ border:1px solid #000; /* label and content borders */
+}
+
+.yui-navset .yui-nav .selected a, .yui-navset .yui-nav a:hover, .yui-navset .yui-content {
+ background-color:#f6f7ee; /* active tab, tab hover, and content bgcolor */
+}
+
+.yui-navset-top .yui-nav .selected a {
+ border-bottom:0; /* no bottom border for active tab */
+ padding-bottom:1px; /* to match height of other tabs */
+}
+
+.yui-navset-top .yui-content {
+ margin-top:-1px; /* for active tab overlap */
+}
+
+.yui-navset-bottom .yui-nav .selected a {
+ border-top:0; /* no bottom border for active tab */
+ padding-top:1px; /* to match height of other tabs */
+}
+
+.yui-navset-bottom .yui-content {
+ margin-bottom:-1px; /* for active tab overlap */
+}
+
+.yui-navset-left .yui-nav li.selected a {
+ border-right:0; /* no bottom border for active tab */
+ padding-right:1px; /* to match height of other tabs */
+}
+
+.yui-navset-left .yui-content {
+ margin-left:-1px; /* for active tab overlap */
+}
+
+.yui-navset-right .yui-nav li.selected a {
+ border-left:0; /* no bottom border for active tab */
+ padding-left:1px; /* to match height of other tabs */
+}
+
+.yui-navset-right .yui-content {
+ margin-right:-1px; /* for active tab overlap */
+ *margin-right:0; /* except IE */
+}
\ No newline at end of file
Added: jifty/branches/template-declare/share/web/static/css/yui/tabview/tabs.css
==============================================================================
--- (empty file)
+++ jifty/branches/template-declare/share/web/static/css/yui/tabview/tabs.css Mon Dec 18 05:32:52 2006
@@ -0,0 +1,66 @@
+/* default space between tabs */
+.yui-navset-top .yui-nav li, .yui-navset-bottom .yui-nav li {
+ margin-right:0.5em; /* horizontal tabs */
+}
+.yui-navset-left .yui-nav li, .yui-navset-right .yui-nav li {
+ margin-bottom:0.5em; /* vertical tabs */
+}
+
+.yui-navset .yui-nav li em { padding:.5em; } /* default tab padding */
+
+/* default width for side tabs */
+.yui-navset-left .yui-nav, .yui-navset-right .yui-nav { width:6em; }
+.yui-navset-left { padding-left:6em; } /* map to nav width */
+.yui-navset-right { padding-right:6em; } /* ditto */
+
+/* core */
+
+.yui-nav, .yui-nav li {
+ margin:0;
+ padding:0;
+ list-style:none;
+}
+.yui-navset li em { font-style:normal; }
+
+.yui-navset {
+ position:relative; /* contain absolute positioned tabs (left/right) */
+ zoom:1;
+}
+
+.yui-navset .yui-content { zoom:1; }
+
+.yui-navset-top .yui-nav li, .yui-navset-bottom .yui-nav li {
+ display:inline-block;
+ display:-moz-inline-stack;
+ *display:inline; /* IE */
+ vertical-align:bottom; /* safari: for overlap */
+ cursor:pointer; /* gecko: due to -moz-inline-stack on anchor */
+ zoom:1; /* IE: kill space between horizontal tabs */
+}
+
+.yui-navset .yui-nav a {
+ outline:0; /* gecko: keep from shifting */
+}
+
+.yui-navset .yui-nav a { position:relative; } /* IE: to allow overlap */
+
+.yui-navset .yui-nav li a {
+ display:block;
+ zoom:1;
+}
+
+.yui-navset-top .yui-nav li a, .yui-navset-bottom .yui-nav li a {
+ display:inline-block;
+ vertical-align:bottom; /* safari: for overlap */
+}
+
+.yui-navset-bottom .yui-nav li a {
+ vertical-align:text-top; /* for inline overlap (reverse for Op border bug) */
+}
+
+.yui-navset .yui-nav li a em { display:block; }
+
+/* position left and right oriented tabs */
+.yui-navset-left .yui-nav, .yui-navset-right .yui-nav { position:absolute; z-index:1; }
+.yui-navset-left .yui-nav { left:0; }
+.yui-navset-right .yui-nav { right:0; }
Added: jifty/branches/template-declare/share/web/static/js/yui/tabview.js
==============================================================================
--- (empty file)
+++ jifty/branches/template-declare/share/web/static/js/yui/tabview.js Mon Dec 18 05:32:52 2006
@@ -0,0 +1,1950 @@
+/*
+Copyright (c) 2006, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 0.12.0
+*/
+(function() {
+
+ YAHOO.util.Lang = {
+ isArray: function(val) { // frames lose type, so test constructor string
+ if (val.constructor && val.constructor.toString().indexOf('Array') > -1) {
+ return true;
+ } else {
+ return YAHOO.util.Lang.isObject(val) && val.constructor == Array;
+ }
+ },
+
+ isBoolean: function(val) {
+ return typeof val == 'boolean';
+ },
+
+ isFunction: function(val) {
+ return typeof val == 'function';
+ },
+
+ isNull: function(val) {
+ return val === null;
+ },
+
+ isNumber: function(val) {
+ return !isNaN(val);
+ },
+
+ isObject: function(val) {
+ return typeof val == 'object' || YAHOO.util.Lang.isFunction(val);
+ },
+
+ isString: function(val) {
+ return typeof val == 'string';
+ },
+
+ isUndefined: function(val) {
+ return typeof val == 'undefined';
+ }
+ };
+})();/**
+ * Provides Attribute configurations.
+ * @namespace YAHOO.util
+ * @class Attribute
+ * @constructor
+ * @param hash {Object} The intial Attribute.
+ * @param {YAHOO.util.AttributeProvider} The owner of the Attribute instance.
+ */
+
+YAHOO.util.Attribute = function(hash, owner) {
+ if (owner) {
+ this.owner = owner;
+ this.configure(hash, true);
+ }
+};
+
+YAHOO.util.Attribute.prototype = {
+ /**
+ * The name of the attribute.
+ * @property name
+ * @type String
+ */
+ name: undefined,
+
+ /**
+ * The value of the attribute.
+ * @property value
+ * @type String
+ */
+ value: null,
+
+ /**
+ * The owner of the attribute.
+ * @property owner
+ * @type YAHOO.util.AttributeProvider
+ */
+ owner: null,
+
+ /**
+ * Whether or not the attribute is read only.
+ * @property readOnly
+ * @type Boolean
+ */
+ readOnly: false,
+
+ /**
+ * Whether or not the attribute can only be written once.
+ * @property writeOnce
+ * @type Boolean
+ */
+ writeOnce: false,
+
+ /**
+ * The attribute's initial configuration.
+ * @private
+ * @property _initialConfig
+ * @type Object
+ */
+ _initialConfig: null,
+
+ /**
+ * Whether or not the attribute's value has been set.
+ * @private
+ * @property _written
+ * @type Boolean
+ */
+ _written: false,
+
+ /**
+ * The method to use when setting the attribute's value.
+ * The method recieves the new value as the only argument.
+ * @property method
+ * @type Function
+ */
+ method: null,
+
+ /**
+ * The validator to use when setting the attribute's value.
+ * @property validator
+ * @type Function
+ * @return Boolean
+ */
+ validator: null,
+
+ /**
+ * Retrieves the current value of the attribute.
+ * @method getValue
+ * @return {any} The current value of the attribute.
+ */
+ getValue: function() {
+ return this.value;
+ },
+
+ /**
+ * Sets the value of the attribute and fires beforeChange and change events.
+ * @method setValue
+ * @param {Any} value The value to apply to the attribute.
+ * @param {Boolean} silent If true the change events will not be fired.
+ * @return {Boolean} Whether or not the value was set.
+ */
+ setValue: function(value, silent) {
+ var beforeRetVal;
+ var owner = this.owner;
+ var name = this.name;
+
+ var event = {
+ type: name,
+ prevValue: this.getValue(),
+ newValue: value
+ };
+
+ if (this.readOnly || ( this.writeOnce && this._written) ) {
+ return false; // write not allowed
+ }
+
+ if (this.validator && !this.validator.call(owner, value) ) {
+ return false; // invalid value
+ }
+
+ if (!silent) {
+ beforeRetVal = owner.fireBeforeChangeEvent(event);
+ if (beforeRetVal === false) {
+ YAHOO.log('setValue ' + name +
+ 'cancelled by beforeChange event', 'info', 'Attribute');
+ return false;
+ }
+ }
+
+ if (this.method) {
+ this.method.call(owner, value);
+ }
+
+ this.value = value;
+ this._written = true;
+
+ event.type = name;
+
+ if (!silent) {
+ this.owner.fireChangeEvent(event);
+ }
+
+ return true;
+ },
+
+ /**
+ * Allows for configuring the Attribute's properties.
+ * @method configure
+ * @param {Object} map A key-value map of Attribute properties.
+ * @param {Boolean} init Whether or not this should become the initial config.
+ */
+ configure: function(map, init) {
+ map = map || {};
+ this._written = false; // reset writeOnce
+ this._initialConfig = this._initialConfig || {};
+
+ for (var key in map) {
+ if ( key && map.hasOwnProperty(key) ) {
+ this[key] = map[key];
+ if (init) {
+ this._initialConfig[key] = map[key];
+ }
+ }
+ }
+ },
+
+ /**
+ * Resets the value to the initial config value.
+ * @method resetValue
+ * @return {Boolean} Whether or not the value was set.
+ */
+ resetValue: function() {
+ return this.setValue(this._initialConfig.value);
+ },
+
+ /**
+ * Resets the attribute config to the initial config state.
+ * @method resetConfig
+ */
+ resetConfig: function() {
+ this.configure(this._initialConfig);
+ },
+
+ /**
+ * Resets the value to the current value.
+ * Useful when values may have gotten out of sync with actual properties.
+ * @method refresh
+ * @return {Boolean} Whether or not the value was set.
+ */
+ refresh: function(silent) {
+ this.setValue(this.value, silent);
+ }
+};(function() {
+ var Lang = YAHOO.util.Lang;
+
+ /*
+ Copyright (c) 2006, Yahoo! Inc. All rights reserved.
+ Code licensed under the BSD License:
+ http://developer.yahoo.net/yui/license.txt
+ */
+
+ /**
+ * Provides and manages YAHOO.util.Attribute instances
+ * @namespace YAHOO.util
+ * @class AttributeProvider
+ * @uses YAHOO.util.EventProvider
+ */
+ YAHOO.util.AttributeProvider = function() {};
+
+ YAHOO.util.AttributeProvider.prototype = {
+
+ /**
+ * A key-value map of Attribute configurations
+ * @property _configs
+ * @protected (may be used by subclasses and augmentors)
+ * @private
+ * @type {Object}
+ */
+ _configs: null,
+ /**
+ * Returns the current value of the attribute.
+ * @method get
+ * @param {String} key The attribute whose value will be returned.
+ */
+ get: function(key){
+ var configs = this._configs || {};
+ var config = configs[key];
+
+ if (!config) {
+ YAHOO.log(key + ' not found', 'error', 'AttributeProvider');
+ return undefined;
+ }
+
+ return config.value;
+ },
+
+ /**
+ * Sets the value of a config.
+ * @method set
+ * @param {String} key The name of the attribute
+ * @param {Any} value The value to apply to the attribute
+ * @param {Boolean} silent Whether or not to suppress change events
+ * @return {Boolean} Whether or not the value was set.
+ */
+ set: function(key, value, silent){
+ var configs = this._configs || {};
+ var config = configs[key];
+
+ if (!config) {
+ YAHOO.log('set failed: ' + key + ' not found',
+ 'error', 'AttributeProvider');
+ return false;
+ }
+
+ return config.setValue(value, silent);
+ },
+
+ /**
+ * Returns an array of attribute names.
+ * @method getAttributeKeys
+ * @return {Array} An array of attribute names.
+ */
+ getAttributeKeys: function(){
+ var configs = this._configs;
+ var keys = [];
+ var config;
+ for (var key in configs) {
+ config = configs[key];
+ if ( configs.hasOwnProperty(key) &&
+ !Lang.isUndefined(config) ) {
+ keys[keys.length] = key;
+ }
+ }
+
+ return keys;
+ },
+
+ /**
+ * Sets multiple attribute values.
+ * @method setAttributes
+ * @param {Object} map A key-value map of attributes
+ * @param {Boolean} silent Whether or not to suppress change events
+ */
+ setAttributes: function(map, silent){
+ for (var key in map) {
+ if ( map.hasOwnProperty(key) ) {
+ this.set(key, map[key], silent);
+ }
+ }
+ },
+
+ /**
+ * Resets the specified attribute's value to its initial value.
+ * @method resetValue
+ * @param {String} key The name of the attribute
+ * @param {Boolean} silent Whether or not to suppress change events
+ * @return {Boolean} Whether or not the value was set
+ */
+ resetValue: function(key, silent){
+ var configs = this._configs || {};
+ if (configs[key]) {
+ this.set(key, configs[key]._initialConfig.value, silent);
+ return true;
+ }
+ return false;
+ },
+
+ /**
+ * Sets the attribute's value to its current value.
+ * @method refresh
+ * @param {String | Array} key The attribute(s) to refresh
+ * @param {Boolean} silent Whether or not to suppress change events
+ */
+ refresh: function(key, silent){
+ var configs = this._configs;
+
+ key = ( ( Lang.isString(key) ) ? [key] : key ) ||
+ this.getAttributeKeys();
+
+ for (var i = 0, len = key.length; i < len; ++i) {
+ if ( // only set if there is a value and not null
+ configs[key[i]] &&
+ ! Lang.isUndefined(configs[key[i]].value) &&
+ ! Lang.isNull(configs[key[i]].value) ) {
+ configs[key[i]].refresh(silent);
+ }
+ }
+ },
+
+ /**
+ * Adds an Attribute to the AttributeProvider instance.
+ * @method register
+ * @param {String} key The attribute's name
+ * @param {Object} map A key-value map containing the
+ * attribute's properties.
+ */
+ register: function(key, map) {
+ this._configs = this._configs || {};
+
+ if (this._configs[key]) { // dont override
+ return false;
+ }
+
+ map.name = key;
+ this._configs[key] = new YAHOO.util.Attribute(map, this);
+ return true;
+ },
+
+ /**
+ * Returns the attribute's properties.
+ * @method getAttributeConfig
+ * @param {String} key The attribute's name
+ * @private
+ * @return {object} A key-value map containing all of the
+ * attribute's properties.
+ */
+ getAttributeConfig: function(key) {
+ var configs = this._configs || {};
+ var config = configs[key] || {};
+ var map = {}; // returning a copy to prevent overrides
+
+ for (key in config) {
+ if ( config.hasOwnProperty(key) ) {
+ map[key] = config[key];
+ }
+ }
+
+ return map;
+ },
+
+ /**
+ * Sets or updates an Attribute instance's properties.
+ * @method configureAttribute
+ * @param {String} key The attribute's name.
+ * @param {Object} map A key-value map of attribute properties
+ * @param {Boolean} init Whether or not this should become the intial config.
+ */
+ configureAttribute: function(key, map, init) {
+ var configs = this._configs || {};
+
+ if (!configs[key]) {
+ YAHOO.log('unable to configure, ' + key + ' not found',
+ 'error', 'AttributeProvider');
+ return false;
+ }
+
+ configs[key].configure(map, init);
+ },
+
+ /**
+ * Resets an attribute to its intial configuration.
+ * @method resetAttributeConfig
+ * @param {String} key The attribute's name.
+ * @private
+ */
+ resetAttributeConfig: function(key){
+ var configs = this._configs || {};
+ configs[key].resetConfig();
+ },
+
+ /**
+ * Fires the attribute's beforeChange event.
+ * @method fireBeforeChangeEvent
+ * @param {String} key The attribute's name.
+ * @param {Obj} e The event object to pass to handlers.
+ */
+ fireBeforeChangeEvent: function(e) {
+ var type = 'before';
+ type += e.type.charAt(0).toUpperCase() + e.type.substr(1) + 'Change';
+ e.type = type;
+ return this.fireEvent(e.type, e);
+ },
+
+ /**
+ * Fires the attribute's change event.
+ * @method fireChangeEvent
+ * @param {String} key The attribute's name.
+ * @param {Obj} e The event object to pass to the handlers.
+ */
+ fireChangeEvent: function(e) {
+ e.type += 'Change';
+ return this.fireEvent(e.type, e);
+ }
+ };
+
+ YAHOO.augment(YAHOO.util.AttributeProvider, YAHOO.util.EventProvider);
+})();(function() {
+// internal shorthand
+var Dom = YAHOO.util.Dom,
+ Lang = YAHOO.util.Lang,
+ EventPublisher = YAHOO.util.EventPublisher,
+ AttributeProvider = YAHOO.util.AttributeProvider;
+
+/**
+ * Element provides an interface to an HTMLElement's attributes and common
+ * methods. Other commonly used attributes are added as well.
+ * @namespace YAHOO.util
+ * @class Element
+ * @uses YAHOO.util.AttributeProvider
+ * @constructor
+ * @param el {HTMLElement | String} The html element that
+ * represents the Element.
+ * @param {Object} map A key-value map of initial config names and values
+ */
+YAHOO.util.Element = function(el, map) {
+ if (arguments.length) {
+ this.init(el, map);
+ }
+};
+
+YAHOO.util.Element.prototype = {
+ /**
+ * Dom events supported by the Element instance.
+ * @property DOM_EVENTS
+ * @type Object
+ */
+ DOM_EVENTS: null,
+
+ /**
+ * Wrapper for HTMLElement method.
+ * @method appendChild
+ * @param {Boolean} deep Whether or not to do a deep clone
+ */
+ appendChild: function(child) {
+ child = child.get ? child.get('element') : child;
+ this.get('element').appendChild(child);
+ },
+
+ /**
+ * Wrapper for HTMLElement method.
+ * @method getElementsByTagName
+ * @param {String} tag The tagName to collect
+ */
+ getElementsByTagName: function(tag) {
+ return this.get('element').getElementsByTagName(tag);
+ },
+
+ /**
+ * Wrapper for HTMLElement method.
+ * @method hasChildNodes
+ * @return {Boolean} Whether or not the element has childNodes
+ */
+ hasChildNodes: function() {
+ return this.get('element').hasChildNodes();
+ },
+
+ /**
+ * Wrapper for HTMLElement method.
+ * @method insertBefore
+ * @param {HTMLElement} element The HTMLElement to insert
+ * @param {HTMLElement} before The HTMLElement to insert
+ * the element before.
+ */
+ insertBefore: function(element, before) {
+ element = element.get ? element.get('element') : element;
+ before = (before && before.get) ? before.get('element') : before;
+
+ this.get('element').insertBefore(element, before);
+ },
+
+ /**
+ * Wrapper for HTMLElement method.
+ * @method removeChild
+ * @param {HTMLElement} child The HTMLElement to remove
+ */
+ removeChild: function(child) {
+ child = child.get ? child.get('element') : child;
+ this.get('element').removeChild(child);
+ return true;
+ },
+
+ /**
+ * Wrapper for HTMLElement method.
+ * @method replaceChild
+ * @param {HTMLElement} newNode The HTMLElement to insert
+ * @param {HTMLElement} oldNode The HTMLElement to replace
+ */
+ replaceChild: function(newNode, oldNode) {
+ newNode = newNode.get ? newNode.get('element') : newNode;
+ oldNode = oldNode.get ? oldNode.get('element') : oldNode;
+ return this.get('element').replaceChild(newNode, oldNode);
+ },
+
+
+ /**
+ * Registers Element specific attributes.
+ * @method initAttributes
+ * @param {Object} map A key-value map of initial attribute configs
+ */
+ initAttributes: function(map) {
+ map = map || {};
+ var element = Dom.get(map.element) || null;
+
+ /**
+ * The HTMLElement the Element instance refers to.
+ * @config element
+ * @type HTMLElement
+ */
+ this.register('element', {
+ value: element,
+ readOnly: true
+ });
+ },
+
+ /**
+ * Adds a listener for the given event. These may be DOM or
+ * customEvent listeners. Any event that is fired via fireEvent
+ * can be listened for. All handlers receive an event object.
+ * @method addListener
+ * @param {String} type The name of the event to listen for
+ * @param {Function} fn The handler to call when the event fires
+ * @param {Any} obj A variable to pass to the handler
+ * @param {Object} scope The object to use for the scope of the handler
+ */
+ addListener: function(type, fn, obj, scope) {
+ var el = this.get('element');
+ var scope = scope || this;
+
+ el = this.get('id') || el;
+
+ if (!this._events[type]) { // create on the fly
+ if ( this.DOM_EVENTS[type] ) {
+ YAHOO.util.Event.addListener(el, type, function(e) {
+ if (e.srcElement && !e.target) { // supplement IE with target
+ e.target = e.srcElement;
+ }
+ this.fireEvent(type, e);
+ }, obj, scope);
+ }
+
+ this.createEvent(type, this);
+ this._events[type] = true;
+ }
+
+ this.subscribe.apply(this, arguments); // notify via customEvent
+ },
+
+
+ /**
+ * Alias for addListener
+ * @method on
+ * @param {String} type The name of the event to listen for
+ * @param {Function} fn The function call when the event fires
+ * @param {Any} obj A variable to pass to the handler
+ * @param {Object} scope The object to use for the scope of the handler
+ */
+ on: function() { this.addListener.apply(this, arguments); },
+
+
+ /**
+ * Remove an event listener
+ * @method removeListener
+ * @param {String} type The name of the event to listen for
+ * @param {Function} fn The function call when the event fires
+ */
+ removeListener: function(type, fn) {
+ this.unsubscribe.apply(this, arguments);
+ },
+
+ /**
+ * Wrapper for Dom method.
+ * @method addClass
+ * @param {String} className The className to add
+ */
+ addClass: function(className) {
+ Dom.addClass(this.get('element'), className);
+ },
+
+ /**
+ * Wrapper for Dom method.
+ * @method getElementsByClassName
+ * @param {String} className The className to collect
+ * @param {String} tag (optional) The tag to use in
+ * conjunction with class name
+ * @return {Array} Array of HTMLElements
+ */
+ getElementsByClassName: function(className, tag) {
+ return Dom.getElementsByClassName(className, tag,
+ this.get('element') );
+ },
+
+ /**
+ * Wrapper for Dom method.
+ * @method hasClass
+ * @param {String} className The className to add
+ * @return {Boolean} Whether or not the element has the class name
+ */
+ hasClass: function(className) {
+ return Dom.hasClass(this.get('element'), className);
+ },
+
+ /**
+ * Wrapper for Dom method.
+ * @method removeClass
+ * @param {String} className The className to remove
+ */
+ removeClass: function(className) {
+ return Dom.removeClass(this.get('element'), className);
+ },
+
+ /**
+ * Wrapper for Dom method.
+ * @method replaceClass
+ * @param {String} oldClassName The className to replace
+ * @param {String} newClassName The className to add
+ */
+ replaceClass: function(oldClassName, newClassName) {
+ return Dom.replaceClass(this.get('element'),
+ oldClassName, newClassName);
+ },
+
+ /**
+ * Wrapper for Dom method.
+ * @method setStyle
+ * @param {String} property The style property to set
+ * @param {String} value The value to apply to the style property
+ */
+ setStyle: function(property, value) {
+ return Dom.setStyle(this.get('element'), property, value);
+ },
+
+ /**
+ * Wrapper for Dom method.
+ * @method getStyle
+ * @param {String} property The style property to retrieve
+ * @return {String} The current value of the property
+ */
+ getStyle: function(property) {
+ return Dom.getStyle(this.get('element'), property);
+ },
+
+ /**
+ * Apply any queued set calls.
+ * @method fireQueue
+ */
+ fireQueue: function() {
+ var queue = this._queue;
+ for (var i = 0, len = queue.length; i < len; ++i) {
+ this[queue[i][0]].apply(this, queue[i][1]);
+ }
+ },
+
+ /**
+ * Appends the HTMLElement into either the supplied parentNode.
+ * @method appendTo
+ * @param {HTMLElement | Element} parentNode The node to append to
+ * @param {HTMLElement | Element} before An optional node to insert before
+ */
+ appendTo: function(parent, before) {
+ parent = (parent.get) ? parent.get('element') : Dom.get(parent);
+
+ before = (before && before.get) ?
+ before.get('element') : Dom.get(before);
+ var element = this.get('element');
+
+ var newAddition = !Dom.inDocument(element);
+
+ if (!element) {
+ YAHOO.log('appendTo failed: element not available',
+ 'error', 'Element');
+ return false;
+ }
+
+ if (!parent) {
+ YAHOO.log('appendTo failed: parent not available',
+ 'error', 'Element');
+ return false;
+ }
+
+ if (element.parent != parent) {
+ if (before) {
+ parent.insertBefore(element, before);
+ } else {
+ parent.appendChild(element);
+ }
+ }
+
+ YAHOO.log(element + 'appended to ' + parent);
+
+ if (!newAddition) {
+ return false; // note return; no refresh if in document
+ }
+
+ // if a new addition, refresh HTMLElement any applied attributes
+ var keys = this.getAttributeKeys();
+
+ for (var key in keys) { // only refresh HTMLElement attributes
+ if ( !Lang.isUndefined(element[key]) ) {
+ this.refresh(key);
+ }
+ }
+ },
+
+ get: function(key) {
+ var configs = this._configs || {};
+ var el = configs.element; // avoid loop due to 'element'
+ if (el && !configs[key] && !Lang.isUndefined(el.value[key]) ) {
+ return el.value[key];
+ }
+
+ return AttributeProvider.prototype.get.call(this, key);
+ },
+
+ set: function(key, value, silent) {
+ var el = this.get('element');
+ if (!el) {
+ this._queue[key] = ['set', arguments];
+ return false;
+ }
+
+ // set it on the element if not a property
+ if ( !this._configs[key] && !Lang.isUndefined(el[key]) ) {
+ _registerHTMLAttr(this, key);
+ }
+
+ return AttributeProvider.prototype.set.apply(this, arguments);
+ },
+
+ register: function(key) { // protect html attributes
+ var configs = this._configs || {};
+ var element = this.get('element') || null;
+
+ if ( element && !Lang.isUndefined(element[key]) ) {
+ YAHOO.log(key + ' is reserved for ' + element,
+ 'error', 'Element');
+ return false;
+ }
+
+ return AttributeProvider.prototype.register.apply(this, arguments);
+ },
+
+ configureAttribute: function(property, map, init) { // protect html attributes
+ if (!this._configs[property] && this._configs.element &&
+ !Lang.isUndefined(this._configs.element[property]) ) {
+ _registerHTMLAttr(this, property, map);
+ return false;
+ }
+
+ return AttributeProvider.prototype.configure.apply(this, arguments);
+ },
+
+ getAttributeKeys: function() {
+ var el = this.get('element');
+ var keys = AttributeProvider.prototype.getAttributeKeys.call(this);
+
+ //add any unconfigured element keys
+ for (var key in el) {
+ if (!this._configs[key]) {
+ keys[key] = keys[key] || el[key];
+ }
+ }
+
+ return keys;
+ },
+
+ init: function(el, attr) {
+ this._queue = this._queue || [];
+ this._events = this._events || {};
+ this._configs = this._configs || {};
+ attr = attr || {};
+ attr.element = attr.element || el || null;
+
+ this.DOM_EVENTS = {
+ 'click': true,
+ 'keydown': true,
+ 'keypress': true,
+ 'keyup': true,
+ 'mousedown': true,
+ 'mousemove': true,
+ 'mouseout': true,
+ 'mouseover': true,
+ 'mouseup': true
+ };
+
+ var readyHandler = function() {
+ this.initAttributes(attr);
+
+ this.setAttributes(attr, true);
+ this.fireQueue();
+ this.fireEvent('contentReady', {
+ type: 'contentReady',
+ target: attr.element
+ });
+ };
+
+ if ( Lang.isString(el) ) {
+ _registerHTMLAttr(this, 'id', { value: el });
+ YAHOO.util.Event.onAvailable(el, function() {
+ attr.element = Dom.get(el);
+ this.fireEvent('available', {
+ type: 'available',
+ target: attr.element
+ });
+ }, this, true);
+
+ YAHOO.util.Event.onContentReady(el, function() {
+ readyHandler.call(this);
+ }, this, true);
+ } else {
+ readyHandler.call(this);
+ }
+ }
+};
+
+/**
+ * Sets the value of the property and fires beforeChange and change events.
+ * @private
+ * @method _registerHTMLAttr
+ * @param {YAHOO.util.Element} element The Element instance to
+ * register the config to.
+ * @param {String} key The name of the config to register
+ * @param {Object} map A key-value map of the config's params
+ */
+var _registerHTMLAttr = function(self, key, map) {
+ var el = self.get('element');
+ map = map || {};
+ map.name = key;
+ map.method = map.method || function(value) {
+ el[key] = value;
+ };
+ map.value = map.value || el[key];
+ self._configs[key] = new YAHOO.util.Attribute(map, self);
+};
+
+/**
+ * Fires when the Element's HTMLElement can be retrieved by Id.
+ * <p>See: <a href="#addListener">Element.addListener</a></p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> available<br>
+ * <code><HTMLElement>
+ * target</code> the HTMLElement bound to this Element instance<br>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var target = e.target};<br>
+ * myTabs.addListener('available', handler);</code></p>
+ * @event available
+ */
+
+/**
+ * Fires when the Element's HTMLElement subtree is rendered.
+ * <p>See: <a href="#addListener">Element.addListener</a></p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> contentReady<br>
+ * <code><HTMLElement>
+ * target</code> the HTMLElement bound to this Element instance<br>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var target = e.target};<br>
+ * myTabs.addListener('contentReady', handler);</code></p>
+ * @event contentReady
+ */
+
+YAHOO.augment(YAHOO.util.Element, AttributeProvider);
+})();(function() {
+ var Dom = YAHOO.util.Dom,
+ Event = YAHOO.util.Event,
+ Lang = YAHOO.util.Lang;
+
+ /**
+ * A representation of a Tab's label and content.
+ * @namespace YAHOO.widget
+ * @class Tab
+ * @extends YAHOO.util.Element
+ * @constructor
+ * @param element {HTMLElement | String} (optional) The html element that
+ * represents the TabView. An element will be created if none provided.
+ * @param {Object} properties A key map of initial properties
+ */
+ Tab = function(el, attr) {
+ attr = attr || {};
+ if (arguments.length == 1 && !Lang.isString(el) && !el.nodeName) {
+ attr = el;
+ el = attr.element;
+ }
+
+ if (!el && !attr.element) {
+ el = _createTabElement.call(this, attr);
+ }
+
+ this.loadHandler = {
+ success: function(o) {
+ this.set('content', o.responseText);
+ },
+ failure: function(o) {
+ YAHOO.log('loading failed: ' + o.statusText,
+ 'error', 'Tab');
+ }
+ };
+
+ Tab.superclass.constructor.call(this, el, attr);
+
+ this.DOM_EVENTS = {}; // delegating to tabView
+ };
+
+ YAHOO.extend(Tab, YAHOO.util.Element);
+ var proto = Tab.prototype;
+
+ /**
+ * The default tag name for a Tab's inner element.
+ * @property LABEL_INNER_TAGNAME
+ * @type String
+ * @default "em"
+ */
+ proto.LABEL_TAGNAME = 'em';
+
+ /**
+ * The class name applied to active tabs.
+ * @property ACTIVE_CLASSNAME
+ * @type String
+ * @default "on"
+ */
+ proto.ACTIVE_CLASSNAME = 'selected';
+
+ /**
+ * The class name applied to disabled tabs.
+ * @property DISABLED_CLASSNAME
+ * @type String
+ * @default "disabled"
+ */
+ proto.DISABLED_CLASSNAME = 'disabled';
+
+ /**
+ * The class name applied to dynamic tabs while loading.
+ * @property LOADING_CLASSNAME
+ * @type String
+ * @default "disabled"
+ */
+ proto.LOADING_CLASSNAME = 'loading';
+
+ /**
+ * Provides a reference to the connection request object when data is
+ * loaded dynamically.
+ * @property dataConnection
+ * @type Object
+ */
+ proto.dataConnection = null;
+
+ /**
+ * Object containing success and failure callbacks for loading data.
+ * @property loadHandler
+ * @type object
+ */
+ proto.loadHandler = null;
+
+ /**
+ * Provides a readable name for the tab.
+ * @method toString
+ * @return String
+ */
+ proto.toString = function() {
+ var el = this.get('element');
+ var id = el.id || el.tagName;
+ return "Tab " + id;
+ };
+
+ /**
+ * Registers TabView specific properties.
+ * @method initAttributes
+ * @param {Object} attr Hash of initial attributes
+ */
+ proto.initAttributes = function(attr) {
+ attr = attr || {};
+ Tab.superclass.initAttributes.call(this, attr);
+
+ var el = this.get('element');
+
+ /**
+ * The event that triggers the tab's activation.
+ * @config activationEvent
+ * @type String
+ */
+ this.register('activationEvent', {
+ value: attr.activationEvent || 'click'
+ });
+
+ /**
+ * The element that contains the tab's label.
+ * @config labelEl
+ * @type HTMLElement
+ */
+ this.register('labelEl', {
+ value: attr.labelEl || _getlabelEl.call(this),
+ method: function(value) {
+ var current = this.get('labelEl');
+
+ if (current) {
+ if (current == value) {
+ return false; // already set
+ }
+
+ this.replaceChild(value, current);
+ } else if (el.firstChild) { // ensure label is firstChild by default
+ this.insertBefore(value, el.firstChild);
+ } else {
+ this.appendChild(value);
+ }
+ }
+ });
+
+ /**
+ * The tab's label text (or innerHTML).
+ * @config label
+ * @type String
+ */
+ this.register('label', {
+ value: attr.label || _getLabel.call(this),
+ method: function(value) {
+ var labelEl = this.get('labelEl');
+ if (!labelEl) { // create if needed
+ this.set('labelEl', _createlabelEl.call(this));
+ }
+
+ _setLabel.call(this, value);
+ }
+ });
+
+ /**
+ * The HTMLElement that contains the tab's content.
+ * @config contentEl
+ * @type HTMLElement
+ */
+ this.register('contentEl', { // TODO: apply className?
+ value: attr.contentEl || document.createElement('div'),
+ method: function(value) {
+ var current = this.get('contentEl');
+
+ if (current) {
+ if (current == value) {
+ return false; // already set
+ }
+ this.replaceChild(value, current);
+ }
+ }
+ });
+
+ /**
+ * The tab's content.
+ * @config content
+ * @type String
+ */
+ this.register('content', {
+ value: attr.content, // TODO: what about existing?
+ method: function(value) {
+ this.get('contentEl').innerHTML = value;
+ }
+ });
+
+ var _dataLoaded = false;
+
+ /**
+ * The tab's data source, used for loading content dynamically.
+ * @config dataSrc
+ * @type String
+ */
+ this.register('dataSrc', {
+ value: attr.dataSrc
+ });
+
+ /**
+ * Whether or not content should be reloaded for every view.
+ * @config cacheData
+ * @type Boolean
+ * @default false
+ */
+ this.register('cacheData', {
+ value: attr.cacheData || false,
+ validator: Lang.isBoolean
+ });
+
+ /**
+ * The method to use for the data request.
+ * @config loadMethod
+ * @type String
+ * @default "GET"
+ */
+ this.register('loadMethod', {
+ value: attr.loadMethod || 'GET',
+ validator: Lang.isString
+ });
+
+ /**
+ * Whether or not any data has been loaded from the server.
+ * @config dataLoaded
+ * @type Boolean
+ */
+ this.register('dataLoaded', {
+ value: false,
+ validator: Lang.isBoolean,
+ writeOnce: true
+ });
+
+ /**
+ * Number if milliseconds before aborting and calling failure handler.
+ * @config dataTimeout
+ * @type Number
+ * @default null
+ */
+ this.register('dataTimeout', {
+ value: attr.dataTimeout || null,
+ validator: Lang.isNumber
+ });
+
+ /**
+ * Whether or not the tab is currently active.
+ * If a dataSrc is set for the tab, the content will be loaded from
+ * the given source.
+ * @config active
+ * @type Boolean
+ */
+ this.register('active', {
+ value: attr.active || this.hasClass(this.ACTIVE_CLASSNAME),
+ method: function(value) {
+ if (value === true) {
+ this.addClass(this.ACTIVE_CLASSNAME);
+ this.set('title', 'active');
+ } else {
+ this.removeClass(this.ACTIVE_CLASSNAME);
+ this.set('title', '');
+ }
+ },
+ validator: function(value) {
+ return Lang.isBoolean(value) && !this.get('disabled') ;
+ }
+ });
+
+ /**
+ * Whether or not the tab is disabled.
+ * @config disabled
+ * @type Boolean
+ */
+ this.register('disabled', {
+ value: attr.disabled || this.hasClass(this.DISABLED_CLASSNAME),
+ method: function(value) {
+ if (value === true) {
+ Dom.addClass(this.get('element'), this.DISABLED_CLASSNAME);
+ } else {
+ Dom.removeClass(this.get('element'), this.DISABLED_CLASSNAME);
+ }
+ },
+ validator: Lang.isBoolean
+ });
+
+ /**
+ * The href of the tab's anchor element.
+ * @config href
+ * @type String
+ * @default '#'
+ */
+ this.register('href', {
+ value: attr.href || '#',
+ method: function(value) {
+ this.getElementsByTagName('a')[0].href = value;
+ },
+ validator: Lang.isString
+ });
+
+ /**
+ * The Whether or not the tab's content is visible.
+ * @config contentVisible
+ * @type Boolean
+ * @default false
+ */
+ this.register('contentVisible', {
+ value: attr.contentVisible,
+ method: function(value) {
+ if (value == true) {
+ this.get('contentEl').style.display = 'block';
+
+ if ( this.get('dataSrc') ) {
+ // load dynamic content unless already loaded and caching
+ if ( !this.get('dataLoaded') || !this.get('cacheData') ) {
+ _dataConnect.call(this);
+ }
+ }
+ } else {
+ this.get('contentEl').style.display = 'none';
+ }
+ },
+ validator: Lang.isBoolean
+ });
+ };
+
+ var _createTabElement = function(attr) {
+ var el = document.createElement('li');
+ var a = document.createElement('a');
+
+ a.href = attr.href || '#';
+
+ el.appendChild(a);
+
+ var label = attr.label || null;
+ var labelEl = attr.labelEl || null;
+
+ if (labelEl) { // user supplied labelEl
+ if (!label) { // user supplied label
+ label = _getLabel.call(this, labelEl);
+ }
+ } else {
+ labelEl = _createlabelEl.call(this);
+ }
+
+ a.appendChild(labelEl);
+
+ return el;
+ };
+
+ var _getlabelEl = function() {
+ return this.getElementsByTagName(this.LABEL_TAGNAME)[0];
+ };
+
+ var _createlabelEl = function() {
+ var el = document.createElement(this.LABEL_TAGNAME);
+ return el;
+ };
+
+ var _setLabel = function(label) {
+ var el = this.get('labelEl');
+ el.innerHTML = label;
+ };
+
+ var _getLabel = function() {
+ var label,
+ el = this.get('labelEl');
+
+ if (!el) {
+ return undefined;
+ }
+
+ return el.innerHTML;
+ };
+
+ var _dataConnect = function() {
+ if (!YAHOO.util.Connect) {
+ YAHOO.log('YAHOO.util.Connect dependency not met',
+ 'error', 'Tab');
+ return false;
+ }
+
+ Dom.addClass(this.get('contentEl').parentNode, this.LOADING_CLASSNAME);
+
+ this.dataConnection = YAHOO.util.Connect.asyncRequest(
+ this.get('loadMethod'),
+ this.get('dataSrc'),
+ {
+ success: function(o) {
+ this.loadHandler.success.call(this, o);
+ this.set('dataLoaded', true);
+ this.dataConnection = null;
+ Dom.removeClass(this.get('contentEl').parentNode,
+ this.LOADING_CLASSNAME);
+ },
+ failure: function(o) {
+ this.loadHandler.failure.call(this, o);
+ this.dataConnection = null;
+ Dom.removeClass(this.get('contentEl').parentNode,
+ this.LOADING_CLASSNAME);
+ },
+ scope: this,
+ timeout: this.get('dataTimeout')
+ }
+ );
+ };
+
+ YAHOO.widget.Tab = Tab;
+
+ /**
+ * Fires before the active state is changed.
+ * <p>See: <a href="YAHOO.util.Element.html#addListener">Element.addListener</a></p>
+ * <p>If handler returns false, the change will be cancelled, and the value will not
+ * be set.</p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> beforeActiveChange<br>
+ * <code><Boolean>
+ * prevValue</code> the current value<br>
+ * <code><Boolean>
+ * newValue</code> the new value</p>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var previous = e.prevValue};<br>
+ * myTabs.addListener('beforeActiveChange', handler);</code></p>
+ * @event beforeActiveChange
+ */
+
+ /**
+ * Fires after the active state is changed.
+ * <p>See: <a href="YAHOO.util.Element.html#addListener">Element.addListener</a></p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> activeChange<br>
+ * <code><Boolean>
+ * prevValue</code> the previous value<br>
+ * <code><Boolean>
+ * newValue</code> the updated value</p>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var previous = e.prevValue};<br>
+ * myTabs.addListener('activeChange', handler);</code></p>
+ * @event activeChange
+ */
+
+ /**
+ * Fires before the tab label is changed.
+ * <p>See: <a href="YAHOO.util.Element.html#addListener">Element.addListener</a></p>
+ * <p>If handler returns false, the change will be cancelled, and the value will not
+ * be set.</p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> beforeLabelChange<br>
+ * <code><String>
+ * prevValue</code> the current value<br>
+ * <code><String>
+ * newValue</code> the new value</p>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var previous = e.prevValue};<br>
+ * myTabs.addListener('beforeLabelChange', handler);</code></p>
+ * @event beforeLabelChange
+ */
+
+ /**
+ * Fires after the tab label is changed.
+ * <p>See: <a href="YAHOO.util.Element.html#addListener">Element.addListener</a></p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> labelChange<br>
+ * <code><String>
+ * prevValue</code> the previous value<br>
+ * <code><String>
+ * newValue</code> the updated value</p>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var previous = e.prevValue};<br>
+ * myTabs.addListener('labelChange', handler);</code></p>
+ * @event labelChange
+ */
+
+ /**
+ * Fires before the tab content is changed.
+ * <p>See: <a href="YAHOO.util.Element.html#addListener">Element.addListener</a></p>
+ * <p>If handler returns false, the change will be cancelled, and the value will not
+ * be set.</p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> beforeContentChange<br>
+ * <code><String>
+ * prevValue</code> the current value<br>
+ * <code><String>
+ * newValue</code> the new value</p>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var previous = e.prevValue};<br>
+ * myTabs.addListener('beforeContentChange', handler);</code></p>
+ * @event beforeContentChange
+ */
+
+ /**
+ * Fires after the tab content is changed.
+ * <p>See: <a href="YAHOO.util.Element.html#addListener">Element.addListener</a></p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> contentChange<br>
+ * <code><String>
+ * prevValue</code> the previous value<br>
+ * <code><Boolean>
+ * newValue</code> the updated value</p>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var previous = e.prevValue};<br>
+ * myTabs.addListener('contentChange', handler);</code></p>
+ * @event contentChange
+ */
+})();(function() {
+
+ /**
+ * The tabview module provides a widget for managing content bound to tabs.
+ * @module tabview
+ *
+ */
+ /**
+ * A widget to control tabbed views.
+ * @namespace YAHOO.widget
+ * @class TabView
+ * @extends YAHOO.util.Element
+ * @constructor
+ * @param {HTMLElement | String | Object} el(optional) The html
+ * element that represents the TabView, or the attribute object to use.
+ * An element will be created if none provided.
+ * @param {Object} attr (optional) A key map of the tabView's
+ * initial attributes. Ignored if first arg is attributes object.
+ */
+ YAHOO.widget.TabView = function(el, attr) {
+ attr = attr || {};
+ if (arguments.length == 1 && !Lang.isString(el) && !el.nodeName) {
+ attr = el; // treat first arg as attr object
+ el = attr.element || null;
+ }
+
+ if (!el && !attr.element) { // create if we dont have one
+ el = _createTabViewElement.call(this, attr);
+ }
+ YAHOO.widget.TabView.superclass.constructor.call(this, el, attr);
+ };
+
+ YAHOO.extend(YAHOO.widget.TabView, YAHOO.util.Element);
+
+ var proto = YAHOO.widget.TabView.prototype;
+ var Dom = YAHOO.util.Dom;
+ var Lang = YAHOO.util.Lang;
+ var Event = YAHOO.util.Event;
+ var Tab = YAHOO.widget.Tab;
+
+
+ /**
+ * The className to add when building from scratch.
+ * @property CLASSNAME
+ * @default "navset"
+ */
+ proto.CLASSNAME = 'yui-navset';
+
+ /**
+ * The className of the HTMLElement containing the TabView's tab elements
+ * to look for when building from existing markup, or to add when building
+ * from scratch.
+ * All childNodes of the tab container are treated as Tabs when building
+ * from existing markup.
+ * @property TAB_PARENT_CLASSNAME
+ * @default "nav"
+ */
+ proto.TAB_PARENT_CLASSNAME = 'yui-nav';
+
+ /**
+ * The className of the HTMLElement containing the TabView's label elements
+ * to look for when building from existing markup, or to add when building
+ * from scratch.
+ * All childNodes of the content container are treated as content elements when
+ * building from existing markup.
+ * @property CONTENT_PARENT_CLASSNAME
+ * @default "nav-content"
+ */
+ proto.CONTENT_PARENT_CLASSNAME = 'yui-content';
+
+ proto._tabParent = null;
+ proto._contentParent = null;
+
+ /**
+ * Adds a Tab to the TabView instance.
+ * If no index is specified, the tab is added to the end of the tab list.
+ * @method addTab
+ * @param {YAHOO.widget.Tab} tab A Tab instance to add.
+ * @param {Integer} index The position to add the tab.
+ * @return void
+ */
+ proto.addTab = function(tab, index) {
+ var tabs = this.get('tabs');
+ if (!tabs) { // not ready yet
+ this._queue[this._queue.length] = ['addTab', arguments];
+ return false;
+ }
+
+ index = (index === undefined) ? tabs.length : index;
+
+ var before = this.getTab(index);
+
+ var self = this;
+ var el = this.get('element');
+ var tabParent = this._tabParent;
+ var contentParent = this._contentParent;
+
+ var tabElement = tab.get('element');
+ var contentEl = tab.get('contentEl');
+
+ if ( before ) {
+ tabParent.insertBefore(tabElement, before.get('element'));
+ } else {
+ tabParent.appendChild(tabElement);
+ }
+
+ if ( contentEl && !Dom.isAncestor(contentParent, contentEl) ) {
+ contentParent.appendChild(contentEl);
+ }
+
+ if ( !tab.get('active') ) {
+ tab.set('contentVisible', false, true); /* hide if not active */
+ } else {
+ this.set('activeTab', tab, true);
+
+ }
+
+ var activate = function(e) {
+ YAHOO.util.Event.preventDefault(e);
+ self.set('activeTab', this);
+ };
+
+ tab.addListener( tab.get('activationEvent'), activate);
+
+ tab.addListener('activationEventChange', function(e) {
+ if (e.prevValue != e.newValue) {
+ tab.removeListener(e.prevValue, activate);
+ tab.addListener(e.newValue, activate);
+ }
+ });
+
+ tabs.splice(index, 0, tab);
+ };
+
+ /**
+ * Routes childNode events.
+ * @method DOMEventHandler
+ * @param {event} e The Dom event that is being handled.
+ * @return void
+ */
+ proto.DOMEventHandler = function(e) {
+ var el = this.get('element');
+ var target = YAHOO.util.Event.getTarget(e);
+ var tabParent = this._tabParent;
+
+ if (Dom.isAncestor(tabParent, target) ) {
+ var tabEl;
+ var tab = null;
+ var contentEl;
+ var tabs = this.get('tabs');
+
+ for (var i = 0, len = tabs.length; i < len; i++) {
+ tabEl = tabs[i].get('element');
+ contentEl = tabs[i].get('contentEl');
+
+ if ( target == tabEl || Dom.isAncestor(tabEl, target) ) {
+ tab = tabs[i];
+ break; // note break
+ }
+ }
+
+ if (tab) {
+ tab.fireEvent(e.type, e);
+ }
+ }
+ };
+
+ /**
+ * Returns the Tab instance at the specified index.
+ * @method getTab
+ * @param {Integer} index The position of the Tab.
+ * @return YAHOO.widget.Tab
+ */
+ proto.getTab = function(index) {
+ return this.get('tabs')[index];
+ };
+
+ /**
+ * Returns the index of given tab.
+ * @method getTabIndex
+ * @param {YAHOO.widget.Tab} tab The tab whose index will be returned.
+ * @return int
+ */
+ proto.getTabIndex = function(tab) {
+ var index = null;
+ var tabs = this.get('tabs');
+ for (var i = 0, len = tabs.length; i < len; ++i) {
+ if (tab == tabs[i]) {
+ index = i;
+ break;
+ }
+ }
+
+ return index;
+ };
+
+ /**
+ * Removes the specified Tab from the TabView.
+ * @method removeTab
+ * @param {YAHOO.widget.Tab} item The Tab instance to be removed.
+ * @return void
+ */
+ proto.removeTab = function(tab) {
+ var tabCount = this.get('tabs').length;
+
+ var index = this.getTabIndex(tab);
+ var nextIndex = index + 1;
+ if ( tab == this.get('activeTab') ) { // select next tab
+ if (tabCount > 1) {
+ if (index + 1 == tabCount) {
+ this.set('activeIndex', index - 1);
+ } else {
+ this.set('activeIndex', index + 1);
+ }
+ }
+ }
+
+ this._tabParent.removeChild( tab.get('element') );
+ this._contentParent.removeChild( tab.get('contentEl') );
+ this._configs.tabs.value.splice(index, 1);
+
+ };
+
+ /**
+ * Provides a readable name for the TabView instance.
+ * @method toString
+ * @return String
+ */
+ proto.toString = function() {
+ var name = this.get('id') || this.get('tagName');
+ return "TabView " + name;
+ };
+
+ /**
+ * The transiton to use when switching between tabs.
+ * @method contentTransition
+ */
+ proto.contentTransition = function(newTab, oldTab) {
+ newTab.set('contentVisible', true);
+ oldTab.set('contentVisible', false);
+ };
+
+ /**
+ * Registers TabView specific properties.
+ * @method initAttributes
+ * @param {Object} attr Hash of initial attributes
+ */
+ proto.initAttributes = function(attr) {
+ YAHOO.widget.TabView.superclass.initAttributes.call(this, attr);
+
+ if (!attr.orientation) {
+ attr.orientation = 'top';
+ }
+
+ var el = this.get('element');
+
+ /**
+ * The Tabs belonging to the TabView instance.
+ * @config tabs
+ * @type Array
+ */
+ this.register('tabs', {
+ value: [],
+ readOnly: true
+ });
+
+ /**
+ * The container of the tabView's label elements.
+ * @property _tabParent
+ * @private
+ * @type HTMLElement
+ */
+ this._tabParent =
+ this.getElementsByClassName(this.TAB_PARENT_CLASSNAME,
+ 'ul' )[0] || _createTabParent.call(this);
+
+ /**
+ * The container of the tabView's content elements.
+ * @property _contentParent
+ * @type HTMLElement
+ * @private
+ */
+ this._contentParent =
+ this.getElementsByClassName(this.CONTENT_PARENT_CLASSNAME,
+ 'div')[0] || _createContentParent.call(this);
+
+ /**
+ * How the Tabs should be oriented relative to the TabView.
+ * @config orientation
+ * @type String
+ * @default "top"
+ */
+ this.register('orientation', {
+ value: attr.orientation,
+ method: function(value) {
+ var current = this.get('orientation');
+ this.addClass('yui-navset-' + value);
+
+ if (current != value) {
+ this.removeClass('yui-navset-' + current);
+ }
+
+ switch(value) {
+ case 'bottom':
+ this.appendChild(this._tabParent);
+ break;
+ }
+ }
+ });
+
+ /**
+ * The index of the tab currently active.
+ * @config activeIndex
+ * @type Int
+ */
+ this.register('activeIndex', {
+ value: attr.activeIndex,
+ method: function(value) {
+ this.set('activeTab', this.getTab(value));
+ },
+ validator: function(value) {
+ return !this.getTab(value).get('disabled'); // cannot activate if disabled
+ }
+ });
+
+ /**
+ * The tab currently active.
+ * @config activeTab
+ * @type YAHOO.widget.Tab
+ */
+ this.register('activeTab', {
+ value: attr.activeTab,
+ method: function(tab) {
+ var activeTab = this.get('activeTab');
+
+ if (tab) {
+ tab.set('active', true);
+ }
+
+ if (activeTab && activeTab != tab) {
+ activeTab.set('active', false);
+ }
+
+ if (activeTab && tab != activeTab) { // no transition if only 1
+ this.contentTransition(tab, activeTab);
+ } else if (tab) {
+ tab.set('contentVisible', true);
+ }
+ },
+ validator: function(value) {
+ return !value.get('disabled'); // cannot activate if disabled
+ }
+ });
+
+ if ( this._tabParent ) {
+ _initTabs.call(this);
+ }
+
+ for (var type in this.DOM_EVENTS) {
+ if ( this.DOM_EVENTS.hasOwnProperty(type) ) {
+ this.addListener.call(this, type, this.DOMEventHandler);
+ }
+ }
+ };
+
+ /**
+ * Creates Tab instances from a collection of HTMLElements.
+ * @method createTabs
+ * @private
+ * @param {Array|HTMLCollection} elements The elements to use for Tabs.
+ * @return void
+ */
+ var _initTabs = function() {
+ var tab,
+ attr,
+ contentEl;
+
+ var el = this.get('element');
+ var tabs = _getChildNodes(this._tabParent);
+ var contentElements = _getChildNodes(this._contentParent);
+
+ for (var i = 0, len = tabs.length; i < len; ++i) {
+ attr = {};
+
+ if (contentElements[i]) {
+ attr.contentEl = contentElements[i];
+ }
+
+ tab = new YAHOO.widget.Tab(tabs[i], attr);
+ this.addTab(tab);
+
+ if (tab.hasClass(tab.ACTIVE_CLASSNAME) ) {
+ this._configs.activeTab.value = tab; // dont invoke method
+ }
+ }
+ };
+
+ var _createTabViewElement = function(attr) {
+ var el = document.createElement('div');
+
+ if ( this.CLASSNAME ) {
+ el.className = this.CLASSNAME;
+ }
+
+ return el;
+ };
+
+ var _createTabParent = function(attr) {
+ var el = document.createElement('ul');
+
+ if ( this.TAB_PARENT_CLASSNAME ) {
+ el.className = this.TAB_PARENT_CLASSNAME;
+ }
+
+ this.get('element').appendChild(el);
+
+ return el;
+ };
+
+ var _createContentParent = function(attr) {
+ var el = document.createElement('div');
+
+ if ( this.CONTENT_PARENT_CLASSNAME ) {
+ el.className = this.CONTENT_PARENT_CLASSNAME;
+ }
+
+ this.get('element').appendChild(el);
+
+ return el;
+ };
+
+ var _getChildNodes = function(el) {
+ var nodes = [];
+ var childNodes = el.childNodes;
+
+ for (var i = 0, len = childNodes.length; i < len; ++i) {
+ if (childNodes[i].nodeType == 1) {
+ nodes[nodes.length] = childNodes[i];
+ }
+ }
+
+ return nodes;
+ };
+
+/**
+ * Fires before the activeTab is changed.
+ * <p>See: <a href="YAHOO.util.Element.html#addListener">Element.addListener</a></p>
+ * <p>If handler returns false, the change will be cancelled, and the value will not
+ * be set.</p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> beforeActiveTabChange<br>
+ * <code><<a href="YAHOO.widget.Tab.html">YAHOO.widget.Tab</a>>
+ * prevValue</code> the currently active tab<br>
+ * <code><<a href="YAHOO.widget.Tab.html">YAHOO.widget.Tab</a>>
+ * newValue</code> the tab to be made active</p>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var previous = e.prevValue};<br>
+ * myTabs.addListener('beforeActiveTabChange', handler);</code></p>
+ * @event beforeActiveTabChange
+ */
+
+/**
+ * Fires after the activeTab is changed.
+ * <p>See: <a href="YAHOO.util.Element.html#addListener">Element.addListener</a></p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> activeTabChange<br>
+ * <code><<a href="YAHOO.widget.Tab.html">YAHOO.widget.Tab</a>>
+ * prevValue</code> the formerly active tab<br>
+ * <code><<a href="YAHOO.widget.Tab.html">YAHOO.widget.Tab</a>>
+ * newValue</code> the new active tab</p>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var previous = e.prevValue};<br>
+ * myTabs.addListener('activeTabChange', handler);</code></p>
+ * @event activeTabChange
+ */
+
+/**
+ * Fires before the orientation is changed.
+ * <p>See: <a href="YAHOO.util.Element.html#addListener">Element.addListener</a></p>
+ * <p>If handler returns false, the change will be cancelled, and the value will not
+ * be set.</p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> beforeOrientationChange<br>
+ * <code><String>
+ * prevValue</code> the current orientation<br>
+ * <code><String>
+ * newValue</code> the new orientation to be applied</p>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var previous = e.prevValue};<br>
+ * myTabs.addListener('beforeOrientationChange', handler);</code></p>
+ * @event beforeOrientationChange
+ */
+
+/**
+ * Fires after the orientation is changed.
+ * <p>See: <a href="YAHOO.util.Element.html#addListener">Element.addListener</a></p>
+ * <p><strong>Event fields:</strong><br>
+ * <code><String> type</code> orientationChange<br>
+ * <code><String>
+ * prevValue</code> the former orientation<br>
+ * <code><String>
+ * newValue</code> the new orientation</p>
+ * <p><strong>Usage:</strong><br>
+ * <code>var handler = function(e) {var previous = e.prevValue};<br>
+ * myTabs.addListener('orientationChange', handler);</code></p>
+ * @event orientationChange
+ */
+})();
\ No newline at end of file
Modified: jifty/branches/template-declare/share/web/templates/__jifty/admin/fragments/list/list
==============================================================================
--- jifty/branches/template-declare/share/web/templates/__jifty/admin/fragments/list/list (original)
+++ jifty/branches/template-declare/share/web/templates/__jifty/admin/fragments/list/list Mon Dec 18 05:32:52 2006
@@ -15,6 +15,7 @@
limit_field, limit_val allow add to your sql query
... WHERE $limit_field = $limit_val
+so you can make "sub views" on a table limited by limit_field / limit_val
</%doc>
<%args>
@@ -79,13 +80,15 @@
<span class="page-count"><%_('Page %1 of %2', $page, $collection->pager->last_page) %></span>
% }
+<div class="list">
% if ($collection->pager->total_entries == 0) {
- No items found
+ <% _('No items found') %>
+% } else {
+ <% _('%1 entries', $collection-> count) %>
+ <& $list_path.'header', object_type => $object_type, list_path => $list_path,
+ mask_field => $limit_field, mask_val => $limit_val, sort_by => $sort_by, order => $order &>
% }
-<div class="list">
-<& $list_path.'header', object_type => $object_type, list_path => $list_path,
- mask_field => $limit_field, mask_val => $limit_val, sort_by => $sort_by, order => $order &>
<%perl>
while ( my $item = $collection->next ) {
Jifty->web->region(
Modified: jifty/branches/template-declare/share/web/templates/__jifty/admin/index.html
==============================================================================
--- jifty/branches/template-declare/share/web/templates/__jifty/admin/index.html (original)
+++ jifty/branches/template-declare/share/web/templates/__jifty/admin/index.html Mon Dec 18 05:32:52 2006
@@ -1,12 +1,12 @@
-<&|/_elements/wrapper, title => 'Jifty Administrative Console' &>
+<&| /_elements/wrapper, title => _('Jifty Administrative Console') &>
-<h1><%_('Database Administration')%></h1>
+<h1><% _('Database Administration') %></h1>
-<p><%_('This console lets you manage the records in your Jifty database. Below, you should see a list of all your database tables. Feel free to go through and add, delete or modify records.')%></p>
+<p><% _('This console lets you manage the records in your Jifty database. Below, you should see a list of all your database tables. Feel free to go through and add, delete or modify records.') %></p>
-<p><%_('To disable this administrative console, add "AdminMode: 0" under the "framework:" settings in the config file (etc/config.yml).')%></p>
+<p><% _('To disable this administrative console, add "AdminMode: 0" under the "framework:" settings in the config file (etc/config.yml).') %></p>
-<h2><%_('Models')%></h2>
+<h2><% _('Models') %></h2>
<ul>
% foreach my $model (Jifty->class_loader->models) {
% next unless $model->isa('Jifty::Record');
@@ -16,7 +16,7 @@
%}
</ul>
-<h2><%_('Actions')%></h2>
+<h2><% _('Actions') %></h2>
<ul>
% foreach my $action (Jifty->api->actions) {
% Jifty::Util->require($action);
@@ -25,7 +25,7 @@
% }
</ul>
-<h2>Done?</h2>
+<h2><% _('Done?') %></h2>
<% Jifty->web->return( to => "/", label => _('Back to the application')) %>
</&>
Modified: jifty/branches/template-declare/share/web/templates/__jifty/admin/model/dhandler
==============================================================================
--- jifty/branches/template-declare/share/web/templates/__jifty/admin/model/dhandler (original)
+++ jifty/branches/template-declare/share/web/templates/__jifty/admin/model/dhandler Mon Dec 18 05:32:52 2006
@@ -5,18 +5,19 @@
my $records = $collection_class->new();
$records->unlimit;
</%init>
-<&|/_elements/wrapper &>
-<h1>Manage records: <%$object_type%></h1>
-<% Jifty->web->form->start %>
+<&| /_elements/wrapper, title => _("Manage $object_type records") &>
+
+<h1><% _('Manage records:') %> <%$object_type%></h1>
+
+<% Jifty->web->form->start %>
<% Jifty->web->region(name => "admin-$object_type",
path => "/__jifty/admin/fragments/list/list",
defaults => { object_type => $object_type ,
render_submit => 1 }) %>
-
<% Jifty->web->form->end %>
-<h2>Done?</h2>
+<h2> <% _('Done?') %> </h2>
<% Jifty->web->link( url => "/__jifty/admin/", label => _('Back to the admin console')) %>
</&>
More information about the Jifty-commit
mailing list