diff options
| author | azul <azul@riseup.net> | 2014-05-14 08:28:21 +0200 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2014-05-14 08:28:21 +0200 |
| commit | 4843db127a5d5d038f227d9ffe5f0b83d95fd9f6 (patch) | |
| tree | bf8159cf93a61e02a648c5c5dba6ef0193f04e51 /app | |
| parent | 726244f1c6bb72fb53a257c084dfbdf7b9c2b03c (diff) | |
| parent | 503fa755ee7f5ec52e833a05fb640b1c16e89a5f (diff) | |
Merge pull request #158 from azul/bugfix/5658-fix-broken-masthead
move User Control Panel heading out of masthead
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/_header.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/_masthead.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 157f1df..a1dd47a 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -8,5 +8,5 @@ %li = link_to t(:logout), logout_path, :method => :delete - if @user && @show_navigation - .user_heading + .lead = @user.email_address diff --git a/app/views/layouts/_masthead.html.haml b/app/views/layouts/_masthead.html.haml index 35225a1..fde5915 100644 --- a/app/views/layouts/_masthead.html.haml +++ b/app/views/layouts/_masthead.html.haml @@ -2,5 +2,3 @@ .title %span.sitename %a{:href => home_path}= APP_CONFIG[:domain] - - if @show_navigation - = t(:user_control_panel)
\ No newline at end of file diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 1cd4ec3..d213fe1 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -14,6 +14,9 @@ = render 'layouts/masthead' #main .container-fluid + - if @show_navigation + .row-fluid + %h1= t(:user_control_panel) - if logged_in? .row-fluid .span12 |