[Jifty-commit] jifty branch, master, updated. d9e6593323771f66f959198b3957f3aea04efffd

[Jifty commits]

The branch, master has been updated
       via  d9e6593323771f66f959198b3957f3aea04efffd (commit)
       via  26142746816b1c953195679487d191b69c950022 (commit)
      from  2fe15ddcecd2194a3cbd9af5916e7f023de3eadd (commit)

Summary of changes:
 lib/Jifty/Web/Form/Field/InlineButton.pm |    1 +
 lib/Jifty/Web/Menu.pm                    |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 26142746816b1c953195679487d191b69c950022
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Dec 31 20:15:31 2009 -0500

    Actually don't render the preamble, like the doc claims
    
    Like the docs say, we probably don't want a preamble for an inline button.

diff --git a/lib/Jifty/Web/Form/Field/InlineButton.pm b/lib/Jifty/Web/Form/Field/InlineButton.pm
index 9fa727d..a2715d4 100644
--- a/lib/Jifty/Web/Form/Field/InlineButton.pm
+++ b/lib/Jifty/Web/Form/Field/InlineButton.pm
@@ -41,6 +41,7 @@ Don't show hints for an inline button
 
 sub render_wrapper_start { }
 sub render_wrapper_end {}
+sub render_preamble {}
 sub render_label {}
 sub render_hints {}
 

commit d9e6593323771f66f959198b3957f3aea04efffd
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Dec 31 20:18:18 2009 -0500

    Support classes for plain text menu items

diff --git a/lib/Jifty/Web/Menu.pm b/lib/Jifty/Web/Menu.pm
index d104f85..6bfd334 100644
--- a/lib/Jifty/Web/Menu.pm
+++ b/lib/Jifty/Web/Menu.pm
@@ -599,7 +599,11 @@ sub as_link {
                                  target => $self->target,
                                  class => $self->class );
     } else {
-        return _( $self->label );
+        if ( $self->class ) {
+            return "<span class=\"@{[$self->class]}\">"._( $self->label )."</span>";
+        } else {
+            return _( $self->label );
+        }
     }
 }
 

-----------------------------------------------------------------------