diff --git a/copri4/main/src/Mod/APIsigoclient.pm b/copri4/main/src/Mod/APIsigoclient.pm
index 622c541..8d942a2 100755
--- a/copri4/main/src/Mod/APIsigoclient.pm
+++ b/copri4/main/src/Mod/APIsigoclient.pm
@@ -62,6 +62,9 @@ print FILE "\n*** $now_dt 'sigo client' \n";
sub get_bikes {
my $self = shift;
+ open(FILE,">>$varenv{logdir}/APIsigo_client.log");
+ print FILE "\n*** $now_dt 'sigo client' \n";
+
my $endpoint = "https://sigo.dev.sigo.green/api/v1/bikes";
print "$endpoint\n";
@@ -69,13 +72,14 @@ sub get_bikes {
my $ret_json = get_sigo("","$endpoint",$rest_json);
eval {
$response_in = decode_json($ret_json);
- print "<--- get_bikes response_in:\n" . Dumper($response_in);
+ print FILE "<--- get_bikes response_in:\n" . Dumper($response_in);
};
if ($@){
- print "<--- failure get_bikes raw response_in:\n" . Dumper($ret_json) . "\n";
+ print FILE "<--- failure get_bikes raw response_in:\n" . Dumper($ret_json) . "\n";
warn $@;
}
+ close(FILE);
}
#main GET
diff --git a/copri4/main/src/Mod/Indexsharee.pm b/copri4/main/src/Mod/Indexsharee.pm
index cf27f6c..e53cce7 100755
--- a/copri4/main/src/Mod/Indexsharee.pm
+++ b/copri4/main/src/Mod/Indexsharee.pm
@@ -710,13 +710,13 @@ sub handler {
my $style_bootstrap = "$varenv{metahost}/$dbt->{shareeapp_conf}->{style_bootstrap}";
my $style_bootstrap_icons = "$varenv{metahost}/$dbt->{copri_conf}->{style_bootstrap_icons}";
my $jquery_resize = "";
- #under development bootstrap with bayern standalone
- if($varenv{syshost} eq "shareeweb-bayern"){
- $js_bootstrap = "$varenv{metahost}/js/bootstrap-5.1.3-dist/js/bootstrap.min.js";
- $style_bootstrap = "$varenv{metahost}/js/bootstrap-5.1.3-dist/css/bootstrap.css";
- }else{
- $jquery = "$varenv{metahost}/js/jquery-1.9.1.js";#bootstrap 3 needs jquery
- }
+ #2022-03-30 global set bootstrap with bayern standalone
+ #if($varenv{syshost} eq "shareeweb-bayern"){
+ # $js_bootstrap = "$varenv{metahost}/js/bootstrap-5.1.3-dist/js/bootstrap.min.js";
+ # $style_bootstrap = "$varenv{metahost}/js/bootstrap-5.1.3-dist/css/bootstrap.css";
+ #}else{
+ # $jquery = "$varenv{metahost}/js/jquery-1.9.1.js";#bootstrap 3 needs jquery
+ #}
if($varenv{wwwhost} =~ /shareedms/){
$local_style = "$varenv{metahost}/$dbt->{shareedms_conf}->{local_style}";
diff --git a/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm b/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm
index 3116b0e..46c9d4d 100755
--- a/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm
+++ b/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm
@@ -80,7 +80,8 @@ sub tpl(){
my $node1 = $db->collect_node($node_meta->{parent_id},$lang,"1");
#bootstrap 5 with standalone bayern
-if($varenv->{syshost} eq "shareeweb-bayern"){
+#if($varenv->{syshost} eq "shareeweb-bayern"){
+if(1==1){
#subMenue--------
print "\n";
-
-
- #print "
\n";
-#bootstrap 5
-if($varenv->{syshost} eq "shareeweb-bayern"){
print <
@@ -199,52 +197,6 @@ EOF
;
-}else{
-
-print <
-
-
-
-
-
-
$sharee_agb_text->{ct_name}
$sharee_agb_text->{txt01}
-
-
-
-
-
-
-EOF
-;
-
-print <
-
-
-
-
-
-
$sharee_privacy_text->{ct_name}
$sharee_privacy_text->{txt01}
-
-
-
-
-
-EOF
-;
-
-
-}
-
my $debug=0;
$debug=1 if($users_sharee->{c_id} eq $dbt->{copri_conf}->{superu_id} || $dbt->{copri_conf}->{stage} eq "test");
@@ -305,7 +257,7 @@ EOF
}
my $button_name = "Weiter";
- print $q->div({-style=>'margin-top:2em;'},""),"\n";
+ print $q->div({-style=>'margin-top:2em;text-align:center;'},""),"\n";
print $q->end_form,"\n";
}else{
@@ -593,17 +545,14 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit
#sharee AGB global new
if($key eq "int14" && $size eq "checkbox"){
$required="";
- my $sharee_agb = "\n";
#bootstrap 5
- if($varenv->{syshost} eq "shareeweb-bayern"){
- $sharee_agb = "\n";
+ my $sharee_agb = "\n";
- }
print $q->label({-for=>"$key", -style=>'padding-top:20px;'},"$label_des"),"\n";
print $q->div({-id=>"$key"},$but->checkbox("1","$key","$ctrel->{$key}","","$required","$autofocus"), " $sharee_agb"),"\n";
print $q->hidden(-name=>"$key",-override=>1,-value=>"null");
- my $sharee_privacy = "\n";
+ my $sharee_privacy = "\n";
print $q->div({-style=>'padding-top:10px;'},"Bitte beachten Sie unsere neuen $sharee_privacy"),"\n" if($aowner == 195 || $aowner == 185 || $aowner == 176);
@@ -645,7 +594,7 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit
}
if($key eq "txt16" && $ctrel->{c_id}){
- print $q->div({-style=>'margin-top:1em;'},""),"\n";
+ print $q->div({-style=>'margin-top:1em;text-align:center;'},""),"\n";
}
}
@@ -660,12 +609,12 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit
my $button_name = "Speichern";
$button_name = "Weiter" if($path =~ /$varenv->{accounting_1_5}|$varenv->{accounting_2}/);
print $q->hidden(-name=>"tinkc_id",-override=>1,-value=>"$ctrel->{c_id}");
- print $q->div({-style=>'margin-top:1em;'},""),"\n";
+ print $q->div({-style=>'margin-top:1em;text-align:center;'},""),"\n";
if($path =~ /$varenv->{accounting_1}/){
- print $q->div({-style=>'margin-top:2em;text-align:center;'},$q->a({-style=>"color:#$bgcolor1;font-size:1.2em;", -role=>"button", -href=>"/$viewsel[0]/Account?sharee_edit=delete_account1$session_and"}, "Daten löschen?")),"\n";# if($ctrel->{txt08});
+ print $q->div({-style=>'margin-top:3em;text-align:center;'},$q->a({-style=>"color:#$bgcolor1;font-size:1.2em;", -role=>"button", -href=>"/$viewsel[0]/Account?sharee_edit=delete_account1$session_and"}, "Daten löschen?")),"\n";# if($ctrel->{txt08});
}
}else{
- print $q->div({-style=>'margin-top:1em;'},""),"\n";
+ print $q->div({-style=>'margin-top:1em;text-align:center;'},""),"\n";
}
}