diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-08-16 09:13:50 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-08-16 09:13:50 +0300 |
commit | 05da3801f53f06fdc529b4f3820af1380039f245 (patch) | |
tree | 802c64a56ff22306ba9690980e38980e749f5154 /app/views | |
parent | 17948951ff0787570972eff925ab4703821238fe (diff) | |
download | gitlab-ce-05da3801f53f06fdc529b4f3820af1380039f245.tar.gz |
Restyled erros pages & avatar class
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/errors/access_denied.html.haml | 9 | ||||
-rw-r--r-- | app/views/errors/git_not_found.html.haml | 14 | ||||
-rw-r--r-- | app/views/errors/gitolite.html.haml | 50 | ||||
-rw-r--r-- | app/views/errors/not_found.html.haml | 9 | ||||
-rw-r--r-- | app/views/layouts/error.html.haml | 4 |
5 files changed, 39 insertions, 47 deletions
diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml index 644ee03ec9f..4766ef7bcdd 100644 --- a/app/views/errors/access_denied.html.haml +++ b/app/views/errors/access_denied.html.haml @@ -1,5 +1,4 @@ -.alert-message.block-message.error - %h3 Access Denied - %hr - %p Youre not allowed to access this page - %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"} +%h1 Access Denied +%hr +%h2 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/git_not_found.html.haml b/app/views/errors/git_not_found.html.haml index b2399ac51dc..7bc6e98026e 100644 --- a/app/views/errors/git_not_found.html.haml +++ b/app/views/errors/git_not_found.html.haml @@ -1,9 +1,5 @@ -.alert-message.block-message.error - %h3 Git Resource Not found - %hr - %p - Application cant get access to some - %span.label branch - or - %span.label commit - in your repository. Maybe it was moved +%h1 404 +%hr +%h2 Git Resource Not found +%p + Application cant get access to some branch or commit in your repository. Maybe it was removed diff --git a/app/views/errors/gitolite.html.haml b/app/views/errors/gitolite.html.haml index eb09d2141b9..44276419bac 100644 --- a/app/views/errors/gitolite.html.haml +++ b/app/views/errors/gitolite.html.haml @@ -1,30 +1,28 @@ -.alert-message.block-message.error - %h3 Gitolite Error - %h4 Application cant get access to your gitolite system. +%h1 Git Error +%hr +%h2 Application cant get access to your gitolite system. - - -%h4 Tips for Administrator: - -%ul - %li - %p - Check git logs in admin area - %li - %p - Check config/gitlab.yml for correct settings. - %li - %p - Diagnostic tool: +.git_error_tips + %h4 Tips for Administrator: + %ol + %li + %p + Check git logs in admin area + %li + %p + Check config/gitlab.yml for correct settings. + %li + %p + Diagnostic tool: + %pre + bundle exec rake gitlab:app:status RAILS_ENV=production + %li + %p + Permissions: %pre - bundle exec rake gitlab:app:status RAILS_ENV=production - %li - %p - Permissions: - %pre - = preserve do - sudo chmod -R 770 /home/git/repositories/ - sudo chown -R git:git /home/git/repositories/ - sudo chown gitlab:gitlab /home/git/repositories/**/hooks/post-receive + = preserve do + sudo chmod -R 770 /home/git/repositories/ + sudo chown -R git:git /home/git/repositories/ + sudo chown gitlab:gitlab /home/git/repositories/**/hooks/post-receive diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml index 9b76a9bf908..d3734e07d3c 100644 --- a/app/views/errors/not_found.html.haml +++ b/app/views/errors/not_found.html.haml @@ -1,5 +1,4 @@ -.alert-message.block-message.error - %h3 Not found - %hr - %p Resource you were looking for doesn't exist. - %P You may have mistyped the address or it was removed. +%h1 404 +%hr +%h2 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/error.html.haml b/app/views/layouts/error.html.haml index a512c4a58aa..1f5c03bdced 100644 --- a/app/views/layouts/error.html.haml +++ b/app/views/layouts/error.html.haml @@ -6,5 +6,5 @@ = render "layouts/head_panel", title: "" .container .content - %br - %h3= yield + %center.padded.prepend-top-20 + = yield |