Enhancement #73 done.

This commit is contained in:
Rooty 2021-04-20 02:38:55 +02:00
parent c9c07284aa
commit 959b91502c
4 changed files with 76 additions and 53 deletions

View File

@ -1,23 +1,24 @@
<!-- <nav id="navigationprint" class="navbar main-nav fixed-top navbar-expand-lg navbar-light bg-light" role="navigation"> -->
<a class="navbar-brand" href="/">
<img class="img-responsive" style="max-width: 100px;" src="data/image/communities/139_logo.svg" alt="logo"/>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topmenu" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="/">
<img class="img-responsive" style="max-width: 100px;" src="data/image/communities/139_logo.svg" alt="logo"/>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topmenu" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="topmenu">
<ul class="navbar-nav mr-auto">
<mx:text id="Navigation"/><mx:text id="nodeDir"/>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="nav-item"><a class="nav-link envelope" href="mailto:contact@fab-l3.org" target="_blank"><i class="fa fa-lg fa-envelope"></i></a></li>
<li class="nav-item"><a class="nav-link mastodon" href="https://social.fab-l3.org/@lcube" target="_blank"><i class="fa fa-lg fa-mastodon"></i></a></li>
<li class="nav-item"><a class="nav-link mobilizon" href="https://ev.fab-l3.org" target="_blank"><i class="fa fa-lg fa-activitypub"></i></a></li>
<li class="nav-item"><a class="nav-link matrix" href="https://rim.fab-l3.org/#/room/#lcube:sim.fab-l3.org" target="_blank"><i class="fa fa-lg fa-matrix-org"></i></a></li>
<li class="nav-item"><a class="nav-link peertube" href="https://tube.fab-l3.org" target="_blank"><i class="fa fa-lg fa-peertube"></i></a></li>
<li class="nav-item"><a class="nav-link nextcloud" href="https://cloud.fab-l3.org" target="_blank"><i class="fa fa-lg fa-nextcloud"></i></a></li>
<li class="nav-item"><a class="nav-link twitter" href="https://twitter.com/FablabLCube" target="_blank"><i class="fa fa-lg fa-twitter"></i></a></li>
</ul>
</div>
<!-- </nav> -->
<div class="collapse navbar-collapse" id="topmenu">
<ul class="navbar-nav mr-auto">
<mx:text id="Navigation"/><mx:text id="nodeDir"/>
</ul>
<mx:bloc id="blocSLinks">
<ul class="nav navbar-nav navbar-right">
<mx:bloc id="linkEmail"><li class="nav-item"><a class="nav-link envelope" mXattribut="href:email" target="_blank"><i class="fa fa-lg fa-envelope"></i></a></li></mx:bloc id="linkEmail">
<mx:bloc id="linkMastodon"><li class="nav-item"><a class="nav-link mastodon" mXattribut="href:mastodon" target="_blank"><i class="fa fa-lg fa-mastodon"></i></a></li></mx:bloc id="linkMastodon">
<mx:bloc id="linkMobilizon"><li class="nav-item"><a class="nav-link mobilizon" mXattribut="href:mobilizon" target="_blank"><i class="fa fa-lg fa-activitypub"></i></a></li></mx:bloc id="linkMobilizon">
<mx:bloc id="linkMatrix"><li class="nav-item"><a class="nav-link matrix" mXattribut="href:matrix" target="_blank"><i class="fa fa-lg fa-matrix-org"></i></a></li></mx:bloc id="linkMatrix">
<mx:bloc id="linkPeertube"><li class="nav-item"><a class="nav-link peertube" mXattribut="href:peertube" target="_blank"><i class="fa fa-lg fa-peertube"></i></a></li></mx:bloc id="linkPeertube">
<mx:bloc id="linkNextcloud"><li class="nav-item"><a class="nav-link nextcloud" mXattribut="href:nextcloud" target="_blank"><i class="fa fa-lg fa-nextcloud"></i></a></li></mx:bloc id="linkNextcloud">
<mx:bloc id="linkTwitter"><li class="nav-item"><a class="nav-link twitter" mXattribut="href:twitter" target="_blank"><i class="fa fa-lg fa-twitter"></i></a></li></mx:bloc id="linkTwitter">
<mx:bloc id="linkFacebook"><li class="nav-item"><a class="nav-link facebook" mXattribut="href:facebook" target="_blank"><i class="fa fa-lg fa-facebook"></i></a></li></mx:bloc id="linkFacebook">
</ul>
</mx:bloc id="blocSLinks">
</div>

View File

@ -1,24 +1,24 @@
<!-- <nav id="navigationprint" class="navbar main-nav fixed-top navbar-expand-lg navbar-light bg-light m-0 p-0" role="navigation"> -->
<a class="navbar-brand" href="/">
<!-- <img class="img-responsive" style="max-width: 100px;" src="data/image/communities/139_logo.svg" alt="logo"/> -->
<mx:image id="pictoCommunity"/>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topmenu" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="/">
<mx:image id="pictoCommunity"/>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topmenu" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="topmenu">
<ul class="navbar-nav mr-auto">
<mx:text id="Navigation"/><mx:text id="nodeDir"/>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="nav-item"><a class="nav-link envelope" href="mailto:contact@fab-l3.org" target="_blank"><i class="fa fa-lg fa-envelope"></i></a></li>
<li class="nav-item"><a class="nav-link mastodon" href="https://social.fab-l3.org/@lcube" target="_blank"><i class="fa fa-lg fa-mastodon"></i></a></li>
<li class="nav-item"><a class="nav-link mobilizon" href="https://ev.fab-l3.org" target="_blank"><i class="fa fa-lg fa-activitypub"></i></a></li>
<li class="nav-item"><a class="nav-link matrix" href="https://rim.fab-l3.org/#/room/#lcube:sim.fab-l3.org" target="_blank"><i class="fa fa-lg fa-matrix-org"></i></a></li>
<li class="nav-item"><a class="nav-link peertube" href="https://tube.fab-l3.org" target="_blank"><i class="fa fa-lg fa-peertube"></i></a></li>
<li class="nav-item"><a class="nav-link nextcloud" href="https://cloud.fab-l3.org" target="_blank"><i class="fa fa-lg fa-nextcloud"></i></a></li>
<li class="nav-item"><a class="nav-link twitter" href="https://twitter.com/FablabLCube" target="_blank"><i class="fa fa-lg fa-twitter"></i></a></li>
</ul>
</div>
<!-- </nav> -->
<div class="collapse navbar-collapse" id="topmenu">
<ul class="navbar-nav mr-auto">
<mx:text id="Navigation"/><mx:text id="nodeDir"/>
</ul>
<mx:bloc id="blocSLinks">
<ul class="nav navbar-nav navbar-right">
<mx:bloc id="linkEmail"><li class="nav-item"><a class="nav-link envelope" mXattribut="href:email" target="_blank"><i class="fa fa-lg fa-envelope"></i></a></li></mx:bloc id="linkEmail">
<mx:bloc id="linkMastodon"><li class="nav-item"><a class="nav-link mastodon" mXattribut="href:mastodon" target="_blank"><i class="fa fa-lg fa-mastodon"></i></a></li></mx:bloc id="linkMastodon">
<mx:bloc id="linkMobilizon"><li class="nav-item"><a class="nav-link mobilizon" mXattribut="href:mobilizon" target="_blank"><i class="fa fa-lg fa-activitypub"></i></a></li></mx:bloc id="linkMobilizon">
<mx:bloc id="linkMatrix"><li class="nav-item"><a class="nav-link matrix" mXattribut="href:matrix" target="_blank"><i class="fa fa-lg fa-matrix-org"></i></a></li></mx:bloc id="linkMatrix">
<mx:bloc id="linkPeertube"><li class="nav-item"><a class="nav-link peertube" mXattribut="href:peertube" target="_blank"><i class="fa fa-lg fa-peertube"></i></a></li></mx:bloc id="linkPeertube">
<mx:bloc id="linkNextcloud"><li class="nav-item"><a class="nav-link nextcloud" mXattribut="href:nextcloud" target="_blank"><i class="fa fa-lg fa-nextcloud"></i></a></li></mx:bloc id="linkNextcloud">
<mx:bloc id="linkTwitter"><li class="nav-item"><a class="nav-link twitter" mXattribut="href:twitter" target="_blank"><i class="fa fa-lg fa-twitter"></i></a></li></mx:bloc id="linkTwitter">
<mx:bloc id="linkFacebook"><li class="nav-item"><a class="nav-link facebook" mXattribut="href:facebook" target="_blank"><i class="fa fa-lg fa-facebook"></i></a></li></mx:bloc id="linkFacebook">
</ul>
</mx:bloc id="blocSLinks">
</div>

View File

@ -9,13 +9,16 @@
<ul class="navbar-nav mr-auto">
<mx:text id="Navigation"/><mx:text id="nodeDir"/>
</ul>
<mx:bloc id="blocSLinks">
<ul class="nav navbar-nav navbar-right">
<li class="nav-item"><a class="nav-link envelope" href="mailto:contact@fab-l3.org" target="_blank"><i class="fa fa-lg fa-envelope"></i></a></li>
<li class="nav-item"><a class="nav-link mastodon" href="https://social.fab-l3.org/@lcube" target="_blank"><i class="fa fa-lg fa-mastodon"></i></a></li>
<li class="nav-item"><a class="nav-link mobilizon" href="https://ev.fab-l3.org" target="_blank"><i class="fa fa-lg fa-activitypub"></i></a></li>
<li class="nav-item"><a class="nav-link matrix" href="https://rim.fab-l3.org/#/room/#lcube:sim.fab-l3.org" target="_blank"><i class="fa fa-lg fa-matrix-org"></i></a></li>
<li class="nav-item"><a class="nav-link peertube" href="https://tube.fab-l3.org" target="_blank"><i class="fa fa-lg fa-peertube"></i></a></li>
<li class="nav-item"><a class="nav-link nextcloud" href="https://cloud.fab-l3.org" target="_blank"><i class="fa fa-lg fa-nextcloud"></i></a></li>
<li class="nav-item"><a class="nav-link twitter" href="https://twitter.com/FablabLCube" target="_blank"><i class="fa fa-lg fa-twitter"></i></a></li>
<mx:bloc id="linkEmail"><li class="nav-item"><a class="nav-link envelope" mXattribut="href:email" target="_blank"><i class="fa fa-lg fa-envelope"></i></a></li></mx:bloc id="linkEmail">
<mx:bloc id="linkMastodon"><li class="nav-item"><a class="nav-link mastodon" mXattribut="href:mastodon" target="_blank"><i class="fa fa-lg fa-mastodon"></i></a></li></mx:bloc id="linkMastodon">
<mx:bloc id="linkMobilizon"><li class="nav-item"><a class="nav-link mobilizon" mXattribut="href:mobilizon" target="_blank"><i class="fa fa-lg fa-activitypub"></i></a></li></mx:bloc id="linkMobilizon">
<mx:bloc id="linkMatrix"><li class="nav-item"><a class="nav-link matrix" mXattribut="href:matrix" target="_blank"><i class="fa fa-lg fa-matrix-org"></i></a></li></mx:bloc id="linkMatrix">
<mx:bloc id="linkPeertube"><li class="nav-item"><a class="nav-link peertube" mXattribut="href:peertube" target="_blank"><i class="fa fa-lg fa-peertube"></i></a></li></mx:bloc id="linkPeertube">
<mx:bloc id="linkNextcloud"><li class="nav-item"><a class="nav-link nextcloud" mXattribut="href:nextcloud" target="_blank"><i class="fa fa-lg fa-nextcloud"></i></a></li></mx:bloc id="linkNextcloud">
<mx:bloc id="linkTwitter"><li class="nav-item"><a class="nav-link twitter" mXattribut="href:twitter" target="_blank"><i class="fa fa-lg fa-twitter"></i></a></li></mx:bloc id="linkTwitter">
<mx:bloc id="linkFacebook"><li class="nav-item"><a class="nav-link facebook" mXattribut="href:facebook" target="_blank"><i class="fa fa-lg fa-facebook"></i></a></li></mx:bloc id="linkFacebook">
</ul>
</mx:bloc id="blocSLinks">
</div>

View File

@ -91,7 +91,26 @@ class NavigationPrint extends Printing
}
/* Obtention des informations du bloc d'affichage des réseaux sociaux */
/* #TODO */
/* Cas où le noeud correspond à la racine de la plateforme Qware */
if(recupCommunity() === "3") $nodeCom = "2"; else $nodeCom = recupCommunity();
$NodeSettings=$GLOBALS["SYSTEM_MANAGER"]["NODESETTINGS"]->createInstance($nodeCom);
/* Link Email */
if( $NodeSettings->getEmail() && $NodeSettings->getEmail()!="" ) { $MaTemplate->MxAttribut("blocSLinks.linkEmail.email", "mailto:".$NodeSettings->getEmail()); } else $MaTemplate->MxBloc("blocSLinks.linkEmail", "DELETE");
/* Link Mastodon */
if( $NodeSettings->getMastodon() && $NodeSettings->getMastodon()!="" ) { $MaTemplate->MxAttribut("blocSLinks.linkMastodon.mastodon", $NodeSettings->getMastodon()); } else $MaTemplate->MxBloc("blocSLinks.linkMastodon", "DELETE");
/* Link Mobilizon */
if( $NodeSettings->getMobilizon() && $NodeSettings->getobilizon()!="" ) { $MaTemplate->MxAttribut("blocSLinks.linkMatrix.mobilizon", $NodeSettings->getMobilizon()); } else $MaTemplate->MxBloc("blocSLinks.linkMobilizon", "DELETE");
/* Link Matrix */
if( $NodeSettings->getMatrix() && $NodeSettings->getMatrix()!="" ) { $MaTemplate->MxAttribut("blocSLinks.linkMatrix.matrix", $NodeSettings->getMatrix()); } else $MaTemplate->MxBloc("blocSLinks.linkMatrix", "DELETE");
/* Link Peertube */
if( $NodeSettings->getPeertube() && $NodeSettings->getPeertube()!="" ) { $MaTemplate->MxAttribut("blocSLinks.linkPeertube.peertube", $NodeSettings->getPeertube()); } else $MaTemplate->MxBloc("blocSLinks.linkPeertube", "DELETE");
/* Link Nextcloud */
if( $NodeSettings->getNextcloud() && $NodeSettings->getNextcloud()!="" ) { $MaTemplate->MxAttribut("blocSLinks.linkNextcloud.nextcloud", $NodeSettings->getNextcloud()); } else $MaTemplate->MxBloc("blocSLinks.linkNextcloud", "DELETE");
/* Link Twitter */
if( $NodeSettings->getTwitter() && $NodeSettings->getTwitter()!="" ) { $MaTemplate->MxAttribut("blocSLinks.linkTwitter.twitter", $NodeSettings->getTwitter()); } else $MaTemplate->MxBloc("blocSLinks.linkTwitter", "DELETE");
/* Link Facebook */
if( $NodeSettings->getFacebook() && $NodeSettings->getFacebook()!="" ) { $MaTemplate->MxAttribut("blocSLinks.linkFacebook.facebook", $NodeSettings->getFacebook()); } else $MaTemplate->MxBloc("blocSLinks.linkFacebook", "DELETE");
// BLOC INFOS UTILISATEUR
if ($GLOBALS["SYSTEM_USER_SESSION"]->user->getId()==$GLOBALS["SYSTEM_DEFAULT_USER_GUEST"])