diff --git a/copri4/main/src/Tpl/Karte_osm.pm b/copri4/main/src/Tpl/Karte_osm.pm index e80a773..2aab074 100755 --- a/copri4/main/src/Tpl/Karte_osm.pm +++ b/copri4/main/src/Tpl/Karte_osm.pm @@ -50,7 +50,11 @@ sub tpl(){ $api_return->{authcookie} = $dbt->{website}->{$varenv->{syshost}}->{merchant_id} if(!$api_return->{authcookie}); $project = $dbt->{website}->{$varenv->{syshost}}->{project} if($dbt->{website}->{$varenv->{syshost}}->{project}); $uri_request = $dbt->{website}->{$varenv->{syshost}}->{operatorWeb}; - print $q->div({-class=>"content2_contact"},"Hier können Lastenfahrräder gemietet werden:"),"\n"; + if($project eq "Freiburg"){ + print $q->div({-style=>"color:#026666;font-size:20px;padding-bottom:12px;"},"Hier können öffentlich verfügbare Lastenfahrräder gemietet werden"),"\n"; + }else{ + print $q->div({-class=>"content2_contact"},"Hier können Lastenfahrräder gemietet werden:"),"\n"; + } }elsif($dbt->{operator}->{$varenv->{dbname}}->{merchant_id}){ $api_return->{authcookie} = $dbt->{operator}->{$varenv->{dbname}}->{merchant_id} if(!$api_return->{authcookie}); $initMap = $dbt->{operator}->{$varenv->{dbname}}->{initMap} if($dbt->{operator}->{$varenv->{dbname}}->{initMap}); @@ -86,7 +90,7 @@ sub tpl(){ $icon_blue = "LastenradBay_Standortpfeil_blau_03a.png"; $mapheight = "800px;" if($varenv->{syshost} !~ /shareedms-/); }elsif($project eq "Freiburg"){ - $mapheight = "550px;"; + $mapheight = "500px;"; } $users_sharee->{c_id} = "0" if(!$users_sharee->{c_id}); @@ -205,10 +209,11 @@ EOF print "\n"; -#print $q->div({-class=>"content2_legende", -style=>'font-weight:bold;'}, "• Ist ein Lastenrad an einer Mietradstation verfügbar?"),"\n"; -print $q->div({-class=>"content2_legende"}, $q->img({-style=>'height:37px;', -src=>"$varenv->{metahost}/img/$icon_green"}), "Lastenrad verfügbar"),"\n"; -print $q->div({-class=>"content2_legende"}, $q->img({-style=>'height:37px;', -src=>"$varenv->{metahost}/img/$icon_red"}), "Lastenrad nicht verfügbar"),"\n"; -#print $q->div({-class=>"content2_legende"}, " "),"\n"; +if($project ne "Freiburg"){ + print $q->div({-class=>"content2_legende"}, $q->img({-style=>'height:37px;', -src=>"$varenv->{metahost}/img/$icon_green"}), "Lastenrad verfügbar"),"\n"; + print $q->div({-class=>"content2_legende"}, $q->img({-style=>'height:37px;', -src=>"$varenv->{metahost}/img/$icon_red"}), "Lastenrad nicht verfügbar"),"\n"; + #print $q->div({-class=>"content2_legende"}, " "),"\n"; +} print "$initMap|$varenv->{dbname}|$api_return->{authcookie}|$users_sharee->{c_id}" if($users_dms->{u_id} == $dbt->{copri_conf}->{superu_id}); diff --git a/copri4/shareeweb-project/src/Lib/Mlogic.pm b/copri4/shareeweb-project/src/Lib/Mlogic.pm index c2149cc..c7467d5 100755 --- a/copri4/shareeweb-project/src/Lib/Mlogic.pm +++ b/copri4/shareeweb-project/src/Lib/Mlogic.pm @@ -153,15 +153,7 @@ sub tpl(){ if($node->{$id}->{node_name} eq "Anmelden" && $users_sharee->{c_id}){ $lmenu0 .= $but->lia_button("/$parent_node/$varenv->{profile}$session","Mein Profil",$node->{$id}->{main_id},"","$mstyle",$users_dms->{u_id}); }else{ - if($project eq "Freiburg"){ - if($node->{$id}->{node_name} eq "Karte"){ - $lmenu0 .= $but->lia_button("/$parent_node/$node->{$id}->{node_path}","Standortkarte",$node->{$id}->{main_id},"","$mstyle",$users_dms->{u_id}); - }elsif($node->{$id}->{node_name} ne "Kontakt"){ $lmenu0 .= $but->lia_button("/$parent_node/$node->{$id}->{node_path}",$node->{$id}->{node_name},$node->{$id}->{main_id},"","$mstyle",$users_dms->{u_id}); - } - }else{ - $lmenu0 .= $but->lia_button("/$parent_node/$node->{$id}->{node_path}",$node->{$id}->{node_name},$node->{$id}->{main_id},"","$mstyle",$users_dms->{u_id}); - } } } @@ -190,12 +182,9 @@ sub tpl(){ print $q->div({-style=>"text-align:left;width:100%;margin:1em 0;background-color:#$bgcolor1;"},$q->img({-style=>'height:10em;', -src=>"$dbt->{website}->{$varenv->{syshost}}->{operatorWeb1}/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 "