Dissociates navigationprint and userprint. Both are now separated in main mxt.

This commit is contained in:
Rooty 2020-12-09 01:30:12 +01:00
parent 1f443a5baf
commit 9eb614ddb2
6 changed files with 76 additions and 113 deletions

View File

@ -243,7 +243,7 @@ section {
}
.navbar-right li a {
/* color: #fff; */
color: #666666;
/* text-transform: uppercase; */
/* font-size: 14px; */
font-weight: 600;
@ -251,11 +251,6 @@ section {
/* padding-bottom: 30px; */
}
.glyphicon-log-in {
/* padding-right: 10px; */
right: 10px;
}
.navbar-right li.active a {
/* background-color: rgba(0,0,0,.2); */
}
@ -274,8 +269,24 @@ nav#topmenu.navbar {
}
/****** PUBLIC *******/
div#anonMenu.dropdown-menu{
left: -147px;
div#userMenu li.dropdown {
list-style: none;
text-decoration: none;
}
div#userMenu li.dropdown a{
/* color: #666666; */
}
div#userMenu div.dropdown-menu{
left: -145px;
}
div#userMenu.navbar-right i.fa {
/* float: right; */
margin-right: 8px;
/* display: block; */
/* line-height: 1; */
}
.navbar-right li form#authSession div.input-group-prepend{
@ -301,8 +312,14 @@ div#anonMenu.dropdown-menu{
}
/****** LOGGED *******/
div#authMenu li.dropdown {
list-style: none;
text-decoration: none;
}
div#loggedMenu.dropdown-menu{
min-width: 150px;
min-width: 200px;
left: 90px;
}
.navbar-right li div#loggedMenu a.nav-link {
@ -315,10 +332,9 @@ div#loggedMenu.dropdown-menu{
/* border-radius: .25rem; */
}
.navbar-right div#loggedMenu a.nav-link span.fa,
.navbar-right div#anonMenu i.fa {
.navbar-right div#loggedMenu a.nav-link span.fa{
/* float: right; */
padding-right: 8px;
margin-right: 8px;
/* display: block; */
/* line-height: 1; */
}
@ -380,17 +396,6 @@ div#loggedMenu.dropdown-menu{
margin-top: 35px;
}
/*section#fablab .fa-angle-down {
animation: bounce 3000ms infinite;
}*/
/*************************
******Home NoBanner*******
**************************/
/*section#homeNoBanner .fa-angle-down {
animation: bounce 3000ms infinite;
}*/
/*************************
**********Blog CSS********
**************************/

View File

@ -72,73 +72,29 @@
<mx:bloc id="CSSLOAD"></mx:bloc id="CSSLOAD">
</head>
<body>
<!--.preloader-->
<!-- <div class="preloader"> <i class="fa fa-circle-o-notch fa-spin"></i></div> -->
<!--/.preloader-->
<header id="home">
<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="/">
<img class="img-responsive" style="max-width: 25%;" src="data/image/communities/139_logo.png" 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">
<li class="nav-item active"><a class="nav-link" href="/#homeNoBanner">Accueil<span class="sr-only">(current)</span></a></li>
<li class="nav-item"><a class="nav-link" href="/#fablab">Le Fablab</a></li>
<!-- <li class="nav-item"><a class="nav-link" href="/#association">L'Association LCube</a></li> -->
<li class="nav-item"><a class="nav-link" href="/#blog">Blog</a></li>
<li class="nav-item"><a class="nav-link" href="/#pricing">Adhésion</a></li>
<!-- <li class="nav-item"><a class="nav-link" href="/#team">L'Équipe</a></li> -->
<!-- <li class="nav-item"><a class="nav-link" href="/#about-us">Les chiffres</a></li> -->
<li class="nav-item"><a class="nav-link" href="/#portfolio">Portfolio</a></li>
<li class="nav-item"><a class="nav-link" href="/#contact">Contacts</a></li>
</ul>
<ul class="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>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="authForm" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false"><i class="fa fa-lg fa-lock"></i> Connexion</a>
<div id="anonMenu" class="dropdown-menu" aria-labelledby="authForm">
<mx:text id="userprint"/>
</div>
</li>
</ul>
</div>
</nav>
<nav id="navigationprint" class="navbar main-nav fixed-top navbar-expand-lg navbar-light bg-light" role="navigation">
<mx:text id="navigationprint"/>
<mx:text id="userprint"/>
</nav>
</header><!--/#home-->
<section id="application-content">
<div id="data-guest">
<mx:bloc id="DATA"></mx:bloc id="DATA">
</div>
</section>
<footer id="footer">
<div class="footer-top">
<div class="container-fluid text-center">
<!-- <div class="row"> -->
<mx:text id="sliderpartnersprint"/>
<!-- </div> -->
<mx:text id="sliderpartnersprint"/>
</div>
</div>
<div class="footer-bottom">
<div class="container-fluid text-center">
<!-- <div class="row"> -->
<mx:text id="footerdataprint"/>
<!-- </div> -->
<mx:text id="footerdataprint"/>
</div>
</div>
</footer>
<script type="text/javascript" src="data/javascript/jquery/3.5.1/jquery.min.js"></script>
<script type="text/javascript" src="data/javascript/bootstrap/4.4.1/bootstrap.min.js"></script>
<script type="text/javascript" src="data/template/lcube6/js/main.js"></script>

View File

@ -81,7 +81,10 @@
</head>
<body>
<header id="home">
<mx:text id="navigationprint"/>
<nav id="navigationprint" class="navbar main-nav fixed-top navbar-expand-lg navbar-light bg-light" role="navigation">
<mx:text id="navigationprint"/>
<mx:text id="userprint"/>
</nav>
</header><!--/#home-->
<section id="application-content">

View File

@ -1,20 +1,26 @@
<form role="form" id="authSession" method="post" class="form container-fluid" mXattribut="action:urlActionLogin">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text" id="login"><i class="fa fa-lg fa-user-secret"></i></span>
<input type="text" name="login" value="" class="form" placeholder="<mx:text id="LOGIN"/>" id="Authlogin"/>
</div>
</div>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text" id="password"><i class="fa fa-lg fa-key-modern"></i></span> <!--key key-modern-->
<input type="password" name="password" value="" class="form" placeholder="<mx:text id="PASSWORD"/>" id="Authpassword"/>
</div>
</div>
<button type="submit" id="btnLogin" class="btn btn-block btn-outline-secondary btn-lg btn-sm" aria-pressed="true" mXattribut="value:BtnEnter" mXattribut="title:titleButton"><i class="fa fa-lg fa-sign-in"></i><mx:text id="auth"/></button> <!--sign-in plug -->
<!-- <a class="btn btn-block btn-outline-secondary btn-lg btn-sm" id="btnLogin" role="submit" aria-pressed="true" mXattribut="href:urlActionNewAccount"><i class="fa fa-lg fa-sign-in"></i> <mx:text id="BtnEnter"/></a> -->
<a class="btn btn-block btn-outline-secondary btn-lg btn-sm" role="button" aria-pressed="true" mXattribut="href:urlActionNewAccount"><i class="fa fa-lg fa-community"></i> <mx:text id="NEWACCOUNT"/></a> <!--community group users-->
<a class="btn btn-block btn-outline-secondary btn-lg btn-sm" role="button" aria-pressed="true" mXattribut="href:urlActionNewSubscription"><i class="fa fa-lg fa-handshake-o"></i> <mx:text id="NEWSUBSCRIPTION"/></a> <!--handshake-o -->
<a class="btn btn-block btn-outline-secondary btn-lg btn-sm" role="button" aria-pressed="true" mXattribut="href:urlActionForgotPassword"><i class="fa fa-lg fa-cut-key"></i> <mx:text id="FORGOTPASSWORD"/></a> <!--cut-key-->
</form>
<div id="userMenu" class="navbar-right">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="authForm" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false"><i class="fa fa-lg fa-lock"></i>Connexion</a>
<div class="dropdown-menu" aria-labelledby="authForm">
<form role="form" id="authSession" method="post" class="form container-fluid" mXattribut="action:urlActionLogin">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text" id="login"><i class="fa fa-lg fa-user-secret"></i></span>
<input type="text" name="login" value="" class="form" placeholder="<mx:text id="LOGIN"/>" id="Authlogin"/>
</div>
</div>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text" id="password"><i class="fa fa-lg fa-key-modern"></i></span> <!--key key-modern-->
<input type="password" name="password" value="" class="form" placeholder="<mx:text id="PASSWORD"/>" id="Authpassword"/>
</div>
</div>
<button type="submit" id="btnLogin" class="btn btn-block btn-outline-secondary btn-lg btn-sm" aria-pressed="true" mXattribut="value:BtnEnter" mXattribut="title:titleButton"><i class="fa fa-lg fa-sign-in"></i><mx:text id="auth"/></button>
<a class="btn btn-block btn-outline-secondary btn-lg btn-sm" role="button" aria-pressed="true" mXattribut="href:urlActionNewAccount"><i class="fa fa-lg fa-community"></i> <mx:text id="NEWACCOUNT"/></a> <!--community group users-->
<a class="btn btn-block btn-outline-secondary btn-lg btn-sm" role="button" aria-pressed="true" mXattribut="href:urlActionNewSubscription"><i class="fa fa-lg fa-handshake-o"></i> <mx:text id="NEWSUBSCRIPTION"/></a> <!--handshake-o -->
<a class="btn btn-block btn-outline-secondary btn-lg btn-sm" role="button" aria-pressed="true" mXattribut="href:urlActionForgotPassword"><i class="fa fa-lg fa-cut-key"></i> <mx:text id="FORGOTPASSWORD"/></a> <!--cut-key-->
</form>
</div>
</li>
</div>

View File

@ -1,16 +1,9 @@
<div id="userprint">
<!-- <div id="authform" class="authform"> -->
<div style="margin-left: 15px;">
<label><mx:text id="firstName" /> <mx:text id="lastName" /></label> (<mx:text id="login" />),
</div>
<div style="float:right;margin-right: 15px;">
<a mXattribut="href:disconnect">
<mx:text id="decon" />
</a>
</div>
<br/>
<div style="margin-left: 15px;">
<label><mx:text id="mail" /></label>
</div>
<!-- </div> -->
<div id="authMenu" class="navbar-right">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="loggedForm" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false"><mx:text id="firstName" /> <mx:text id="lastName" /> (<mx:text id="login" />)<span class="fa fa-lg fa-navicon"></span></a>
<div id="loggedMenu" class="dropdown-menu text-center" aria-labelledby="loggedForm">
<a class="nav-link" mXattribut="href:urlAccount"><span class="fa fa-lg fa-user"></span>Mon Compte</a>
<a class="nav-link" mXattribut="href:disconnectURL"><span class="fa fa-lg fa-sign-out"></span><mx:text id="decon"/></a>
</div>
</li>
</div>

View File

@ -65,11 +65,11 @@ class UserPrint extends Printing
global $SERVER_NAME, $SCRIPT_NAME, $CONF_AUTH_SECURE;
if ($GLOBALS["SYSTEM_USER_SESSION"]->user->getId()==$GLOBALS["SYSTEM_DEFAULT_USER_GUEST"])
{
$MaTemplate = new ModeliXeQware($GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."object_printing/userprint/auth.mxt");
$MaTemplate->SetModeliXe(true);
$nodeId = $GLOBALS["SYSTEM_USER_SESSION"]->navigationNodeId;
$GLOBALS['SYSTEM_TEMPLATE']->MxText("imgPath", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']);
$MaTemplate = new ModeliXeQware($GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."object_printing/userprint/auth.mxt");
//$template->SetMxFileParameter($GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['TEMPLATE_DIR'].$GLOBALS['TEMPLATE_CONF']);
$MaTemplate->SetModeliXe(true);
/* création de l'url de login */
$url =$_SERVER['SCRIPT_NAME'];
@ -149,7 +149,7 @@ class UserPrint extends Printing
$url=addIdToUrl($url);
/* picto en fonction de la template */
$MaTemplate->MxAttribut("pictoDisco", $GLOBALS['CONF_DATA_PATH']."data/template/".$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/exit.png");
$MaTemplate->MxAttribut("disconnect", $url);
$MaTemplate->MxAttribut("disconnectURL", $url);
$data=$MaTemplate->MxWrite();
}
$GLOBALS["SYSTEM_TEMPLATE"]->MxText("userprint", $data); // Et voila!!!!!