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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 026751f..dd2f85b 100644 (file)
--- 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 3b60ed8..a6e4f0b 100644 (file)
--- 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 d7b5e68..a0aa630 100644 (file)
--- 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 cd01ea1..5c9c495 100644 (file)
--- 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 699e698..2670f2d 100644 (file)
--- 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 a4e8d02..ee23d21 100644 (file)
--- 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 25fe9d8..4a0f60d 100644 (file)
--- 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 582f86b..a814bfc 100644 (file)
--- 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 40f4f88..a41de53 100644 (file)
--- 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 1f5c03b..3554d88 100644 (file)
--- 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 985200e..d40d952 100644 (file)
--- 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 7a54bb7..b274322 100644 (file)
--- 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 2158e34..aa31232 100644 (file)
--- 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

diff --git a/public/404.html b/public/404.html
index 3e56e52..867f193 100644 (file)
--- a/public/404.html
+++ b/public/404.html
@@ -7,9 +7,8 @@
 
 <body>
   <h1>404</h1>
-  <div>
-    <h2>The page you were looking for doesn't exist.</h2>
-    <p>You may have mistyped the address or the page may have moved.</p>
-  </div>
+  <h3>The page you were looking for doesn't exist.</h3>
+  <hr/>
+  <p>You may have mistyped the address or the page may have moved.</p>
 </body>
 </html>

diff --git a/public/500.html b/public/500.html
index 3be1cc2..5b78e3e 100644 (file)
--- a/public/500.html
+++ b/public/500.html
@@ -4,13 +4,10 @@
   <title>We're sorry, but something went wrong (500)</title>
   <link href="/static.css" media="screen" rel="stylesheet" type="text/css" />
 </head>
-
 <body>
-  <!-- This file lives in public/500.html -->
   <h1>500</h1>
-  <div>
-    <h2>We're sorry, but something went wrong.</h2>
-    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
-  </div>
+  <h3>We're sorry, but something went wrong.</h3>
+  <hr/>
+  <p>We've been notified about this issue and we'll take a look at it shortly.</p>
 </body>
 </html>

diff --git a/public/githost_error.html b/public/githost_error.html
deleted file mode 100644 (file)
index b5258ce..0000000
--- a/public/githost_error.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>We're sorry, but we can't get access to your gitolite</title>
-  <style type="text/css">
-    body { background-color: #EAEAEA; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 600px;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-    }
-    h1 { font-size: 48px; color: #444; line-height: 1.5em; }
-    h2 { font-size: 24px; color: #666; line-height: 1.5em; }
-    h3, code { text-align:left; }
-    code pre { margin-left:40px; }
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/500.html -->
-  <div class="dialog">
-    <h1>Gitolite Error</h1>
-    <h2>Application can't get access to your gitolite system.</h2>
-    <hr>
-    <h3> 1. Check 'config/gitlab.yml' for correct settings.</h3>
-    <h3> 2. Make sure web server user has access to gitolite. <a href="https://github.com/gitlabhq/gitlabhq/wiki/Gitolite">Setup tutorial</a></h3>
-    <h3> 3. Try: </h3>
-    <code>
-        <pre>
-sudo chmod -R 770 /home/git/repositories/
-sudo chown -R git:git /home/git/repositories/
-        </pre>
-    </code>
-  </div>
-</body>
-</html>

diff --git a/public/static.css b/public/static.css
index 6090d7b..aa83455 100644 (file)
--- a/public/static.css
+++ b/public/static.css
@@ -1,57 +1,31 @@
-body {  color: #666; text-align: center; font-family: arial, sans-serif; margin:0; padding:0; }
-h1 { font-size: 48px; color: #444; line-height: 1.5em; }
+body {
+  color: #666;
+  text-align: center;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  sans-serif;
+  margin:0;
+  width: 800px;
+  margin: auto;
+  font-size: 14px;
+}
+h1 {
+  font-size: 56px;
+  line-height: 100px;
+  font-weight: normal;
+  color: #456;
+}
 h2 { font-size: 24px; color: #666; line-height: 1.5em; }
 
-.alert-message {
-  position: relative;
-  padding: 7px 15px;
-  margin-bottom: 18px;
-  color: #404040;
-  background-color: #eedc94;
-  background-repeat: repeat-x;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
-  background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
-  background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
-  background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
-  background-image: -o-linear-gradient(top, #fceec1, #eedc94);
-  background-image: linear-gradient(top, #fceec1, #eedc94);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFCEEC1', endColorstr='#FFEEDC94', GradientType=0);
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  border-color: #eedc94 #eedc94 #e4c652;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) fadein(rgba(0, 0, 0, 0.1), 15%);
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  border-width: 1px;
-  border-style: solid;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-}
-.alert-message .close {
-  margin-top: 1px;
-  *margin-top: 0;
-}
-.alert-message a {
-  font-weight: bold;
-  color: #404040;
-}
-.alert-message.danger p a, .alert-message.error p a, .alert-message.success p a, .alert-message.info p a {
-  color: #404040;
-}
-.alert-message h5 {
-  line-height: 18px;
-}
-.alert-message p {
-  margin-bottom: 0;
-}
-.alert-message div {
-  margin-top: 5px;
-  margin-bottom: 2px;
+h3 {
+  color: #456;
+  font-size: 20px;
+  font-weight: normal;
   line-height: 28px;
 }
 
-.alert-message.block-message.error {
-  background: #FDDFDE;
-  border-color: #FBC7C6;
+hr {
+  margin: 18px 0;
+  border: 0;
+  border-top: 1px solid #EEE;
+  border-bottom: 1px solid white;
 }
-