Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
potage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mathieu
potage
Commits
aee4fd51
Commit
aee4fd51
authored
Sep 04, 2018
by
Mat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bootstrap, change la largeur de page à laquelle la navbar s'effondre
parent
22f8c262
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
src/PotageBundle/Resources/views/Default/navbar.html.twig
src/PotageBundle/Resources/views/Default/navbar.html.twig
+7
-7
src/PotageBundle/Services/LettreToken.php
src/PotageBundle/Services/LettreToken.php
+2
-2
web/css/style.css
web/css/style.css
+1
-1
No files found.
src/PotageBundle/Resources/views/Default/navbar.html.twig
View file @
aee4fd51
<nav
class=
"navbar navbar-expand-
lg
navbar-dark bg-dark"
>
<nav
class=
"navbar navbar-expand-
md
navbar-dark bg-dark"
>
<a
href=
"
{{
path
(
'potage_homepage'
)
}}
"
>
<span
class=
"navbar-brand mb-0 h1"
>
...
...
@@ -22,14 +22,14 @@
<div
id=
"login"
>
<ul
class=
"navbar-nav mr-auto"
>
<li
class=
"nav-item"
>
<a
class=
"nav-link
{{
app.request.get
(
'_route'
)
==
'potage_today'
?
''
}}
"
href=
"
{{
path
(
'potage_today'
)
}}
"
>
En ce moment
<span
class=
"sr-only"
>
(current)
</span></a>
</li>
{%
if
is_granted
(
"IS_AUTHENTICATED_REMEMBERED"
)
%}
<li
class=
"nav-item"
>
<a
class=
"nav-link
{{
app.request.get
(
'_route'
)
==
'potage_today'
?
''
}}
"
href=
"
{{
path
(
'potage_today'
)
}}
"
>
En ce moment
<span
class=
"sr-only"
>
(current)
</span></a>
</li>
{%
if
is_granted
(
'ROLE_ADMIN'
)
%}
<li
class=
"nav-item dropdown"
>
<a
class=
"nav-link dropdown-toggle"
href=
"#"
id=
"navbarDropdown"
role=
"button"
...
...
src/PotageBundle/Services/LettreToken.php
100644 → 100755
View file @
aee4fd51
...
...
@@ -44,7 +44,7 @@ class LettreToken
{
/**
* Si l'utilisateur n'est pas associé à un user, token => null
* il faudra alors l'inviter à se créer un compte user,
*
TODO
il faudra alors l'inviter à se créer un compte user,
* après quoi il accèdera à sa page today, qui lui affichera alors les offres liée à ses groupes.
* Et cela même s'il n'avait pas encore de compte user quand la lettre a été envoyée !
*
...
...
@@ -52,7 +52,7 @@ class LettreToken
*/
$user
=
$this
->
container
->
get
(
'doctrine'
)
->
getRepository
(
'PotageBundle:User'
)
->
findOneByUtilisateur
(
$id_utilisateur
);
//dump($user);
->
findOneByUtilisateur
(
$id_utilisateur
);
if
(
$user
!==
null
)
{
...
...
web/css/style.css
View file @
aee4fd51
...
...
@@ -17,7 +17,7 @@ header {
position
:
relative
;
}
header
nav
.navbar
{
height
:
75px
;
min-
height
:
75px
;
}
.navbar-brand
img
{
margin
:
-5px
3px
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment