diff --git a/copri4/main/css/local_style_2.css b/copri4/main/css/local_style_2.css
index 3ec4727..f32297d 100755
--- a/copri4/main/css/local_style_2.css
+++ b/copri4/main/css/local_style_2.css
@@ -91,6 +91,7 @@ div#Container_cms {
.left_italic_cms {
min-width:140px;
padding:4px 0;
+ vertical-align: top;
text-align: right;
border: 0px solid black;
}
diff --git a/copri4/main/src/Tpl/BaseEdit.pm b/copri4/main/src/Tpl/BaseEdit.pm
index 26558f3..9cea13b 100755
--- a/copri4/main/src/Tpl/BaseEdit.pm
+++ b/copri4/main/src/Tpl/BaseEdit.pm
@@ -303,9 +303,16 @@ EOF
#Mietjournal edit
if($node_meta->{ct_table} eq "contenttranspos" && $node_meta->{tpl_id} == 221){
my ($key,$des,$size,$postdes) = split /=/,$_;
+ $des .= " ($key)" if($users_dms->{u_id} eq $varenv{superu_id});
+ my $prefix = $cttpos->{txt12};
+ $prefix = "S3X" if($prefix eq "SX");
- if($key =~ /c_id|ct_name|txt08|barcode/){
- print $q->hidden(-name=>"$key",-override=>1,-value=>"$cttpos->{$key}"),"\n" if($key eq "barcode");
+ if($key =~ /barcode/){
+ print $q->hidden(-name=>"$key",-override=>1,-value=>"$cttpos->{$key}"),"\n";
+ print $q->Tr(),"\n";
+ print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
+ print $q->td({-class=>'content1_cms'}, $q->b("$prefix$cttpos->{$key}")),"\n";
+ }elsif($key =~ /c_id|ct_name|txt08/){
print $q->Tr(),"\n";
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
print $q->td({-class=>'content1_cms'}, $q->b("$cttpos->{$key}")),"\n";
@@ -319,7 +326,7 @@ EOF
}
print "
";
- print $q->textarea(-class=>'autos',-style=>"border: 1px solid silver;",-name=>"$key",-default=>"$cttpos->{$key}", -override=>'1',-rows=>"1",-cols=>50),"\n";
+ print $q->textarea(-class=>'autos',-style=>"border: 1px solid silver;",-name=>"$key",-default=>"$cttpos->{$key}", -override=>'1',-rows=>"3",-cols=>50),"\n";
print " | \n";
@@ -327,13 +334,14 @@ EOF
}elsif($key eq "int09"){
print $q->Tr(),"\n";
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
- print $q->td({-class=>'content1_cms'}, $q->textfield(-class=>'etxt',-name=>"int09",-default=>"$cttpos->{int09}",-size=>"5",-maxlength=>5), "Text", $q->textfield(-class=>'etxt',-name=>"txt04",-default=>"$cttpos->{txt04}",-size=>"30",-maxlength=>50)),"\n";
+ #print $q->td({-class=>'content1_cms'}, $q->textfield(-class=>'etxt',-name=>"int09",-default=>"$cttpos->{int09}",-size=>"5",-maxlength=>5), "Text", $q->textfield(-class=>'etxt',-name=>"txt04",-default=>"$cttpos->{txt04}",-size=>"30",-maxlength=>50)),"\n";
+ print $q->td({-class=>'content1_cms'}, "$cttpos->{int09} ($cttpos->{txt04})"),"\n";
#Endstation
}elsif($key eq "int04"){
print $q->Tr(),"\n";
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
- print $q->td({-class=>'content1_cms'}, $q->textfield(-class=>'etxt',-name=>"int04",-default=>"$cttpos->{int04}",-size=>"5",-maxlength=>40)),"\n";
+ print $q->td({-class=>'content1_cms'}, "$prefix", $q->textfield(-class=>'etxt',-name=>"int04",-default=>"$cttpos->{int04}",-size=>"15",-maxlength=>40)),"\n";
#End GPS
}elsif($key eq "txt06"){
print $q->Tr(),"\n";
@@ -346,12 +354,12 @@ EOF
print $q->Tr(),"\n";
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
print $q->td({-class=>'content1_cms'},
- $q->textfield(-id=>'datepicker3',-class=>'etxt',-name=>"start_date",-default=>"$s_dd.$s_mo.$s_yy",-size=>"8",-maxlength=>10),
- $q->textfield(-class=>'etxt',-name=>"s_hh",-default=>"$s_hh",-size=>"1",-maxlength=>2),":",
- $q->textfield(-class=>'etxt',-name=>"s_mi",-default=>"$s_mi",-size=>"1",-maxlength=>2)," → ",
- $q->textfield(-id=>'datepicker4',-class=>'etxt',-name=>"end_date",-default=>"$e_dd.$e_mo.$e_yy",-size=>"8",-maxlength=>10),
- $q->textfield(-class=>'etxt',-name=>"e_hh",-default=>"$e_hh",-size=>"1",-maxlength=>2),":",
- $q->textfield(-class=>'etxt',-name=>"e_mi",-default=>"$e_mi",-size=>"1",-maxlength=>2)),"\n";
+ $q->textfield(-id=>'datepicker3',-class=>'etxt',-name=>"start_date",-default=>"$s_dd.$s_mo.$s_yy",-size=>"10",-maxlength=>10),
+ $q->textfield(-class=>'etxt',-name=>"s_hh",-default=>"$s_hh",-size=>"2",-maxlength=>2),":",
+ $q->textfield(-class=>'etxt',-name=>"s_mi",-default=>"$s_mi",-size=>"2",-maxlength=>2)," → ",
+ $q->textfield(-id=>'datepicker4',-class=>'etxt',-name=>"end_date",-default=>"$e_dd.$e_mo.$e_yy",-size=>"10",-maxlength=>10),
+ $q->textfield(-class=>'etxt',-name=>"e_hh",-default=>"$e_hh",-size=>"2",-maxlength=>2),":",
+ $q->textfield(-class=>'etxt',-name=>"e_mi",-default=>"$e_mi",-size=>"2",-maxlength=>2)),"\n";
}elsif($key =~ /int10/ && "$size" eq "select"){#bike_state
my @_lock_valxx = ();
@@ -409,7 +417,7 @@ EOF
}elsif($key =~ /int07/){
print $q->Tr(),"\n";
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
- print $q->td({-class=>'content1_cms',-style=>"",-nowrap=>'1'},$q->textfield(-class=>'etxt',-name=>"$key",-default=>"$cttpos->{$key}", -override=>'1',-size=>"$size",-maxlength=>100),$but->selector("int08","40px","$cttpos->{int08}",("0.00:%","1.00:€"))),"\n";
+ print $q->td({-class=>'content1_cms',-style=>"",-nowrap=>'1'},$q->textfield(-class=>'etxt',-name=>"$key",-default=>"$cttpos->{$key}", -override=>'1',-size=>"6",-maxlength=>6),$but->selector("int08","40px","$cttpos->{int08}",("0.00:%","1.00:€"))),"\n";
}elsif($key =~ /int01/){
print $q->Tr(),"\n";
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
diff --git a/copri4/main/src/Tpl/Calorin.pm b/copri4/main/src/Tpl/Calorin.pm
index 1d37db0..cfc2229 100755
--- a/copri4/main/src/Tpl/Calorin.pm
+++ b/copri4/main/src/Tpl/Calorin.pm
@@ -223,6 +223,7 @@ sub tpl(){
my $sort_up = "up";
my $sort_down = "down";
+ $users_dms->{cal_sort_updown} = "down" if(!$users_dms->{cal_sort_updown});
$sort_up = "$sort_up" if($users_dms->{cal_sort_updown} eq "up");
$sort_down = "$sort_down" if($users_dms->{cal_sort_updown} eq "down");
@@ -308,7 +309,6 @@ sub tpl(){
my $nr=0;
my $i= $offset || 0;
- $users_dms->{cal_sort_updown} = "down" if(!$users_dms->{cal_sort_updown});
foreach my $pid (sort {
if($users_dms->{cal_sort_updown} eq "down"){
$cttpos->{$b}->{end_time} cmp $cttpos->{$a}->{end_time}
diff --git a/copri4/main/src/Tpl/SubListe.pm b/copri4/main/src/Tpl/SubListe.pm
index 2799dc3..b587faa 100755
--- a/copri4/main/src/Tpl/SubListe.pm
+++ b/copri4/main/src/Tpl/SubListe.pm
@@ -333,6 +333,7 @@ EOF
#BIG LOOP loop content table
#if($users_dms->{sort_updown} eq "up"){
+ $users_dms->{cal_sort_updown} = "down" if(!$users_dms->{cal_sort_updown});
my $nr=0;
foreach my $id (sort {
if($users_dms->{sort_updown} eq "down"){