Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
58824694
Verified
Commit
58824694
authored
6 years ago
by
Alex ORLUC
Browse files
Options
Downloads
Patches
Plain Diff
FIX #8636 fix css profile menu
parent
2c3651dd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/maarch_entreprise/css/styles.css
+13
-7
13 additions, 7 deletions
apps/maarch_entreprise/css/styles.css
apps/maarch_entreprise/template/header.html
+25
-25
25 additions, 25 deletions
apps/maarch_entreprise/template/header.html
with
38 additions
and
32 deletions
apps/maarch_entreprise/css/styles.css
+
13
−
7
View file @
58824694
...
@@ -1406,7 +1406,6 @@ th.ref {
...
@@ -1406,7 +1406,6 @@ th.ref {
width
:
260px
;
width
:
260px
;
background
:
#F2F2F2
;
background
:
#F2F2F2
;
position
:
absolute
;
position
:
absolute
;
left
:
-12px
;
padding
:
0px
;
padding
:
0px
;
z-index
:
10
;
z-index
:
10
;
margin
:
0px
;
margin
:
0px
;
...
@@ -2804,21 +2803,28 @@ font-size: 14px;
...
@@ -2804,21 +2803,28 @@ font-size: 14px;
.footer_menu
{
.footer_menu
{
background-color
:
#135F7F
;
background-color
:
#135F7F
;
height
:
15px
;
width
:
100%
;
width
:
100%
;
font-weight
:
bold
;
font-weight
:
bold
;
font-size
:
0.8em
;
font-size
:
0.8em
;
text-align
:
right
;
text-align
:
right
;
padding-right
:
0px
;
padding
:
5px
;
padding-top
:
0px
;
border-top
:
2px
solid
#FFFFFF
;
position
:
relative
;
position
:
relative
;
bottom
:
0
;
bottom
:
0
;
}
}
.footer_menu
span
{
.footer_menu
span
{
padding-left
:
10px
;
display
:
inline-block
;
padding-top
:
2px
;
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
{
.footer_menu
a
{
...
...
This diff is collapsed.
Click to expand it.
apps/maarch_entreprise/template/header.html
+
25
−
25
View file @
58824694
...
@@ -40,34 +40,34 @@
...
@@ -40,34 +40,34 @@
<?php
<?php
$strUserInfos = '<i class="fa fa-user fa-2x" style="padding-right:5px;"></i> ' . $_SESSION['user']['FirstName'][0].". ".$_SESSION['user']['LastName'];
$strUserInfos = '<i class="fa fa-user fa-2x" style="padding-right:5px;"></i> ' . $_SESSION['user']['FirstName'][0].". ".$_SESSION['user']['LastName'];
echo $strUserInfos; ?>
echo $strUserInfos; ?>
<div
id=
"profilenav"
class=
"menunav"
style=
"left: -135px;display:none;background: #135f7f;"
>
</span
>
<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
>
<div
id=
"profilenav"
class=
"menunav"
style=
"margin-top:10px;right: 5px;display:none;background: #135f7f;"
>
<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=log
o_only.svg');width: 70px;height: 70px
;background-size:
cover;b
ackground-position: top center;border-radius: 50%;border: solid white;background-color:
white;"
></
i
>
<canvas
class=
"header-bg"
width=
"250"
height=
"70"
style=
"width: 100%
;background-image: url('static.php?filename=log
in-banner.jpg')
;background-size:cover;b
order-bottom: solid 1px
white;"
></
canvas
>
<div
class=
"content"
style=
"padding-top:10px;color:#666;max-
height:
25
0px;
overflow-y:auto;overflow-x:hidden;"
>
<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:
7
0px;
background-size: cover;background-position: top center;border-radius: 50%;border: solid white;background-color:white;"
></i
>
<p
routerLink=
"/profile"
class=
"text-center
"
style=
"
marg
in-top:10px;c
ursor:pointer;color:white;"
>
<?php echo $_SESSION['user']['FirstName'].". ".$_SESSION['user']['LastName'];?>
</p
>
<div
class=
"content
"
style=
"
padd
in
g
-top:10px;c
olor:#666;max-height:250px;overflow-y:auto;overflow-x:hidden;"
>
<h3
style=
"padding: 5px;margin-top:10px;color:white;text-align:left;"
>
Groupes
</h3
>
<p
onclick=
"triggerAngular('#/profile')"
style=
"text-align:center;margin-top:10px;cursor:pointer;color:white;"
>
<?php echo $_SESSION['user']['FirstName'].". ".$_SESSION['user']['LastName'];?>
</p
>
<ul
style=
"
color:white;padding: 10px;text-align:left;opacity: 0.5;"
>
<h3
style=
"
padding: 5px;margin-top:10px;color:white;text-align:left;"
>
Groupes
</h3>
<?php
<ul
style=
"color:white;padding: 10px;text-align:left;opacity: 0.5;"
>
$userGroups = \User\models\UserModel::getGroupsByUserId(['userId'=> $_SESSION['user']['UserId']]);
<?php
$userGroups = \User\models\UserModel::getGroupsByUserId(['userId'=> $_SESSION['user']['UserId']]);
if(!empty($userGroups)){
for($i=0;$i<count
($userGroups)
;$i++
){
if(!empty
($userGroups)){
$strGrpInfos .= '<li style="padding-bottom:20px;">'.$userGroups[$i]['group_desc'].'</li>';
for($i=0;$i<count($userGroups);$i++){
}
$strGrpInfos .= '<li style="padding-bottom:20px;">'.$userGroups[$i]['group_desc'].'</li>';
}
}
echo $strGrpInfos;
}
?>
echo $strGrpInfos;
</ul
>
?
>
</
div
>
</
ul
>
<div
style=
"display:flex;"
>
</div
>
<div
class=
"footer_menu
"
>
<div
style=
"display:flex;
"
>
<a
onclick=
"triggerAngular('#/profile')"
style=
"cursor: pointer;color:white;float:left;"
>
<?php echo _MY_INFO;?>
</a
>
<div
class=
"footer_menu"
>
<a
href=
"index.php?display=true&page=logout&logout=true
"
style=
"cursor: pointer;color:white;float:
righ
t;"
>
<?php echo _
LOGOUT;?
>
</a>
<a
onclick=
"triggerAngular('#/profile')
"
style=
"cursor: pointer;color:white;float:
lef
t;"
><
span>
<
?php echo _
MY_INFO;?>
</span
></a>
<div
style=
"clear:both;"
></div
>
<a
href=
"index.php?display=true&page=logout&logout=true"
style=
"cursor: pointer;color:white;float:right;"
><span>
<?php echo _LOGOUT;?>
</span></a
>
</div>
<div
style=
"clear:both;"
>
</div>
</div>
</div>
</div>
</div>
</
span
>
</
div
>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment