kivi.Validator: date_tag angepasst und input_number_tag eingeführt

diff --git a/SL/Presenter/Tag.pm b/SL/Presenter/Tag.pm
index 770fa1c421ee91d5a6725818030fb45c2536ab2d..ace040afa1a310dd2893406a2670de2ee6191718 100644 (file)
--- a/SL/Presenter/Tag.pm
+++ b/SL/Presenter/Tag.pm
@@ -7,7 +7,7 @@ use SL::HTML::Restrict;
 use parent qw(Exporter);
 
 use Exporter qw(import);
 use parent qw(Exporter);
 
 use Exporter qw(import);

-our @EXPORT = qw(html_tag input_tag hidden_tag javascript man_days_tag name_to_id select_tag checkbox_tag button_tag submit_tag ajax_submit_tag stringify_attributes restricted_html link);
+our @EXPORT = qw(html_tag input_tag hidden_tag javascript man_days_tag name_to_id select_tag checkbox_tag button_tag submit_tag ajax_submit_tag input_number_tag stringify_attributes restricted_html link);

 
 use Carp;
 
 
 use Carp;
 


@@ -257,6 +257,27 @@ sub ajax_submit_tag {
   return $self->button_tag($onclick, $text, %attributes);
 }
 
   return $self->button_tag($onclick, $text, %attributes);
 }
 

+sub input_number_tag {
+  my ($self, $name, $value, %params) = @_;
+
+  _set_id_attribute(\%params, $name);
+  my @onchange = $params{onchange} ? (onChange => delete $params{onchange}) : ();
+  my @classes  = ('numeric');
+  push @classes, delete($params{class}) if $params{class};
+  my %class    = @classes ? (class => join(' ', @classes)) : ();
+
+  $::request->layout->add_javascripts('kivi.Validator.js');
+  $::request->presenter->need_reinit_widgets($params{id});
+
+  return $self->input_tag(
+    $name, $::form->foramt_amount(\%::myconfig, $value),
+    "data-validate" => "number",
+    %params,
+    %class, @onchange,
+  );
+}
+
+

 sub javascript {
   my ($self, $data) = @_;
   return $self->html_tag('script', $data, type => 'text/javascript');
 sub javascript {
   my ($self, $data) = @_;
   return $self->html_tag('script', $data, type => 'text/javascript');

diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index a8e63815c0934cbe2a407eeccea80e08737743e1..940c42b39c4637b1e7b7039598d08086d6850a2d 100644 (file)
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -77,6 +77,7 @@ sub button_tag               { return _call_presenter('button_tag',
 sub submit_tag               { return _call_presenter('submit_tag',               @_); }
 sub ajax_submit_tag          { return _call_presenter('ajax_submit_tag',          @_); }
 sub link                     { return _call_presenter('link',                     @_); }
 sub submit_tag               { return _call_presenter('submit_tag',               @_); }
 sub ajax_submit_tag          { return _call_presenter('ajax_submit_tag',          @_); }
 sub link                     { return _call_presenter('link',                     @_); }

+sub input_number_tag         { return _call_presenter('input_number_tag',         @_); }

 
 sub _set_id_attribute {
   my ($attributes, $name, $unique) = @_;
 
 sub _set_id_attribute {
   my ($attributes, $name, $unique) = @_;


@@ -169,12 +170,13 @@ sub date_tag {
   push @classes, delete($params{class}) if $params{class};
   my %class    = @classes ? (class => join(' ', @classes)) : ();
 
   push @classes, delete($params{class}) if $params{class};
   my %class    = @classes ? (class => join(' ', @classes)) : ();
 

+  $::request->layout->add_javascripts('kivi.Validator.js');

   $::request->presenter->need_reinit_widgets($params{id});
 
   return $self->input_tag(
     $name, blessed($value) ? $value->to_lxoffice : $value,
     size   => 11,
   $::request->presenter->need_reinit_widgets($params{id});
 
   return $self->input_tag(
     $name, blessed($value) ? $value->to_lxoffice : $value,
     size   => 11,

-    onchange => "check_right_date_format(this);",
+    "data-validate" => "date",

     %params,
     %class, @onchange,
   );
     %params,
     %class, @onchange,
   );