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"; - print "\n"; - #print "
\n"; - #----------------- -}#end else bootstrap version - +} #print $q->div({-style=>'position:fixed;bottom:4%;right:2%;z-index:10;font-size:13px;'},"--> $varenv->{syshost} | $varenv->{merchant_id} | $bgcolor1 | template -> $node_meta->{tpl_name} | $users_sharee->{c_id}"),"\n" if($users_sharee->{c_id} eq $dbt->{copri_conf}->{superu_id} || $dbt->{copri_conf}->{stage} eq "test"); } 1; diff --git a/copri4/shareeapp-operator/src/Tpl/Anmelden.pm b/copri4/shareeapp-operator/src/Tpl/Anmelden.pm index 1d5d6ff..5db3506 100755 --- a/copri4/shareeapp-operator/src/Tpl/Anmelden.pm +++ b/copri4/shareeapp-operator/src/Tpl/Anmelden.pm @@ -102,10 +102,10 @@ sub tpl(){ $sum = $lb->round($sum); if($ctpos_count > 0 && $sum > 0){ print $q->div({-class=>'content2'}, "Ihr Konto ist nicht ausgeglichen ($sum). Bitte kontaktieren Sie uns damit wir Ihre Rechnungstellung beschleunigen. Anschließend können Sie Ihren Account löschen. Danke für Ihr Verständnis"),"\n"; - print $q->div({-style=>'margin-top:1em;'},$q->a({-class=>"btn btn-primary btn-lg btn-block",-href=>'javascript:history.back()'}, "zurück")),"\n"; + print $q->div({-style=>'margin-top:1em;text-align:center;'},$q->a({-class=>"btn btn-primary btn-lg btn-block",-href=>'javascript:history.back()', -style=>"border:1px solid #$bgcolor1;background-color:#$bgcolor1;color:#fffffe;"}, "zurück")),"\n"; }else{ print $q->div({-class=>'content2'}, "Wollen Sie wirklich Ihre Daten löschen?"),"\n"; - print $q->div({-style=>'margin-top:1em;'},""),"\n"; + print $q->div({-style=>'margin-top:1em;text-align:center;'},""),"\n"; } }elsif($R::sharee_edit eq "delete_account2" && $users_sharee->{c_id}){ my $rows = 0; @@ -124,7 +124,7 @@ sub tpl(){ print $q->textfield(-class=>'form-control', -name=>'email', -value=>'', -override=>1, -type=>'email',-class=>'form-control', -id=>'Email', -placeholder=>'E-Mail Adresse', -required=>1, -autofocus=>1),"\n"; print $q->hidden(-name=>'password_forgotten',-value=>"1"); - print $q->div({-style=>'margin-top:1em;'},""),"\n"; + print $q->div({-style=>'margin-top:1em;text-align:center;'},""),"\n"; #Login }elsif(!$R::password_forgotten){ @@ -149,11 +149,11 @@ Oder es besteht bereits ein Account mit Ihrer E-Mail-Adresse oder Telefonnummer #js auth # print $q->div({-style=>'margin-top:1em;'},"
Anmelden
"),"\n"; - print $q->div({-style=>'margin-top:1em;'},""),"\n"; + print $q->div({-style=>'margin-top:1em;text-align:center;'},""),"\n"; - print $q->div({-style=>'margin-top:1em;'},$q->a({-class=>"btn btn-default btn-lg btn-block", -style=>"background-color:#ffffff;color:#$bgcolor1;", -role=>"button", -href=>"$varenv->{wwwhost}/$varenv->{mandant}/Account/$varenv->{accounting_1}"}, "Neues Nutzerkonto eröffnen")),"\n"; + print $q->div({-style=>'margin-top:1em;text-align:center;'},$q->a({-class=>"btn btn-default btn-lg btn-block", -style=>"background-color:#ffffff;color:#$bgcolor1;", -role=>"button", -href=>"$varenv->{wwwhost}/$varenv->{mandant}/Account/$varenv->{accounting_1}"}, "Neues Nutzerkonto eröffnen")),"\n"; - print $q->div({-style=>'margin-top:1em;'},$q->a({-class=>"", -style=>"background-color:#ffffff;color:#$bgcolor1;font-size:1.1em;text-decoration:underline;", -role=>"button", -href=>"$varenv->{wwwhost}/$varenv->{mandant}/Account"}, "Neues Passwort anfordern")),"\n"; + print $q->div({-style=>'margin-top:1em;text-align:center;'},$q->a({-class=>"", -style=>"background-color:#ffffff;color:#$bgcolor1;font-size:1.1em;text-decoration:underline;", -role=>"button", -href=>"$varenv->{wwwhost}/$varenv->{mandant}/Account"}, "Neues Passwort anfordern")),"\n"; } print "\n"; diff --git a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm index d1444e0..366058f 100755 --- a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm +++ b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm @@ -145,8 +145,8 @@ sub tpl(){ my $sharee_agb_text = {}; $sharee_agb_text->{ct_name} = "AGB"; - $sharee_agb_text->{txt01} = ""; - $sharee_agb_text->{txt01} = "" if($aowner == 195 || $aowner == 185 || $aowner == 176); + $sharee_agb_text->{txt01} = ""; + $sharee_agb_text->{txt01} = "" if($aowner == 195 || $aowner == 185 || $aowner == 176); my $sharee_privacy_text = {}; $sharee_privacy_text->{ct_name} = "Datenschutzhinweise"; @@ -154,8 +154,6 @@ sub tpl(){ print "
\n"; -#bootstrap 5 -if($varenv->{syshost} eq "shareeweb-bayern"){ print <