use SL::Inifile;
use SL::DBUpgrade2;
use SL::DBUtils;
+use SL::Template;
require "bin/mozilla/common.pl";
require "bin/mozilla/admin_groups.pl";
my @valid_dateformats = qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd);
my @valid_numberformats = ('1,000.00', '1000.00', '1.000,00', '1000,00');
-my @all_stylesheets = qw(lx-office-erp.css Win2000.css Mobile.css kivitendo.css);
+my @all_stylesheets = qw(lx-office-erp.css Mobile.css kivitendo.css);
my @all_menustyles = (
{ id => 'old', title => $::locale->text('Old (on the side)') },
{ id => 'v3', title => $::locale->text('Top (CSS)') },
- { id => 'v4', title => $::locale->text('Top (CSS) new') },
{ id => 'neu', title => $::locale->text('Top (Javascript)') },
);
if ($form->{action}) {
if ($auth->authenticate_root($form->{'{AUTH}admin_password'}) != $auth->OK()) {
$auth->punish_wrong_login;
- $form->{error_message} = $locale->text('Incorrect Password!');
+ $form->{error} = $locale->text('Incorrect Password!');
$auth->delete_session_value('admin_password');
adminlogin();
} else {
sub add_user {
$::form->{title} = "kivitendo " . $::locale->text('Administration') . " / " . $::locale->text('Add User');
-# Note: Menu Style 'v3' is not compatible to all browsers!
-# "menustyle" => "old" sets the HTML Menu to default.
-# User does not have a well behaved new constructor, so we#Ll just have to build one ourself
+ # User does not have a well behaved new constructor, so we'll just have to build one ourself
my $user = bless {
"vclimit" => 200,
"countrycode" => "de",
"numberformat" => "1.000,00",
"dateformat" => "dd.mm.yy",
- "stylesheet" => "lx-office-erp.css",
- "menustyle" => "old",
+ "stylesheet" => "kivitendo.css",
+ "menustyle" => "neu",
dbport => $::auth->{DB_config}->{port} || 5432,
dbuser => $::auth->{DB_config}->{user} || 'lxoffice',
dbhost => $::auth->{DB_config}->{host} || 'localhost',
if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i)) {
if ($::lx_office_conf{system}->{dbcharset} !~ m/^UTF-?8$/i) {
$form->show_generic_error($locale->text('The selected PostgreSQL installation uses UTF-8 as its encoding. ' .
- 'Therefore you have to configure Lx-Office to use UTF-8 as well.'),
+ 'Therefore you have to configure kivitendo to use UTF-8 as well.'),
'back_button' => 1);
}
my $locale = $main::locale;
$form->isblank("db", $locale->text('Dataset missing!'));
+ $form->isblank("defaultcurrency", $locale->text('Default currency missing!'));
User->dbcreate(\%$form);
}
sub _search_templates {
- # is there a templates basedir
- if (!-d $::lx_office_conf{paths}->{templates}) {
- $::form->error(sprintf($::locale->text("The directory %s does not exist."), $::lx_office_conf{paths}->{templates}));
- }
-
- tie my %dir_h, 'IO::Dir', $::lx_office_conf{paths}->{templates};
-
- my @alldir = sort grep {
- -d ($::lx_office_conf{paths}->{templates} . "/$_")
- && !/^\.\.?$/
- && !m/\.(?:html|tex|sty|odt|xml|txb)$/
- && !m/^(?:webpages$|print$|\.)/
- } keys %dir_h;
-
- tie %dir_h, 'IO::Dir', "$::lx_office_conf{paths}->{templates}/print";
- my @allmaster = ('Standard', sort grep { -d ("$::lx_office_conf{paths}->{templates}/print" . "/$_") && !/^\.\.?$/ && !/^Standard$/ } keys %dir_h);
+ my %templates = SL::Template->available_templates;
- return \@alldir, \@allmaster;
+ return ($templates{print_templates}, $templates{master_templates});
}
1;