Commit 3c2b085b2169be6f5880294bf95d27d4c899ae40
1 parent
96e8c6b7
Exists in
master
and in
4 other branches
Use navless layout when it makes sense
Showing
7 changed files
with
26 additions
and
8 deletions
Show diff stats
app/assets/stylesheets/common.scss
app/controllers/projects_controller.rb
| @@ -7,7 +7,8 @@ class ProjectsController < ProjectResourceController | @@ -7,7 +7,8 @@ class ProjectsController < ProjectResourceController | ||
| 7 | before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer] | 7 | before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer] |
| 8 | before_filter :require_non_empty_project, only: [:blob, :tree, :graph] | 8 | before_filter :require_non_empty_project, only: [:blob, :tree, :graph] |
| 9 | 9 | ||
| 10 | - layout 'application', only: [:new, :create] | 10 | + layout 'navless', only: [:new, :create] |
| 11 | + before_filter :set_title, only: [:new, :create] | ||
| 11 | 12 | ||
| 12 | def new | 13 | def new |
| 13 | @project = Project.new | 14 | @project = Project.new |
| @@ -105,4 +106,10 @@ class ProjectsController < ProjectResourceController | @@ -105,4 +106,10 @@ class ProjectsController < ProjectResourceController | ||
| 105 | format.json { render :json => @suggestions } | 106 | format.json { render :json => @suggestions } |
| 106 | end | 107 | end |
| 107 | end | 108 | end |
| 109 | + | ||
| 110 | + private | ||
| 111 | + | ||
| 112 | + def set_title | ||
| 113 | + @title = 'New Project' | ||
| 114 | + end | ||
| 108 | end | 115 | end |
app/controllers/users_controller.rb
| 1 | class UsersController < ApplicationController | 1 | class UsersController < ApplicationController |
| 2 | + layout 'navless' | ||
| 3 | + | ||
| 2 | def show | 4 | def show |
| 3 | @user = User.find_by_username!(params[:username]) | 5 | @user = User.find_by_username!(params[:username]) |
| 4 | @projects = @user.authorized_projects.where('projects.id in (?)', current_user.authorized_projects.map(&:id)) | 6 | @projects = @user.authorized_projects.where('projects.id in (?)', current_user.authorized_projects.map(&:id)) |
| 5 | @events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20) | 7 | @events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20) |
| 8 | + | ||
| 9 | + @title = @user.name | ||
| 6 | end | 10 | end |
| 7 | end | 11 | end |
app/views/layouts/public.html.haml
app/views/layouts/search.html.haml
app/views/projects/new.html.haml