[Jifty-commit] r2345 - in jifty/branches/template-declare: . debian
share/po share/web/static/css
share/web/templates/__jifty/admin/fragments/list
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Fri Dec 8 06:52:20 EST 2006
Author: audreyt
Date: Fri Dec 8 06:52:16 2006
New Revision: 2345
Added:
jifty/branches/template-declare/share/web/static/images/css/bullet_arrow_down.png (contents, props changed)
jifty/branches/template-declare/share/web/static/images/css/bullet_arrow_up.png (contents, props changed)
Modified:
jifty/branches/template-declare/ (props changed)
jifty/branches/template-declare/debian/control
jifty/branches/template-declare/share/po/fr.po
jifty/branches/template-declare/share/web/static/css/forms.css
jifty/branches/template-declare/share/web/templates/__jifty/admin/fragments/list/header
jifty/branches/template-declare/share/web/templates/__jifty/admin/fragments/list/list
Log:
* Merge down to t-d branch.
Modified: jifty/branches/template-declare/debian/control
==============================================================================
--- jifty/branches/template-declare/debian/control (original)
+++ jifty/branches/template-declare/debian/control Fri Dec 8 06:52:16 2006
@@ -81,7 +81,8 @@
libtest-pod-coverage-perl, libtest-www-mechanize-perl
(>> 1.04), libwww-mechanize-perl (>> 1.12),
libclass-accessor-named-perl, libdevel-cover-perl,
- libmodule-install-perl, libpar-dist-fromcpan-perl
+ libmodule-install-perl, libpar-dist-fromcpan-perl, libtest-mockobject-perl,
+ libtest-mockmodule-perl
Description: Jifty perl libraries
Yet another web framework.
.
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 Fri Dec 8 06:52:16 2006
@@ -135,7 +135,7 @@
#: share/web/templates/__jifty/admin/fragments/list/view:29
msgid "Confirm delete?"
-msgstr "Confirmer l'effacment ?"
+msgstr "Confirmer l'effacement ?"
#: share/web/templates/__jifty/admin/fragments/list/new_item:17
msgid "Create"
@@ -206,7 +206,7 @@
#: lib/Jifty/Action/Record/Search.pm:130
msgid "No field contains"
-msgstr "Aucun champ contient"
+msgstr "Aucun champs contient"
#: lib/Jifty/Web.pm:297
msgid "No request to handle"
Modified: jifty/branches/template-declare/share/web/static/css/forms.css
==============================================================================
--- jifty/branches/template-declare/share/web/static/css/forms.css (original)
+++ jifty/branches/template-declare/share/web/static/css/forms.css Fri Dec 8 06:52:16 2006
@@ -135,6 +135,62 @@
float: right;
}
+.jifty_admin_header {
+ display: inline;
+}
+
+.jifty_admin_header a {
+ color: black;
+ display: block;
+ font-size: 0.6em;
+ height: 100%;
+ text-decoration: none;
+ font-family : sans-serif;
+}
+
+.field {
+ float: left;
+ margin: 0.15em 0.5em 0.15em 0.15em;
+ font-weight: bold;
+}
+
+.down {
+ height : 1.5em;
+ float: left;
+ background: url(/static/images/css/bullet_arrow_down.png) no-repeat bottom center;
+ margin-right: 0.2em;
+}
+
+.down_select {
+ height : 1.5em;
+ float: left;
+ background: url(/static/images/css/bullet_arrow_down.png) no-repeat bottom center;
+ margin-right: 0.2em;
+}
+
+.down_select a {
+ font-weight: bold;
+ color: #900;
+}
+
+.up {
+ height : 1.5em;
+ float: left;
+ background: url(/static/images/css/bullet_arrow_up.png) no-repeat bottom center;
+ margin-right: 0.2em;
+}
+
+.up_select {
+ height : 1.5em;
+ float: left;
+ background: url(/static/images/css/bullet_arrow_up.png) no-repeat bottom center;
+ margin-right: 0.2em;
+}
+
+.up_select a {
+ font-weight: bold;
+ color: #900;
+
div.subline {
display: inline;
float: left;
Added: jifty/branches/template-declare/share/web/static/images/css/bullet_arrow_down.png
==============================================================================
Binary file. No diff available.
Added: jifty/branches/template-declare/share/web/static/images/css/bullet_arrow_up.png
==============================================================================
Binary file. No diff available.
Modified: jifty/branches/template-declare/share/web/templates/__jifty/admin/fragments/list/header
==============================================================================
--- jifty/branches/template-declare/share/web/templates/__jifty/admin/fragments/list/header (original)
+++ jifty/branches/template-declare/share/web/templates/__jifty/admin/fragments/list/header Fri Dec 8 06:52:16 2006
@@ -2,6 +2,8 @@
$object_type
$mask_val => ""
$mask_field => ""
+$sort_by => ""
+$order => ""
$list_path
</%args>
<%init>
@@ -9,14 +11,15 @@
my $record = $record_class->new();
my $update = Jifty->web->new_action(class => 'Update'.$object_type);
</%init>
-<div class="jifty_admin">
+<div class="jifty_admin_header">
% foreach my $argument ($update->argument_names) {
% unless( $argument eq $mask_field || $argument eq 'id' || $argument =~ /_confirm$/i
% && lc $update->arguments->{$argument}{render_as} eq 'password') {
+<span class="<% ($sort_by && !$order && $sort_by eq $argument)?'up_select':'up' %>">
<%
Jifty->web->link(
- label => "[A]",
+ label => _("asc"),
onclick =>
{
replace_with => $list_path.'list' ,
@@ -31,10 +34,11 @@
},
#as_button => 1
)
-%>
+%></span>
+<span class="<% ($sort_by && $order && $sort_by eq $argument )?'down_select':'down' %>">
<%
Jifty->web->link(
- label => "[D]",
+ label => _("desc"),
onclick =>
{
replace_with => $list_path.'list',
@@ -49,8 +53,8 @@
},
#as_button => 1
)
-%>
- <%$argument%>
+%></span>
+<span class="field"><% $argument %></span>
% }
% }
<hr />
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 Fri Dec 8 06:52:16 2006
@@ -9,7 +9,7 @@
list_path => '/admin/fragments/list/',
limit_field => 'domain',
limit_val => $domain,
- search_slot => 0,
+ search_slot => 0
per_page => 5,
render_submit => 1 }) %>
@@ -85,7 +85,7 @@
<div class="list">
<& $list_path.'header', object_type => $object_type, list_path => $list_path,
- mask_field => $limit_field, mask_val => $limit_val &>
+ mask_field => $limit_field, mask_val => $limit_val, sort_by => $sort_by, order => $order &>
<%perl>
while ( my $item = $collection->next ) {
Jifty->web->region(
More information about the Jifty-commit
mailing list