deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-11-28 19:40:54 +02:00
parent d8f825ef00
commit c873cf81f6
17 changed files with 56 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/assets/stylesheets/common.scss
View file

@ -666,3 +666,10 @@ pre {
float:left;
}
}
h1.http_status_code {
font-size: 56px;
line-height: 100px;
font-weight: normal;
color: #456;
}

5
app/views/errors/access_denied.html.haml
View file

@ -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"}

3
app/views/errors/encoding.html.haml
View file

@ -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.

4
app/views/errors/git_not_found.html.haml
View file

@ -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.

4
app/views/errors/gitolite.html.haml
View file

@ -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:

4
app/views/errors/not_found.html.haml
View file

@ -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.

2
app/views/layouts/_head.html.haml
View file

@ -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"

2
app/views/layouts/admin.html.haml
View file

@ -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"

2
app/views/layouts/application.html.haml
View file

@ -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"

2
app/views/layouts/errors.html.haml
View file

@ -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: ""

2
app/views/layouts/group.html.haml
View file

@ -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}"

2
app/views/layouts/profile.html.haml
View file

@ -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"

2
app/views/layouts/project_resource.html.haml
View file

@ -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