Restyled error messages in common way. Added title to head partial

13 files changed, 25 insertions, 16 deletions

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 026751f4ed4..dd2f85b8cd8 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -666,3 +666,10 @@ pre {
     float:left;
   }
 }
+
+h1.http_status_code {
+  font-size: 56px;
+  line-height: 100px;
+  font-weight: normal;
+  color: #456;
+}
diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml
index 3b60ed8b0ee..a6e4f0b9498 100644
--- a/app/views/errors/access_denied.html.haml
+++ b/app/views/errors/access_denied.html.haml
@@ -1,4 +1,5 @@
-%h1 Access Denied
+%h1 403
+%h3.page_title Access Denied
 %hr
-%h2 You are not allowed to access this page.
+%p You are not allowed to access this page.
 %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
diff --git a/app/views/errors/encoding.html.haml b/app/views/errors/encoding.html.haml
index d7b5e68e870..a0aa6306489 100644
--- a/app/views/errors/encoding.html.haml
+++ b/app/views/errors/encoding.html.haml
@@ -1,3 +1,4 @@
-%h1 Encoding Error
+%h1.http_status_code 500
+%h3.page_title Encoding Error
 %hr
 %p Page can't be loaded because of an encoding error.
diff --git a/app/views/errors/git_not_found.html.haml b/app/views/errors/git_not_found.html.haml
index cd01ea1b0e6..5c9c4953284 100644
--- a/app/views/errors/git_not_found.html.haml
+++ b/app/views/errors/git_not_found.html.haml
@@ -1,6 +1,6 @@
-%h1 404
+%h1.http_status_code 404
+%h3.page_title Git Resource Not found
 %hr
-%h2 Git Resource Not found
 %p
   Application can't get access to some branch or commit in your repository. It
   may have been moved.
diff --git a/app/views/errors/gitolite.html.haml b/app/views/errors/gitolite.html.haml
index 699e6984db6..2670f2d3fda 100644
--- a/app/views/errors/gitolite.html.haml
+++ b/app/views/errors/gitolite.html.haml
@@ -1,6 +1,6 @@
-%h1 Git Error
+%h1.http_status_code 500
+%h3.page_title GitLab was unable to access your Gitolite system.
 %hr
-%h2 GitLab was unable to access your Gitolite system.
 
 .git_error_tips
   %h4 Tips for Administrator:
diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml
index a4e8d0204a9..ee23d2197b4 100644
--- a/app/views/errors/not_found.html.haml
+++ b/app/views/errors/not_found.html.haml
@@ -1,4 +1,4 @@
-%h1 404
+%h1.http_status_code 404
+%h3.page_title The resource you were looking for doesn't exist.
 %hr
-%h2 The resource you were looking for doesn't exist.
 %p You may have mistyped the address or the page may have moved.
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 25fe9d806bc..4a0f60d36c2 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -2,7 +2,7 @@
   %meta{charset: "utf-8"}
   %title
     GitLab
-    = " > #{@project.name}" if @project && !@project.new_record?
+    = " > #{title}" if defined?(title)
   = favicon_link_tag 'favicon.ico'
   = stylesheet_link_tag    "application"
   = javascript_include_tag "application"
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 582f86ba32c..a814bfc7682 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -1,6 +1,6 @@
 !!! 5
 %html{ lang: "en"}
-  = render "layouts/head"
+  = render "layouts/head", title: "Admin area"
   %body{class: "#{app_theme} admin"}
     = render "layouts/flash"
     = render "layouts/head_panel", title: "Admin area"
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 40f4f88cbce..a41de538436 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,6 +1,6 @@
 !!! 5
 %html{ lang: "en"}
-  = render "layouts/head"
+  = render "layouts/head", title: "Dashboard"
   %body{class: "#{app_theme} application"}
     = render "layouts/flash"
     = render "layouts/head_panel", title: "Dashboard"
diff --git a/app/views/layouts/errors.html.haml b/app/views/layouts/errors.html.haml
index 1f5c03bdced..3554d88f10c 100644
--- a/app/views/layouts/errors.html.haml
+++ b/app/views/layouts/errors.html.haml
@@ -1,6 +1,6 @@
 !!! 5
 %html{ lang: "en"}
-  = render "layouts/head"
+  = render "layouts/head", title: "Error"
   %body{class: "#{app_theme} application"}
     = render "layouts/flash"
     = render "layouts/head_panel", title: ""
diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index 985200e2539..d40d9525bb8 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -1,6 +1,6 @@
 !!! 5
 %html{ lang: "en"}
-  = render "layouts/head"
+  = render "layouts/head", title: "#{@group.name}"
   %body{class: "#{app_theme} application"}
     = render "layouts/flash"
     = render "layouts/head_panel", title: "#{@group.name}"
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index 7a54bb7cf2f..b2743222281 100644
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -1,6 +1,6 @@
 !!! 5
 %html{ lang: "en"}
-  = render "layouts/head"
+  = render "layouts/head", title: "Profile"
   %body{class: "#{app_theme} profile"}
     = render "layouts/flash"
     = render "layouts/head_panel", title: "Profile"
diff --git a/app/views/layouts/project_resource.html.haml b/app/views/layouts/project_resource.html.haml
index 2158e342036..aa312328153 100644
--- a/app/views/layouts/project_resource.html.haml
+++ b/app/views/layouts/project_resource.html.haml
@@ -1,6 +1,6 @@
 !!! 5
 %html{ lang: "en"}
-  = render "layouts/head"
+  = render "layouts/head", title: @project.name
   %body{class: "#{app_theme} project"}
     = render "layouts/flash"
     = render "layouts/head_panel", title: @project.name