From: Jan Büren Date: Fri, 28 Jun 2013 10:00:01 +0000 (+0200) Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp X-Git-Tag: release-3.1.0beta1~252 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/891f62176912eb5c1e8864a1140635e4ad533d08?hp=9a578c8b55b857e41dffbaf844023efcbdd22ace Merge branch 'master' of github.com:kivitendo/kivitendo-erp Conflicts: bin/mozilla/do.pl bin/mozilla/ir.pl bin/mozilla/oe.pl --- diff --git a/SL/Controller/CustomVariableConfig.pm b/SL/Controller/CustomVariableConfig.pm index d87b8ac92..b366ffbf2 100644 --- a/SL/Controller/CustomVariableConfig.pm +++ b/SL/Controller/CustomVariableConfig.pm @@ -64,7 +64,6 @@ sub show_form { split m/;/, ($self->config->flags || '') ]); - $::request->layout->focus('#config_name'); $self->render('custom_variable_config/form', %params); } diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm index 385ce6fdd..a06686af2 100644 --- a/SL/Controller/LoginScreen.pm +++ b/SL/Controller/LoginScreen.pm @@ -32,7 +32,7 @@ sub action_user_login { return if $self->_redirect_to_main_script_if_already_logged_in; # Otherwise show the login form. - $self->show_login_form(error => error_state($::form->{error})); + $self->show_login_form(error_state($::form->{error})); } sub action_logout { @@ -158,10 +158,12 @@ sub _ensure_employees_for_authorized_users_exist { } sub error_state { - return { - session => $::locale->text('The session is invalid or has expired.'), - password => $::locale->text('Incorrect username or password or no access to selected client!'), - }->{$_[0]}; + my %states = ( + session => { warning => t8('The session has expired. Please log in again.') }, + password => { error => t8('Incorrect username or password or no access to selected client!') }, + ); + + return %{ $states{$_[0]} || {} }; } sub set_layout { @@ -181,7 +183,6 @@ sub init_default_client_id { sub show_login_form { my ($self, %params) = @_; - $::request->layout->focus('#auth_login'); $self->render('login_screen/user_login', %params); } diff --git a/SL/Controller/Project.pm b/SL/Controller/Project.pm index 46a8c591e..d152d6a01 100644 --- a/SL/Controller/Project.pm +++ b/SL/Controller/Project.pm @@ -149,8 +149,6 @@ sub display_form { $params{CUSTOM_VARIABLES} = CVar->get_custom_variables(module => 'Projects', trans_id => $self->project->id); CVar->render_inputs(variables => $params{CUSTOM_VARIABLES}) if @{ $params{CUSTOM_VARIABLES} }; - $::request->{layout}->focus('#projectnumber'); - $self->render('project/form', %params); } diff --git a/bin/mozilla/acctranscorrections.pl b/bin/mozilla/acctranscorrections.pl index 35185622f..6ee397f41 100644 --- a/bin/mozilla/acctranscorrections.pl +++ b/bin/mozilla/acctranscorrections.pl @@ -14,7 +14,6 @@ sub analyze_filter { my $form = $main::form; my $locale = $main::locale; - $form->{jsscript} = 1; $form->{title} = $locale->text('General ledger corrections'); $form->header(); print $form->parse_html_template('acctranscorrections/analyze_filter'); diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index ad6248f3d..c918770b0 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -1558,7 +1558,6 @@ sub add_price_factor { $form->{title} = $locale->text('Add Price Factor'); $form->{callback} ||= build_std_url('action=add_price_factor'); - $::request->{layout}->focus('#description'); $form->header(); print $form->parse_html_template('am/edit_price_factor'); @@ -1577,7 +1576,6 @@ sub edit_price_factor { $form->{title} = $locale->text('Edit Price Factor'); $form->{callback} ||= build_std_url('action=add_price_factor'); - $::request->{layout}->focus('#description'); AM->get_price_factor(\%myconfig, $form); @@ -1665,7 +1663,6 @@ sub add_warehouse { $form->{title} = $locale->text('Add Warehouse'); $form->{callback} ||= build_std_url('action=add_warehouse'); - $::request->{layout}->focus('#description'); $form->header(); print $form->parse_html_template('am/edit_warehouse'); @@ -1688,7 +1685,6 @@ sub edit_warehouse { $form->{title} = $locale->text('Edit Warehouse'); $form->{callback} ||= build_std_url('action=list_warehouses'); - $::request->{layout}->focus('#description'); $form->header(); print $form->parse_html_template('am/edit_warehouse'); diff --git a/bin/mozilla/amtemplates.pl b/bin/mozilla/amtemplates.pl index 6d7e399c9..f8c6972e6 100644 --- a/bin/mozilla/amtemplates.pl +++ b/bin/mozilla/amtemplates.pl @@ -275,10 +275,7 @@ sub display_template_form { $options{"CAN_EDIT"} = $form->{"edit"}; - if ($form->{edit}) { - $::request->{layout}->focus("#edit_content"); - - } else { + if (!$form->{edit}) { $options{"content"} = "\n\n" if (!$options{"content"}); $options{"SHOW_SECOND_EDIT_BUTTON"} = $options{"lines"} > 25; } diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index e566ea6f7..4531e99a9 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -296,8 +296,6 @@ sub form_header { $taxcharts{$item->{id}} = $item; } - $form->{jsscript} = 1; - my $follow_up_vc = $form->{vendor}; $follow_up_vc =~ s/--.*?//; my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)"; @@ -807,15 +805,12 @@ sub search { $form->all_vc(\%myconfig, "vendor", "AP"); $form->{title} = $locale->text('AP Transactions'); - $::request->{layout}->focus('#vendor'); - $form->{jsscript} = 1; $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, "departments" => "ALL_DEPARTMENTS", "vendors" => "ALL_VC"); # constants and subs for template - $form->{jsscript} = 1; $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; $form->header; diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index e1b10f63c..038e59ea1 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -315,8 +315,6 @@ sub form_header { $taxcharts{$item->{id}} = $item; } - $::request->{layout}->focus("#customer"); - my $follow_up_vc = $form->{customer}; $follow_up_vc =~ s/--.*?//; my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)"; @@ -836,14 +834,10 @@ sub search { my $locale = $main::locale; my $cgi = $::request->{cgi}; - my ($customer, $department); - my ($jsscript, $button1, $button2); - # setup customer selection $form->all_vc(\%myconfig, "customer", "AR"); $form->{title} = $locale->text('AR Transactions'); - $form->{jsscript} = 1; # Auch in Rechnungsübersicht nach Kundentyp filtern - jan $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, @@ -854,7 +848,6 @@ sub search { $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0; # constants and subs for template - $form->{jsscript} = 1; $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; $form->header; diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index 1ce1c2f8b..4291871da 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -101,9 +101,7 @@ sub search { 'include_prefix' => 'l_', 'include_value' => 'Y'); - $form->{jsscript} = 1; $form->{title} = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors'); - $::request->{layout}->focus('#name'); $form->header(); print $form->parse_html_template('ct/search'); @@ -475,9 +473,7 @@ sub form_header { $form->{shipto_label} = \&_shipto_label; $form->{contacts_label} = \&_contacts_label; $form->{taxzone_id} = 0 if !$form->{id}; - $form->{jsscript} = 1; $form->{SHIPTO_ALL} = [ +{ shipto_id => '0', shiptoname => $::locale->text('All') }, @{ $form->{SHIPTO} } ]; - $::request->{layout}->focus("#greeting"); $form->{title} = $form->{title_save} || $locale->text("$form->{title} " . ucfirst $form->{db}) . ($form->{title} eq "Edit" ? " $form->{name}" : ''); diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index e9df30944..01658ab10 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -105,8 +105,6 @@ sub add { $form->{SHOW_DEPARTMENT_SELECTION} = $form->{all_departments} && scalar @{ $form->{all_departments} || [] }; $form->{title} = $locale->text('Start Dunning Process'); - $form->{jsscript} = 1; - $::request->{layout}->focus('#customer'); $form->header(); print $form->parse_html_template("dunning/add"); @@ -144,7 +142,6 @@ sub show_invoices { $form->{type} = 'dunning'; $form->{rowcount} = scalar @{ $form->{DUNNINGS} }; - $form->{jsscript} = 1; $form->{callback} ||= build_std_url("action=show_invoices", qw(customer invnumber ordnumber groupinvoices minamount dunning_level notes)); $form->{PRINT_OPTIONS} = print_options('inline' => 1, @@ -308,9 +305,7 @@ sub search { $form->{SHOW_DEPARTMENT_DDBOX} = scalar @{ $form->{ALL_CUSTOMERS} }; $form->{SHOW_DUNNING_LEVELS} = scalar @{ $form->{DUNNING} }; - $form->{jsscript} = 1; $form->{title} = $locale->text('Dunnings'); - $::request->{layout}->focus('#customer'); $form->header(); diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 3e0c7e0fe..d6a51bc15 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -166,7 +166,6 @@ sub order_links { # retrieve order/quotation $form->{webdav} = $::instance_conf->get_webdav; - $form->{jsscript} = 1; my $editing = $form->{id}; @@ -255,9 +254,6 @@ sub form_header { $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; - # use JavaScript Calendar or not - $form->{jsscript} = 1; - my @old_project_ids = ($form->{"globalproject_id"}); map({ push(@old_project_ids, $form->{"project_id_$_"}) if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"})); @@ -460,7 +456,6 @@ sub search { $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]); $form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} }; - $form->{jsscript} = 1; $form->{title} = $locale->text('Delivery Orders'); $form->header(); @@ -1125,8 +1120,6 @@ sub display_stock_in_form { my %myconfig = %main::myconfig; my $locale = $main::locale; - $form->{jsscript} = 1; - $form->{title} = $locale->text('Stock'); my $part_info = IC->get_basic_part_info('id' => $form->{parts_id}); diff --git a/bin/mozilla/fu.pl b/bin/mozilla/fu.pl index ef80a73cd..8dc5db6ea 100644 --- a/bin/mozilla/fu.pl +++ b/bin/mozilla/fu.pl @@ -99,8 +99,6 @@ sub display_form { $params{trans_id} = $form->{LINKS}->[0]->{trans_id} if (@{ $form->{LINKS} }); $form->{FOLLOW_UPS} = FU->follow_ups(%params); - $form->{jsscript} = 1; - $form->header(no_layout => $::form->{POPUP_MODE}); print $form->parse_html_template('fu/add_edit'); @@ -232,7 +230,6 @@ sub search { $form->get_lists("employees" => "EMPLOYEES"); - $form->{jsscript} = 1; $form->{title} = $locale->text('Follow-Ups'); $form->header(); diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 837b842b4..c68fef0ca 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -106,8 +106,6 @@ sub search { $form->{title} = $locale->text($form->{title}); $form->{title} = $locale->text('Assemblies') if ($is_xyz{is_assembly}); - $form->{jsscript} = 1; - $form->{CUSTOM_VARIABLES} = CVar->get_configs('module' => 'IC'); ($form->{CUSTOM_VARIABLES_FILTER_CODE}, $form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables' => $form->{CUSTOM_VARIABLES}, @@ -1610,16 +1608,11 @@ sub form_header { flash('info', $::locale->text('This partnumber is not unique. You should change it.')); } - # use JavaScript Calendar or not (yes!) - $form->{jsscript} = 1; - my $units = AM->retrieve_units(\%myconfig, $form); $form->{ALL_UNITS} = [ map +{ name => $_ }, sort { $units->{$a}{sortkey} <=> $units->{$b}{sortkey} } keys %$units ]; $form->{defaults} = AM->get_defaults(); - $::request->{layout}->focus("#partnumber"); - $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'IC', 'trans_id' => $form->{id}); CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}, show_disabled_message => 1) diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index e67bbbb2b..e7ba050a1 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -996,7 +996,6 @@ sub edit_e_mail { my $attachment_filename = $form->generate_attachment_filename(); my $subject = $form->{subject} || $form->generate_email_subject(); - $::request->{layout}->focus($form->{"email"} ? "#subject" : "#email"); $form->header; my (@dont_hide_key_list, %dont_hide_key, @hidden_keys); diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 3d498856c..3653891f9 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -102,7 +102,6 @@ sub invoice_links { # create links $form->{webdav} = $::instance_conf->get_webdav; - $form->{jsscript} = 1; $form->create_links("AP", \%myconfig, "vendor"); @@ -329,8 +328,6 @@ sub form_header { $TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}; $TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/; - $::request->{layout}->focus('#vendor'); - my $follow_up_vc = $form->{vendor}; $follow_up_vc =~ s/--\d*\s*$//; $TMPL_VAR{vendor_name} = $follow_up_vc; @@ -357,7 +354,6 @@ sub form_header { ), @custom_hiddens, map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}]; - $form->{jsscript} = 1; $form->header(); print $form->parse_html_template("ir/form_header", \%TMPL_VAR); diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index fe387d14c..f6cd5e7ac 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -76,8 +76,6 @@ sub add { $form->{callback} = "$form->{script}?action=add&type=$form->{type}" unless $form->{callback}; - $form->{jsscript} = "date"; - &invoice_links; &prepare_invoice; &display_form; @@ -353,8 +351,6 @@ sub form_header { $TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}; $TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/; - $::request->{layout}->focus('#customer'); - my $follow_up_vc = $form->{customer}; $follow_up_vc =~ s/--\d*\s*$//; $TMPL_VAR{customer_name} = $follow_up_vc; @@ -381,7 +377,6 @@ sub form_header { ), @custom_hiddens, map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}]; - $form->{jsscript} = 1; $form->header(); print $form->parse_html_template("is/form_header", \%TMPL_VAR); diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 8b2b79a19..e4139ff97 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -230,7 +230,6 @@ sub order_links { # retrieve order/quotation $form->{webdav} = $::instance_conf->get_webdav; - $form->{jsscript} = 1; my $editing = $form->{id}; @@ -318,9 +317,6 @@ sub form_header { $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; - # use JavaScript Calendar or not - $form->{jsscript} = 1; - # openclosed checkboxes my @tmp; push @tmp, sprintf qq||, @@ -725,7 +721,6 @@ sub search { $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]); # constants and subs for template - $form->{jsscript} = 1; $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; $form->header(); diff --git a/bin/mozilla/sepa.pl b/bin/mozilla/sepa.pl index 4e2a223e0..2850bfb14 100755 --- a/bin/mozilla/sepa.pl +++ b/bin/mozilla/sepa.pl @@ -127,8 +127,6 @@ sub bank_transfer_create { my $bank_account_label_sub = sub { $locale->text('Account number #1, bank code #2, #3', $_[0]->{account_number}, $_[0]->{bank_code}, $_[0]->{bank}) }; - $form->{jsscript} = 1; - $form->header(); print $form->parse_html_template('sepa/bank_transfer_create', { 'BANK_TRANSFERS' => \@bank_transfers, @@ -169,7 +167,6 @@ sub bank_transfer_search { my $vc = $form->{vc} eq 'customer' ? 'customer' : 'vendor'; $form->{title} = $vc eq 'customer' ? $::locale->text('List of bank collections') : $locale->text('List of bank transfers'); - $form->{jsscript} = 1; $form->header(); print $form->parse_html_template('sepa/bank_transfer_search', { vc => $vc }); @@ -330,7 +327,6 @@ sub bank_transfer_edit { $form->error($locale->text('That export does not exist.')); } - $form->{jsscript} = 1; $form->{title} = $locale->text('View SEPA export'); $form->header(); print $form->parse_html_template('sepa/bank_transfer_edit', diff --git a/bin/mozilla/vk.pl b/bin/mozilla/vk.pl index a60d430ea..9206e7e74 100644 --- a/bin/mozilla/vk.pl +++ b/bin/mozilla/vk.pl @@ -61,7 +61,6 @@ sub search_invoice { $form->all_vc(\%myconfig, "customer", "AR"); $form->{title} = $locale->text('Sales Report'); - $form->{jsscript} = 1; $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, "departments" => "ALL_DEPARTMENTS", @@ -104,10 +103,10 @@ sub invoice_transactions { # can't currently be configured from report, empty line between main sortings my $addemptylines = 1; - + # don't add empty lines between mainsort subtotals when only subtotal_mainsort is selected if ($form->{l_subtotal_mainsort} eq "Y" and not defined $form->{l_headers_mainsort} and not defined $form->{l_headers_subsort} and not defined $form->{l_subtotal_subsort} ) { - $addemptylines = 0 + $addemptylines = 0 }; if ( $form->{customer} =~ /--/ ) { diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl index f76b4e969..b8cda2b2c 100644 --- a/bin/mozilla/wh.pl +++ b/bin/mozilla/wh.pl @@ -105,8 +105,6 @@ sub transfer_warehouse_selection { my $content; - $form->{jsscript} = 1; - if ($form->{trans_type} eq 'removal') { $form->{nextsub} = "removal_parts_selection"; $form->{title} = $locale->text('Removal from Warehouse'); @@ -657,8 +655,6 @@ sub journal { show_no_warehouses_error() if (!scalar @{ $form->{WAREHOUSES} }); - $form->{jsscript} = 1; - $form->header(); print $form->parse_html_template("wh/journal_filter", { "UNITS" => AM->unit_select_data(AM->retrieve_units(\%myconfig, $form)) }); @@ -803,8 +799,6 @@ sub report { show_no_warehouses_error() if (!scalar @{ $form->{WAREHOUSES} }); - $form->{jsscript} = 1; - $form->{title} = $locale->text("Report about warehouse contents"); $form->header(); diff --git a/locale/de/all b/locale/de/all index 29fe6debf..5c36e7bc3 100755 --- a/locale/de/all +++ b/locale/de/all @@ -2109,6 +2109,7 @@ $self->{texts} = { 'The selected exports have been closed.' => 'Die ausgewählten Exporte wurden abgeschlossen.', 'The selected warehouse does not exist.' => 'Das ausgewählte Lager existiert nicht.', 'The selected warehouse is empty, or no stocked items where found that match the filter settings.' => 'Das ausgewählte Lager ist leer, oder in ihm wurden keine zu den Sucheinstellungen passenden eingelagerten Artikel gefunden.', + 'The session has expired. Please log in again.' => 'Die Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.', 'The session is invalid or has expired.' => 'Sie sind von kivitendo abgemeldet.', 'The settings were saved, but the password was not changed.' => 'Die Einstellungen wurden gespeichert, aber das Passwort wurde nicht geändert.', 'The source warehouse does not contain any bins.' => 'Das Quelllager enthält keine Lagerplätze.', diff --git a/templates/webpages/am/edit_price_factor.html b/templates/webpages/am/edit_price_factor.html index dc00c7c6c..a2191300b 100644 --- a/templates/webpages/am/edit_price_factor.html +++ b/templates/webpages/am/edit_price_factor.html @@ -11,7 +11,7 @@ - + @@ -31,4 +31,3 @@ [% IF id %][% IF orphaned %][% END %][% END %]

- diff --git a/templates/webpages/am/edit_templates.html b/templates/webpages/am/edit_templates.html index 220b9ecb6..9d7420c13 100644 --- a/templates/webpages/am/edit_templates.html +++ b/templates/webpages/am/edit_templates.html @@ -53,7 +53,7 @@

[% IF CAN_EDIT %] -

+

@@ -78,4 +78,3 @@ [% END %] - diff --git a/templates/webpages/am/edit_warehouse.html b/templates/webpages/am/edit_warehouse.html index 2208de527..9da65b81c 100644 --- a/templates/webpages/am/edit_warehouse.html +++ b/templates/webpages/am/edit_warehouse.html @@ -17,7 +17,7 @@

@@ -106,4 +106,3 @@ [% END %] [% END %] - diff --git a/templates/webpages/ap/search.html b/templates/webpages/ap/search.html index 99898a6ea..9932cdd1f 100644 --- a/templates/webpages/ap/search.html +++ b/templates/webpages/ap/search.html @@ -17,6 +17,7 @@ name = 'vendor', default = oldvendor, style = 'width: 250px', + class = 'initial_focus', DATA = ALL_VC, id_sub = 'vc_keys', label_key = 'name', diff --git a/templates/webpages/ar/form_header.html b/templates/webpages/ar/form_header.html index 8d470faf4..af9262ddb 100644 --- a/templates/webpages/ar/form_header.html +++ b/templates/webpages/ar/form_header.html @@ -39,9 +39,9 @@ [% L.hidden_tag('selectcustomer', selectcustomer) %] diff --git a/templates/webpages/ct/form_header.html b/templates/webpages/ct/form_header.html index ff2d36b90..294cf4769 100644 --- a/templates/webpages/ct/form_header.html +++ b/templates/webpages/ct/form_header.html @@ -80,7 +80,7 @@ - + @@ -174,4 +174,3 @@ - diff --git a/templates/webpages/custom_variable_config/form.html b/templates/webpages/custom_variable_config/form.html index f29a3d850..2703cdc1d 100644 --- a/templates/webpages/custom_variable_config/form.html +++ b/templates/webpages/custom_variable_config/form.html @@ -12,7 +12,7 @@ - + diff --git a/templates/webpages/dunning/add.html b/templates/webpages/dunning/add.html index c58651e42..7648bf205 100644 --- a/templates/webpages/dunning/add.html +++ b/templates/webpages/dunning/add.html @@ -9,12 +9,12 @@ @@ -81,5 +81,3 @@ - - diff --git a/templates/webpages/dunning/search.html b/templates/webpages/dunning/search.html index 18737886c..f27c2fe1e 100644 --- a/templates/webpages/dunning/search.html +++ b/templates/webpages/dunning/search.html @@ -16,13 +16,13 @@ @@ -120,4 +120,3 @@ - diff --git a/templates/webpages/generic/edit_email.html b/templates/webpages/generic/edit_email.html index b8303a0cc..b31fde030 100644 --- a/templates/webpages/generic/edit_email.html +++ b/templates/webpages/generic/edit_email.html @@ -1,5 +1,5 @@ [%- USE T8 %] -[%- USE HTML %] +[%- USE HTML %][%- USE L -%]
[% 'Description' | $T8 %]
[% 'Description' | $T8 %] - +
[% 'Customer' | $T8 %] [%- IF selectcustomer %] - + [%- ELSE %] - + [%- END %]
[% 'Greeting' | $T8 %] -   +   [%- INCLUDE generic/multibox.html name = 'selected_company_greeting', DATA = MB_COMPANY_GREETINGS, diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html index 9d3f696aa..617925e9d 100644 --- a/templates/webpages/ct/search.html +++ b/templates/webpages/ct/search.html @@ -15,7 +15,7 @@
[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][%- ELSE %][% 'Vendor Name' | $T8 %][%- END %]
[% 'Variable Name' | $T8 %](1)[%- L.input_tag("config.name", SELF.config.name) %][%- L.input_tag("config.name", SELF.config.name, class='initial_focus') %]
[% 'Customer' | $T8 %] [% IF SHOW_CUSTOMER_SELECTION %] - [% FOREACH row = all_customer %][% END %] [% ELSE %] - + [% END %]
[% 'Customer' | $T8 %] [% IF SHOW_CUSTOMER_DDBOX %] - [% FOREACH row = ALL_CUSTOMERS %] [% END %] [% ELSE %] - + [% END %]
@@ -14,7 +14,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -70,4 +70,3 @@
- diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html index 658979a81..23a793316 100644 --- a/templates/webpages/ic/form_header.html +++ b/templates/webpages/ic/form_header.html @@ -51,7 +51,7 @@
[% 'To' | $T8 %][% L.input_tag('email', email, size=30, class=(email ? '' : 'initial_focus')) %]
[% 'Cc' | $T8 %]
[% 'Subject' | $T8 %][% L.input_tag('subject', subject, size=30, class=(email ? 'initial_focus' : '')) %]
[% 'Attachment name' | $T8 %]
- + diff --git a/templates/webpages/ir/form_header.html b/templates/webpages/ir/form_header.html index 8c849fdd7..10739b6ea 100644 --- a/templates/webpages/ir/form_header.html +++ b/templates/webpages/ir/form_header.html @@ -48,6 +48,7 @@ id = 'vendor', name = 'vendor', style = 'width: 250px', + class = 'initial_focus', DATA = ALL_VENDORS, id_sub = 'vc_keys', label_key = 'name', diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html index 7aa2732bd..89aa3fc4f 100644 --- a/templates/webpages/is/form_header.html +++ b/templates/webpages/is/form_header.html @@ -49,6 +49,7 @@ id = 'customer', name = 'customer', style = 'width: 250px', + class = 'initial_focus', DATA = ALL_CUSTOMERS, id_sub = 'vc_keys', label_key = 'name', diff --git a/templates/webpages/login_screen/user_login.html b/templates/webpages/login_screen/user_login.html index 07acdfd29..671724b3d 100644 --- a/templates/webpages/login_screen/user_login.html +++ b/templates/webpages/login_screen/user_login.html @@ -10,6 +10,9 @@ [% IF error %]
[% HTML.escape(error) %]
[% END %] +[% IF warning %] +
[% HTML.escape(warning) %]
+[% END %] [% IF info %]
[% HTML.escape(info) %]
[% END %] @@ -26,7 +29,7 @@
[% 'Part Number' | $T8 %]
[% 'Part Description' | $T8 %]
- + diff --git a/templates/webpages/project/form.html b/templates/webpages/project/form.html index 5b2594cdb..f046132f5 100644 --- a/templates/webpages/project/form.html +++ b/templates/webpages/project/form.html @@ -26,7 +26,7 @@
[% 'Login Name' | $T8 %][% L.input_tag('{AUTH}login', '', id='auth_login', style=style) %][% L.input_tag('{AUTH}login', '', id='auth_login', style=style, class='initial_focus') %]
[% 'Password' | $T8 %]
- +
[% 'Number' | $T8 %][% L.input_tag("project.projectnumber", SELF.project.projectnumber, size=60) %][% L.input_tag("project.projectnumber", SELF.project.projectnumber, size=60, class='initial_focus') %]