diff --git a/apps/maarch_entreprise/css/styles.css b/apps/maarch_entreprise/css/styles.css
index e4a2828362078c837cd41f49ad1ae9c9591ae553..adb8b5770aadd7cb4430a42d16f90154de573ffb 100755
--- a/apps/maarch_entreprise/css/styles.css
+++ b/apps/maarch_entreprise/css/styles.css
@@ -1406,7 +1406,6 @@ th.ref {
width: 260px;
background: #F2F2F2;
position: absolute;
- left: -12px;
padding: 0px;
z-index: 10;
margin: 0px;
@@ -2804,21 +2803,28 @@ font-size: 14px;
.footer_menu{
background-color: #135F7F;
- height:15px;
width:100%;
font-weight: bold;
font-size: 0.8em;
text-align: right;
- padding-right:0px;
- padding-top:0px;
- border-top: 2px solid #FFFFFF;
+ padding: 5px;
position:relative;
bottom:0;
}
.footer_menu span{
- padding-left: 10px;
- padding-top: 2px;
+ display: inline-block;
+ min-width: 10px;
+ padding: 3px 7px;
+ font-size: 12px;
+ font-weight: 700;
+ line-height: 1;
+ color: #135f7f;
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: middle;
+ background-color: white;
+ border-radius: 10px;
}
.footer_menu a{
diff --git a/apps/maarch_entreprise/template/header.html b/apps/maarch_entreprise/template/header.html
index 913a840a9a9476a5e01c95292596a571c4110ec0..f1f097859bc40ccaf5bef2f82c45594c2d27e7ff 100755
--- a/apps/maarch_entreprise/template/header.html
+++ b/apps/maarch_entreprise/template/header.html
@@ -40,34 +40,34 @@
<?php
$strUserInfos = '<i class="fa fa-user fa-2x" style="padding-right:5px;"></i> ' . $_SESSION['user']['FirstName'][0].". ".$_SESSION['user']['LastName'];
echo $strUserInfos; ?>
- <div id="profilenav" class="menunav" style="left: -135px;display:none;background: #135f7f;">
- <canvas class="header-bg" width="250" height="70" style="width: 100%;background-image: url('static.php?filename=login-banner.jpg');background-size:cover;border-bottom: solid 1px white;"></canvas>
- <i title="<?php echo _MY_INFO;?>" onclick="triggerAngular('#/profile')" style="cursor:pointer;z-index:1;color:white;position: absolute;left: 85px;top: 17px;background-image: url('static.php?filename=logo_only.svg');width: 70px;height: 70px;background-size: cover;background-position: top center;border-radius: 50%;border: solid white;background-color:white;"></i>
- <div class="content" style="padding-top:10px;color:#666;max-height:250px;overflow-y:auto;overflow-x:hidden;">
- <p routerLink="/profile" class="text-center" style="margin-top:10px;cursor:pointer;color:white;"><?php echo $_SESSION['user']['FirstName'].". ".$_SESSION['user']['LastName'];?></p>
- <h3 style="padding: 5px;margin-top:10px;color:white;text-align:left;">Groupes</h3>
- <ul style="color:white;padding: 10px;text-align:left;opacity: 0.5;">
- <?php
- $userGroups = \User\models\UserModel::getGroupsByUserId(['userId'=> $_SESSION['user']['UserId']]);
-
- if(!empty($userGroups)){
- for($i=0;$i<count($userGroups);$i++){
- $strGrpInfos .= '<li style="padding-bottom:20px;">'.$userGroups[$i]['group_desc'].'</li>';
- }
+ </span>
+ <div id="profilenav" class="menunav" style="margin-top:10px;right: 5px;display:none;background: #135f7f;">
+ <canvas class="header-bg" width="250" height="70" style="width: 100%;background-image: url('static.php?filename=login-banner.jpg');background-size:cover;border-bottom: solid 1px white;"></canvas>
+ <i title="<?php echo _MY_INFO;?>" onclick="triggerAngular('#/profile')" style="cursor:pointer;z-index:1;color:white;position: absolute;left: 85px;top: 17px;background-image: url('static.php?filename=logo_only.svg');width: 70px;height: 70px;background-size: cover;background-position: top center;border-radius: 50%;border: solid white;background-color:white;"></i>
+ <div class="content" style="padding-top:10px;color:#666;max-height:250px;overflow-y:auto;overflow-x:hidden;">
+ <p onclick="triggerAngular('#/profile')" style="text-align:center;margin-top:10px;cursor:pointer;color:white;"><?php echo $_SESSION['user']['FirstName'].". ".$_SESSION['user']['LastName'];?></p>
+ <h3 style="padding: 5px;margin-top:10px;color:white;text-align:left;">Groupes</h3>
+ <ul style="color:white;padding: 10px;text-align:left;opacity: 0.5;">
+ <?php
+ $userGroups = \User\models\UserModel::getGroupsByUserId(['userId'=> $_SESSION['user']['UserId']]);
+
+ if(!empty($userGroups)){
+ for($i=0;$i<count($userGroups);$i++){
+ $strGrpInfos .= '<li style="padding-bottom:20px;">'.$userGroups[$i]['group_desc'].'</li>';
}
- echo $strGrpInfos;
- ?>
- </ul>
- </div>
- <div style="display:flex;">
- <div class="footer_menu">
- <a onclick="triggerAngular('#/profile')" style="cursor: pointer;color:white;float:left;"><?php echo _MY_INFO;?></a>
- <a href="index.php?display=true&page=logout&logout=true" style="cursor: pointer;color:white;float:right;"><?php echo _LOGOUT;?></a>
- <div style="clear:both;"></div>
- </div>
+ }
+ echo $strGrpInfos;
+ ?>
+ </ul>
+ </div>
+ <div style="display:flex;">
+ <div class="footer_menu">
+ <a onclick="triggerAngular('#/profile')" style="cursor: pointer;color:white;float:left;"><span><?php echo _MY_INFO;?></span></a>
+ <a href="index.php?display=true&page=logout&logout=true" style="cursor: pointer;color:white;float:right;"><span><?php echo _LOGOUT;?></span></a>
+ <div style="clear:both;"></div>
</div>
</div>
- </span>
+ </div>
</div>
</div>
</div>