From 6360fdf4712c3786526a74db3c02852ff3f21d53 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Mon, 03 Aug 2015 15:24:41 -0400 Subject: [PATCH] - ported some patches --- interface/web/client/form/client.tform.php | 21 ++++++++++++++++++--- interface/web/themes/default/templates/sidenav.tpl.htm | 2 +- interface/web/client/form/reseller.tform.php | 21 ++++++++++++++++++--- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index 35d7d09..eab4e02 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -381,7 +381,12 @@ 'class' => 'validate_client', 'function' => 'check_vat_id', 'errmsg'=> 'invalid_vat_id'), - ), + ), + 'filters' => array( 0 => array( 'event' => 'SAVE', + 'type' => 'TRIM'), + 1 => array( 'event' => 'SAVE', + 'type' => 'TOUPPER') + ), ), 'company_id' => array ( 'datatype' => 'VARCHAR', @@ -447,7 +452,12 @@ 'width' => '30', 'maxlength' => '255', 'rows' => '', - 'cols' => '' + 'cols' => '', + 'filters' => array( 0 => array( 'event' => 'SAVE', + 'type' => 'TRIM'), + 1 => array( 'event' => 'SAVE', + 'type' => 'TOUPPER') + ), ), 'bank_account_swift' => array ( 'datatype' => 'VARCHAR', @@ -458,7 +468,12 @@ 'width' => '30', 'maxlength' => '255', 'rows' => '', - 'cols' => '' + 'cols' => '', + 'filters' => array( 0 => array( 'event' => 'SAVE', + 'type' => 'TRIM'), + 1 => array( 'event' => 'SAVE', + 'type' => 'TOUPPER') + ), ), 'notes' => array ( 'datatype' => 'TEXT', diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php index 1b18f3d..daba140 100644 --- a/interface/web/client/form/reseller.tform.php +++ b/interface/web/client/form/reseller.tform.php @@ -380,7 +380,12 @@ 'class' => 'validate_client', 'function' => 'check_vat_id', 'errmsg'=> 'invalid_vat_id'), - ), + ), + 'filters' => array( 0 => array( 'event' => 'SAVE', + 'type' => 'TRIM'), + 1 => array( 'event' => 'SAVE', + 'type' => 'TOUPPER') + ), ), 'company_id' => array ( 'datatype' => 'VARCHAR', @@ -446,7 +451,12 @@ 'width' => '30', 'maxlength' => '255', 'rows' => '', - 'cols' => '' + 'cols' => '', + 'filters' => array( 0 => array( 'event' => 'SAVE', + 'type' => 'TRIM'), + 1 => array( 'event' => 'SAVE', + 'type' => 'TOUPPER') + ), ), 'bank_account_swift' => array ( 'datatype' => 'VARCHAR', @@ -457,7 +467,12 @@ 'width' => '30', 'maxlength' => '255', 'rows' => '', - 'cols' => '' + 'cols' => '', + 'filters' => array( 0 => array( 'event' => 'SAVE', + 'type' => 'TRIM'), + 1 => array( 'event' => 'SAVE', + 'type' => 'TOUPPER') + ), ), 'notes' => array ( 'datatype' => 'TEXT', diff --git a/interface/web/themes/default/templates/sidenav.tpl.htm b/interface/web/themes/default/templates/sidenav.tpl.htm index b851003..6064966 100644 --- a/interface/web/themes/default/templates/sidenav.tpl.htm +++ b/interface/web/themes/default/templates/sidenav.tpl.htm @@ -1,5 +1,5 @@ <tmpl_loop name="nav_left"> - <header><tmpl_if name="startpage"><a href="#" class="subnav-header" data-load-content="<tmpl_var name='startpage'>"></tmpl_if><tmpl_var name="title"><tmpl_if name="startpage"></a></tmpl_if></header> + <tmpl_if name="title"><header><tmpl_if name="startpage"><a href="#" class="subnav-header" data-load-content="<tmpl_var name='startpage'>"></tmpl_if><tmpl_var name="title"><tmpl_if name="startpage"></a></tmpl_if></header></tmpl_if> <ul id="sub-navigation"> <tmpl_loop name="items"> <li<tmpl_if name="html_id"> id='<tmpl_var name="html_id">' </tmpl_if>> -- Gitblit v1.9.1