[jifty-devel] Re: [Jifty-commit] r2341 - in jifty/trunk/share: web/static/css web/static/images/css web/templates/__jifty/admin/fragments/list

[Jesse Vincent]

On Thu, Dec 07, 2006 at 05:28:15AM -0500, jifty-commit at lists.jifty.org wrote:
> Author: yves
> Date: Thu Dec  7 05:28:14 2006
> New Revision: 2341


Just for coherency's sake, where did the icons come from? It may make
sense to import more silk icons (http://www.famfamfam.com/lab/icons/silk/).

> 
> Added:
>    jifty/trunk/share/web/static/images/css/down.png   (contents, props changed)
>    jifty/trunk/share/web/static/images/css/up.png   (contents, props changed)
> Modified:
>    jifty/trunk/share/po/fr.po
>    jifty/trunk/share/web/static/css/forms.css
>    jifty/trunk/share/web/templates/__jifty/admin/fragments/list/header
>    jifty/trunk/share/web/templates/__jifty/admin/fragments/list/list
> 
> Log:
> admin interface: cosmetics change
> 
> 
> Modified: jifty/trunk/share/po/fr.po
> ==============================================================================
> --- jifty/trunk/share/po/fr.po	(original)
> +++ jifty/trunk/share/po/fr.po	Thu Dec  7 05:28:14 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/trunk/share/web/static/css/forms.css
> ==============================================================================
> --- jifty/trunk/share/web/static/css/forms.css	(original)
> +++ jifty/trunk/share/web/static/css/forms.css	Thu Dec  7 05:28:14 2006
> @@ -135,6 +135,44 @@
>      float: right;
>  }
>  
> +.jifty_admin_header {
> +    display: inline;
> +}
> +
> +.jifty_admin_header a {
> +    width: 13px;
> +    color: white;
> +    display: block;
> +}
> +
> +.field {
> +    float: left;
> +    margin: 0.15em;
> +    font-weight: bold;
> +}
> +
> +.down {
> +    float: left;
> +    background: url(/static/images/css/down.png) no-repeat left;
> +}
> +
> +.down_select {
> +    float: left;
> +    background: url(/static/images/css/down.png) no-repeat left;
> +    border-bottom: 2px solid black;
> +}
> +
> +.up {
> +    float: left;
> +    background: url(/static/images/css/up.png) no-repeat top left;
> +} 
> +
> +.up_select {
> +    float: left;
> +    background: url(/static/images/css/up.png) no-repeat top left;
> +    border-top: 2px solid black;
> +} 
> +
>  div.subline {
>      display: inline;
>      float: left;  
> 
> Added: jifty/trunk/share/web/static/images/css/down.png
> ==============================================================================
> Binary file. No diff available.
> 
> Added: jifty/trunk/share/web/static/images/css/up.png
> ==============================================================================
> Binary file. No diff available.
> 
> Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/header
> ==============================================================================
> --- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/header	(original)
> +++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/header	Thu Dec  7 05:28:14 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   => ".",
>          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   => ",",
>          onclick => 
>              {
>              replace_with => $list_path.'list',
> @@ -49,8 +53,8 @@
>              },
>          #as_button => 1
>          )
> -%>
> - <%$argument%>
> +%></span>
> +<span class="field"><% $argument %></span>
>  % }
>  % }
>  <hr />
> 
> Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/list
> ==============================================================================
> --- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/list	(original)
> +++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/list	Thu Dec  7 05:28:14 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(
> _______________________________________________
> Jifty-commit mailing list
> Jifty-commit at lists.jifty.org
> http://lists.jifty.org/cgi-bin/mailman/listinfo/jifty-commit
> 

--