From 9eb614ddb2bdce65e32be0ee8198b904b07ee246 Mon Sep 17 00:00:00 2001 From: "tristan.champomier" Date: Wed, 9 Dec 2020 01:30:12 +0100 Subject: [PATCH] Dissociates navigationprint and userprint. Both are now separated in main mxt. --- data/template/lcube6/css/main.css | 51 +++++++++-------- data/template/lcube6/main-guest.mxt | 56 ++----------------- data/template/lcube6/main.mxt | 5 +- .../lcube6/object_printing/userprint/auth.mxt | 46 ++++++++------- .../object_printing/userprint/userinfo.mxt | 23 +++----- lib/object_printing/userprint/userprint.php | 8 +-- 6 files changed, 76 insertions(+), 113 deletions(-) diff --git a/data/template/lcube6/css/main.css b/data/template/lcube6/css/main.css index 1e772b3..34810d6 100644 --- a/data/template/lcube6/css/main.css +++ b/data/template/lcube6/css/main.css @@ -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******** **************************/ diff --git a/data/template/lcube6/main-guest.mxt b/data/template/lcube6/main-guest.mxt index 6b08c72..9e650b5 100755 --- a/data/template/lcube6/main-guest.mxt +++ b/data/template/lcube6/main-guest.mxt @@ -72,73 +72,29 @@ - - - -
- +
-
- - diff --git a/data/template/lcube6/main.mxt b/data/template/lcube6/main.mxt index 5563cad..e4309e9 100755 --- a/data/template/lcube6/main.mxt +++ b/data/template/lcube6/main.mxt @@ -81,7 +81,10 @@
- +
diff --git a/data/template/lcube6/object_printing/userprint/auth.mxt b/data/template/lcube6/object_printing/userprint/auth.mxt index 3902fa9..feed880 100755 --- a/data/template/lcube6/object_printing/userprint/auth.mxt +++ b/data/template/lcube6/object_printing/userprint/auth.mxt @@ -1,20 +1,26 @@ -
-
-
- - " id="Authlogin"/> -
-
-
-
- - " id="Authpassword"/> -
-
- - - - - - -
+ diff --git a/data/template/lcube6/object_printing/userprint/userinfo.mxt b/data/template/lcube6/object_printing/userprint/userinfo.mxt index 4ba4037..3489b1f 100755 --- a/data/template/lcube6/object_printing/userprint/userinfo.mxt +++ b/data/template/lcube6/object_printing/userprint/userinfo.mxt @@ -1,16 +1,9 @@ -
- -
- (), -
-
- - - -
-
-
- -
- + diff --git a/lib/object_printing/userprint/userprint.php b/lib/object_printing/userprint/userprint.php index 99b34a2..fa97b13 100755 --- a/lib/object_printing/userprint/userprint.php +++ b/lib/object_printing/userprint/userprint.php @@ -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!!!!!