diff --git a/copri4/main/img/Logo-LastenradBayern-01.png b/copri4/main/img/Logo-LastenradBayern-01.png new file mode 100755 index 0000000..13f9b10 Binary files /dev/null and b/copri4/main/img/Logo-LastenradBayern-01.png differ diff --git a/copri4/main/img/konrad-Briefpapier.jpg b/copri4/main/img/konrad-Briefpapier.jpg deleted file mode 100644 index 807b47d..0000000 Binary files a/copri4/main/img/konrad-Briefpapier.jpg and /dev/null differ diff --git a/copri4/main/js/mobile_script.js b/copri4/main/js/mobile_script.js index ae42923..ecc1821 100644 --- a/copri4/main/js/mobile_script.js +++ b/copri4/main/js/mobile_script.js @@ -19,12 +19,12 @@ function change_contrast(){ const fgcol = style.color; console.log(fgcol); - if(bgcol == ('rgb(0, 141, 210)')){ //008dd2 (blue) + if(bgcol == ('rgb(0, 156, 217)')){ //009cd9 (blue) element[i].style.backgroundColor = "rgb(63, 63, 63)";//3f3f3f (black) element[i].style.color = "rgb(255, 255, 254)";//fffffe (white) } if(bgcol == ('rgb(63, 63, 63)')){ //black - element[i].style.backgroundColor = "rgb(0, 141, 210)"; + element[i].style.backgroundColor = "rgb(0, 156, 217)"; element[i].style.color = "rgb(255, 255, 254)"; } //hover active @@ -39,7 +39,7 @@ function change_contrast(){ } //if only font ist colored and backround is white - if(fgcol == ('rgb(0, 141, 210)') && bgcol == ('rgb(255, 255, 255)')){ //008dd2 + if(fgcol == ('rgb(0, 156, 217)') && bgcol == ('rgb(255, 255, 255)')){ //009cd9 element[i].style.color = "rgb(63, 63, 63)"; element[i].style.backgroundColor = "rgb(255, 255, 255)"; } @@ -48,7 +48,7 @@ function change_contrast(){ element[i].style.backgroundColor = "rgb(3, 101, 149)"; } if(fgcol == ('rgb(63, 63, 63)') && bgcol == ('rgb(255, 255, 255)')){ //black - element[i].style.color = "rgb(0, 141, 210)"; + element[i].style.color = "rgb(0, 156, 217)"; element[i].style.backgroundColor = "rgb(255, 255, 255)"; } diff --git a/copri4/main/src/Mod/APIxmlserver.pm b/copri4/main/src/Mod/APIxmlserver.pm index 7af2b7a..930f5f1 100755 --- a/copri4/main/src/Mod/APIxmlserver.pm +++ b/copri4/main/src/Mod/APIxmlserver.pm @@ -78,7 +78,7 @@ sub handler { # # add_LVuser # 12345678 - # ragu@gnu-systems.de + # ragu@gu-syems.de # geheim123 # @@ -104,7 +104,7 @@ sub handler { table => "contentadr", fetch => "one", template_id => "202", - txt08 => "$xmlref->{emailID}", + txt08 => "ilike::" . $q->escapeHTML($xmlref->{emailID}), }; my $record_e = { c_id => "" }; $record_e = $dbt->fetch_record($dbh,$pref_e); diff --git a/copri4/main/src/Mod/KMLout.pm b/copri4/main/src/Mod/KMLout.pm index 755622c..21bddf0 100755 --- a/copri4/main/src/Mod/KMLout.pm +++ b/copri4/main/src/Mod/KMLout.pm @@ -166,7 +166,7 @@ sub kmlGenerator { $station_groupID = $1 if($station_group =~ /(\d+)/); $bike_groupID = $1 if($bike_group =~ /(\d+)/); - $bw->log("KMLout bike available if: $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}","",""); + #$bw->log("KMLout bike available if: $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}","",""); #if Lastenrad if($station_groupID == $lastenrad && $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}){ diff --git a/copri4/main/src/Tpl/Karte.pm b/copri4/main/src/Tpl/Karte.pm index d8a06eb..181fd1d 100755 --- a/copri4/main/src/Tpl/Karte.pm +++ b/copri4/main/src/Tpl/Karte.pm @@ -60,10 +60,12 @@ sub tpl(){ my $icon_green = "Open_Green.png"; my $icon_red = "Open_Red.png"; my $icon_blue = "Open_Blue.png"; + my $mapheight = "600px;"; if($project eq "Bayern"){ $icon_green = "LastenradBay_Standortpfeil_gruen_03a.png"; $icon_red = "LastenradBay_Standortpfeil_rot_03a.png"; $icon_blue = "LastenradBay_Standortpfeil_blau_03a.png"; + $mapheight = "800px;"; } $users_sharee->{c_id} = "0" if(!$users_sharee->{c_id}); @@ -76,9 +78,9 @@ sub tpl(){ my $preserve_view = "false"; $preserve_view = "true" if($filesize < 200);#it's like empty without publixc stations - print "
\n"; + print "
\n"; - print "
\n"; + print "
\n"; print< diff --git a/copri4/shareeapp-operator/src/Lib/Mlogic.pm b/copri4/shareeapp-operator/src/Lib/Mlogic.pm index 48151e3..ecae759 100755 --- a/copri4/shareeapp-operator/src/Lib/Mlogic.pm +++ b/copri4/shareeapp-operator/src/Lib/Mlogic.pm @@ -43,9 +43,9 @@ sub tpl(){ my $coo = $q->cookie('domcookie') || $q->param('sessionid') || ""; #my $api_test = "sharee_kn"; - #my $api_test = "sharee_fr01"; my $bike="FR1538"; + my $api_test = "sharee_fr01"; my $bike="FR1538"; #my $api_test = "sharee_wue"; - my $api_test = "sharee_sx"; my $bike="S3X1001"; + #my $api_test = "sharee_sx"; my $bike="S3X1001"; #my $api_test = "sharee_ren"; my $bike="REN2"; print $q->div({-style=>'float:right;text-align:right;height:25px;padding:6px 15px;background-color:white'},$q->a({-style=>"background-color:#ffffff;color:#$bgcolor1;", -href=>"$varenv->{metahost}/src/scripts/tests/index.pl?sessionid=$coo\&api_test=$api_test\&bike=$bike", -target=>'_blank'}," [ tests --> $api_test ] "),"$users_sharee->{txt08}",$q->a({-style=>"color:#$bgcolor1;", -href=>"logout_sharee$session"},"logout")),"\n"; diff --git a/copri4/shareeweb-project/src/Lib/Mlogic.pm b/copri4/shareeweb-project/src/Lib/Mlogic.pm index 23b3b24..fed6ba5 100755 --- a/copri4/shareeweb-project/src/Lib/Mlogic.pm +++ b/copri4/shareeweb-project/src/Lib/Mlogic.pm @@ -53,13 +53,13 @@ sub tpl(){ #my $api_test = "sharee_wue"; my $api_test = "sharee_sx"; my $bike="S3X1001"; #my $api_test = "sharee_ren"; my $bike="REN2"; - print $q->div({-style=>'float:right;text-align:right;height:25px;padding:6px 15px;background-color:white'},$q->a({-style=>"background-color:#ffffff;color:#$bgcolor1;", -href=>"$varenv->{metahost}/src/scripts/tests/index.pl?sessionid=$coo\&api_test=$api_test\&bike=$bike", -target=>'_blank'}," [ tests --> $api_test ] ")),"\n"; + print $q->div({-style=>'text-align:right;height:25px;padding:6px 15px;background-color:white'},$q->a({-style=>"background-color:#ffffff;color:#$bgcolor1;", -href=>"$varenv->{metahost}/src/scripts/tests/index.pl?sessionid=$coo\&api_test=$api_test\&bike=$bike", -target=>'_blank'}," [ tests --> $api_test ] ")),"\n"; } - my $site_padding = "20px 0"; - if($dbt->{website}->{$varenv->{syshost}}->{layout} eq "iframe"){ - $site_padding = "0"; - } + my $site_padding = "0 0 20px 0"; + #if($dbt->{website}->{$varenv->{syshost}}->{layout} eq "iframe"){ + # $site_padding = "0"; + #} if(1==1){ @@ -93,6 +93,40 @@ sub tpl(){ color: fffffe; background-color: #$hgcolor1; } + + ul#LeftNavi { + position:fixed; + margin:20px 0; + width: 175px; + height:100%; + padding:$site_padding; + vertical-align:top; + border: 0px solid white; + } + ul#LeftNavi li { + list-style: none; + padding:1px; + } + ul#LeftNavi li a { + display: block; + transition: all 0.3s ease; + margin: 0; + padding: 1em 3%; + width:180px; + background-color: #$bgcolor1; + text-decoration: none; + font-weight: normal; + color: #fffffe; + } + ul#LeftNavi a:hover { + color: #fffffe; + background-color: #$hgcolor1; + } + ul#LeftNavi a:active { + color: fffffe; + background-color: #$hgcolor1; + } + "; my $lmenu0 = ""; @@ -115,21 +149,29 @@ sub tpl(){ } #bootstrap 5 with standalone site - print "
\n" if($dbt->{website}->{$varenv->{syshost}}->{layout} eq "standalone"); + if($dbt->{website}->{$varenv->{syshost}}->{layout} eq "standalone"){ + print "
\n"; + } - print "
\n"; - print ""; - print ""; - print ""; - print ""; + print "
\n"; + #print ""; + print ""; + print ""; + print ""; + print ""; if($users_sharee->{c_id} && $R::sharee_edit ne "delete_account2"){ print " | $users_sharee->{txt08} logout\n"; } print "
\n"; - print "
\n"; + print $q->div({-style=>"text-align:left;width:100%;margin:1em 0;background-color:#$bgcolor1;"},$q->img({-style=>'height:10em;', -src=>"$varenv->{metahost}/img/Logo-LastenradBayern-01.png"})),"\n"; + #test Bayern left-site menue + #print $q->div({-style=>"float:left;text-align:left;border:1px dotted black;"},$q->ul({-id=>'LeftNavi'},$lmenu0)),"\n"; + #print "
\n"; + + print "
\n"; print $q->div({-style=>"text-align:left;border:0px dotted #$fgcolor1;"},$q->ul({-id=>'TopNavi'},$lmenu0)),"\n"; if(($node_meta->{tpl_id} == 1 || $node_meta->{tpl_id} == 3) && $node_meta->{main_id} == 200017){