Skip to content

Commit

Permalink
Merge pull request sonata-project#1020 from mmucklo/master
Browse files Browse the repository at this point in the history
Move admin_pool check up a few lines
  • Loading branch information
rande committed Nov 12, 2012
2 parents e2799a8 + 1ee1303 commit 4144b92
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Resources/views/standard_layout.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ file that was distributed with this source code.
<span class="icon-bar"></span>
</a>

<div class="navbar-text pull-right">{% include admin_pool.getTemplate('user_block') %}</div>

{% if admin_pool is defined %}
<div class="navbar-text pull-right">{% include admin_pool.getTemplate('user_block') %}</div>

{% block logo %}
<a href="{{ url('sonata_admin_dashboard') }}" class="brand">
<img src="{{ asset(admin_pool.titlelogo) }}" alt="{{ admin_pool.title }}" />
Expand Down

0 comments on commit 4144b92

Please sign in to comment.