Use navless layout when it makes sense

Dmitriy Zaporozhets
1 parent 96e8c6b7
Showing 7 changed files with 26 additions and 8 deletions Show diff stats
app/assets/stylesheets/common.scss
app/controllers/projects_controller.rb
app/controllers/users_controller.rb
app/views/layouts/navless.html.haml
app/views/layouts/public.html.haml
app/views/layouts/search.html.haml
app/views/projects/new.html.haml
@@ -419,7 +419,7 @@ img.emoji {
   height: 220px;
 }
  
-.search-container {
+.navless-container {
   margin-top: 30px;
 }
  
@@ -7,7 +7,8 @@ class ProjectsController &lt; ProjectResourceController
   before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer]
   before_filter :require_non_empty_project, only: [:blob, :tree, :graph]
  
-  layout 'application', only: [:new, :create]
+  layout 'navless', only: [:new, :create]
+  before_filter :set_title, only: [:new, :create]
  
   def new
     @project = Project.new
@@ -105,4 +106,10 @@ class ProjectsController &lt; ProjectResourceController
       format.json { render :json => @suggestions }
     end
   end
+
+  private
+
+  def set_title
+    @title = 'New Project'
+  end
 end
 class UsersController < ApplicationController
+  layout 'navless'
+
   def show
     @user = User.find_by_username!(params[:username])
     @projects = @user.authorized_projects.where('projects.id in (?)', current_user.authorized_projects.map(&:id))
     @events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)
+
+    @title = @user.name
   end
 end
@@ -0,0 +1,10 @@
+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head", title: @title
+  %body{class: "#{app_theme} application"}
+    = render "layouts/head_panel", title: @title
+    = render "layouts/flash"
+
+    .container.navless-container
+      .content
+        = yield
@@ -11,7 +11,6 @@
               %h1 GITLAB
             %span.separator
           %h1.project_name Public Projects
-    .container
+    .container.navless-container
       .content
-        .prepend-top-20
-          = yield
+        = yield
@@ -5,6 +5,6 @@
     = render "layouts/head_panel", title: "Search"
     = render "layouts/flash"
  
-    .container.search-container
+    .container.navless-container
       .content
         = yield
 .project-edit-container
-  %h3.page_title New Project
-  %hr
   .project-edit-errors
     = render 'projects/errors'
   .project-edit-content
...	...	@@ -419,7 +419,7 @@ img.emoji {
419	419	height: 220px;
420	420	}
421	421
422		-.search-container {
	422	+.navless-container {
423	423	margin-top: 30px;
424	424	}
425	425
...	...
...	...	@@ -7,7 +7,8 @@ class ProjectsController < ProjectResourceController
7	7	before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer]
8	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	13	def new
13	14	@project = Project.new
...	...	@@ -105,4 +106,10 @@ class ProjectsController < ProjectResourceController
105	106	format.json { render :json => @suggestions }
106	107	end
107	108	end
	109	+
	110	+ private
	111	+
	112	+ def set_title
	113	+ @title = 'New Project'
	114	+ end
108	115	end
...	...
1	1	class UsersController < ApplicationController
	2	+ layout 'navless'
	3	+
2	4	def show
3	5	@user = User.find_by_username!(params[:username])
4	6	@projects = @user.authorized_projects.where('projects.id in (?)', current_user.authorized_projects.map(&:id))
5	7	@events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)
	8	+
	9	+ @title = @user.name
6	10	end
7	11	end
...	...
...	...	@@ -0,0 +1,10 @@
	1	+!!! 5
	2	+%html{ lang: "en"}
	3	+ = render "layouts/head", title: @title
	4	+ %body{class: "#{app_theme} application"}
	5	+ = render "layouts/head_panel", title: @title
	6	+ = render "layouts/flash"
	7	+
	8	+ .container.navless-container
	9	+ .content
	10	+ = yield
...	...
...	...	@@ -11,7 +11,6 @@
11	11	%h1 GITLAB
12	12	%span.separator
13	13	%h1.project_name Public Projects
14		- .container
	14	+ .container.navless-container
15	15	.content
16		- .prepend-top-20
17		- = yield
	16	+ = yield
...	...
...	...	@@ -5,6 +5,6 @@
5	5	= render "layouts/head_panel", title: "Search"
6	6	= render "layouts/flash"
7	7
8		- .container.search-container
	8	+ .container.navless-container
9	9	.content
10	10	= yield
...	...
1	1	.project-edit-container
2		- %h3.page_title New Project
3		- %hr
4	2	.project-edit-errors
5	3	= render 'projects/errors'
6	4	.project-edit-content
...	...