diff options
| author | jessib <jessib@riseup.net> | 2014-01-27 10:30:11 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2014-01-27 10:30:11 -0800 |
| commit | 7e0573f3347dca6323eae05127849431ecbceb77 (patch) | |
| tree | 8a6ff58fdcc93493b5a8f332350b0a9292119906 /app/views/layouts/_masthead.html.haml | |
| parent | 3bfbf0ad20bb5b8e4689fda287cd47738571d10d (diff) | |
| parent | d578c07e196cd9758fbf1752a9bb8477c260bb30 (diff) | |
Merge branch 'develop' into feature/messages_api
Conflicts:
users/config/locales/en.yml
Diffstat (limited to 'app/views/layouts/_masthead.html.haml')
| -rw-r--r-- | app/views/layouts/_masthead.html.haml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/views/layouts/_masthead.html.haml b/app/views/layouts/_masthead.html.haml index 280f2c2..35225a1 100644 --- a/app/views/layouts/_masthead.html.haml +++ b/app/views/layouts/_masthead.html.haml @@ -1,4 +1,6 @@ -.title - %span.sitename - = APP_CONFIG[:domain] - = t(:user_control_panel)
\ No newline at end of file +#masthead + .title + %span.sitename + %a{:href => home_path}= APP_CONFIG[:domain] + - if @show_navigation + = t(:user_control_panel)
\ No newline at end of file |