Commit 61eb050993e85459282dd6f39c1f703d29b6d3a7
1 parent
d9046203
Exists in
master
and in
4 other branches
Different layout for browsing public area and public project page while not logged-in
Showing
3 changed files
with
34 additions
and
31 deletions
Show diff stats
| @@ -0,0 +1,22 @@ | @@ -0,0 +1,22 @@ | ||
| 1 | +%header.navbar.navbar-static-top.navbar-gitlab | ||
| 2 | + .navbar-inner | ||
| 3 | + .container | ||
| 4 | + %div.app_logo | ||
| 5 | + %span.separator | ||
| 6 | + = link_to public_root_path, class: "home" do | ||
| 7 | + %h1 GITLAB | ||
| 8 | + %span.separator | ||
| 9 | + %h1.project_name | ||
| 10 | + - if @project | ||
| 11 | + = project_title(@project) | ||
| 12 | + - else | ||
| 13 | + Public Projects | ||
| 14 | + | ||
| 15 | + %ul.nav | ||
| 16 | + %li | ||
| 17 | + %a | ||
| 18 | + %div.hide.turbolink-spinner | ||
| 19 | + %i.icon-refresh.icon-spin | ||
| 20 | + Loading... | ||
| 21 | + %li | ||
| 22 | + = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in' |
app/views/layouts/public.html.haml
| @@ -5,35 +5,7 @@ | @@ -5,35 +5,7 @@ | ||
| 5 | - if current_user | 5 | - if current_user |
| 6 | = render "layouts/head_panel", title: "Public Projects" | 6 | = render "layouts/head_panel", title: "Public Projects" |
| 7 | - else | 7 | - else |
| 8 | - %header.navbar.navbar-static-top.navbar-gitlab | ||
| 9 | - .navbar-inner | ||
| 10 | - .container | ||
| 11 | - %div.app_logo | ||
| 12 | - %span.separator | ||
| 13 | - = link_to public_root_path, class: "home" do | ||
| 14 | - %h1 GITLAB | ||
| 15 | - %span.separator | ||
| 16 | - %h1.project_name | ||
| 17 | - - if @project | ||
| 18 | - = project_title(@project) | ||
| 19 | - - else | ||
| 20 | - Public Projects | 8 | + = render "layouts/public_head_panel" |
| 21 | 9 | ||
| 22 | - %ul.nav | ||
| 23 | - %li | ||
| 24 | - %a | ||
| 25 | - %div.hide.turbolink-spinner | ||
| 26 | - %i.icon-refresh.icon-spin | ||
| 27 | - Loading... | ||
| 28 | - %li | ||
| 29 | - = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in' | ||
| 30 | - | ||
| 31 | - - if @project | ||
| 32 | - %nav.main-nav | ||
| 33 | - .container= render 'layouts/nav/project' | ||
| 34 | - | ||
| 35 | - .container | ||
| 36 | - .content= yield | ||
| 37 | - - else | ||
| 38 | - .container.navless-container | ||
| 39 | - .content= yield | 10 | + .container.navless-container |
| 11 | + .content= yield |
| @@ -0,0 +1,9 @@ | @@ -0,0 +1,9 @@ | ||
| 1 | +!!! 5 | ||
| 2 | +%html{ lang: "en"} | ||
| 3 | + = render "layouts/head", title: @project.name_with_namespace | ||
| 4 | + %body{class: "ui_mars application", :'data-page' => body_data_page} | ||
| 5 | + = render "layouts/public_head_panel" | ||
| 6 | + %nav.main-nav | ||
| 7 | + .container= render 'layouts/nav/project' | ||
| 8 | + .container | ||
| 9 | + .content= yield |