diff options
| author | Jeremy <jeremy.benoist@gmail.com> | 2015-02-23 22:55:06 +0100 |
|---|---|---|
| committer | Jeremy <jeremy.benoist@gmail.com> | 2015-03-01 10:49:16 +0100 |
| commit | 32da2a70ef278bd42f66eb82c3fbf1905a417b87 (patch) | |
| tree | 587ef3bae1f4881047eb1ceb0c005e7a8287bb71 /src/Wallabag/CoreBundle/Resources/views/layout.html.twig | |
| parent | fca3c757233940cbe4c431e3e05fe74893225fe0 (diff) | |
| download | wallabag-32da2a70ef278bd42f66eb82c3fbf1905a417b87.tar.gz wallabag-32da2a70ef278bd42f66eb82c3fbf1905a417b87.tar.zst wallabag-32da2a70ef278bd42f66eb82c3fbf1905a417b87.zip | |
Add LiipThemeBundle
Re-defined the config / user relation to be OneToOne bidirectionnal.
ConfigType is now a service so I can inject the list of available themes that are also used by LiipThemeBundle
Force sqlite for test
In case of people use a different driver in parameter.yml (yes I do :))
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/layout.html.twig')
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/layout.html.twig | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig index e9ccc58c..1cf871d6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig | |||
| @@ -14,19 +14,16 @@ | |||
| 14 | {% include "WallabagCoreBundle::_head.html.twig" %} | 14 | {% include "WallabagCoreBundle::_head.html.twig" %} |
| 15 | </head> | 15 | </head> |
| 16 | <body> | 16 | <body> |
| 17 | {% include "WallabagCoreBundle::_top.html.twig" %} | 17 | <h1>DEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULT</h1> |
| 18 | <div id="main"> | 18 | {% include "WallabagCoreBundle::_top.html.twig" %} |
| 19 | {% block menu %}{% endblock %} | 19 | <div id="main"> |
| 20 | {% block precontent %}{% endblock %} | 20 | {% block menu %}{% endblock %} |
| 21 | {% for flashMessage in app.session.flashbag.get('notice') %} | 21 | {% block precontent %}{% endblock %} |
| 22 | <div class="flash-notice"> | 22 | {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }} |
| 23 | {{ flashMessage }} | 23 | <div id="content" class="w600p center"> |
| 24 | {% block content %}{% endblock %} | ||
| 24 | </div> | 25 | </div> |
| 25 | {% endfor %} | ||
| 26 | <div id="content" class="w600p center"> | ||
| 27 | {% block content %}{% endblock %} | ||
| 28 | </div> | 26 | </div> |
| 29 | </div> | 27 | {% include "WallabagCoreBundle::_footer.html.twig" %} |
| 30 | {% include "WallabagCoreBundle::_footer.html.twig" %} | ||
| 31 | </body> | 28 | </body> |
| 32 | </html> | 29 | </html> |