Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c873cf81
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c873cf81
编写于
11月 28, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Restyled error messages in common way. Added title to head partial
上级
d8f825ef
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
56 addition
and
113 deletion
+56
-113
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+7
-0
app/views/errors/access_denied.html.haml
app/views/errors/access_denied.html.haml
+3
-2
app/views/errors/encoding.html.haml
app/views/errors/encoding.html.haml
+2
-1
app/views/errors/git_not_found.html.haml
app/views/errors/git_not_found.html.haml
+2
-2
app/views/errors/gitolite.html.haml
app/views/errors/gitolite.html.haml
+2
-2
app/views/errors/not_found.html.haml
app/views/errors/not_found.html.haml
+2
-2
app/views/layouts/_head.html.haml
app/views/layouts/_head.html.haml
+1
-1
app/views/layouts/admin.html.haml
app/views/layouts/admin.html.haml
+1
-1
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+1
-1
app/views/layouts/errors.html.haml
app/views/layouts/errors.html.haml
+1
-1
app/views/layouts/group.html.haml
app/views/layouts/group.html.haml
+1
-1
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+1
-1
app/views/layouts/project_resource.html.haml
app/views/layouts/project_resource.html.haml
+1
-1
public/404.html
public/404.html
+3
-4
public/500.html
public/500.html
+3
-6
public/githost_error.html
public/githost_error.html
+0
-36
public/static.css
public/static.css
+25
-51
未找到文件。
app/assets/stylesheets/common.scss
浏览文件 @
c873cf81
...
...
@@ -666,3 +666,10 @@ pre {
float
:left
;
}
}
h1
.http_status_code
{
font-size
:
56px
;
line-height
:
100px
;
font-weight
:
normal
;
color
:
#456
;
}
app/views/errors/access_denied.html.haml
浏览文件 @
c873cf81
%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"
}
app/views/errors/encoding.html.haml
浏览文件 @
c873cf81
%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.
app/views/errors/git_not_found.html.haml
浏览文件 @
c873cf81
%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.
app/views/errors/gitolite.html.haml
浏览文件 @
c873cf81
%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:
...
...
app/views/errors/not_found.html.haml
浏览文件 @
c873cf81
%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.
app/views/layouts/_head.html.haml
浏览文件 @
c873cf81
...
...
@@ -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"
...
...
app/views/layouts/admin.html.haml
浏览文件 @
c873cf81
!!! 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"
...
...
app/views/layouts/application.html.haml
浏览文件 @
c873cf81
!!! 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"
...
...
app/views/layouts/errors.html.haml
浏览文件 @
c873cf81
!!! 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:
""
...
...
app/views/layouts/group.html.haml
浏览文件 @
c873cf81
!!! 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
}
"
...
...
app/views/layouts/profile.html.haml
浏览文件 @
c873cf81
!!! 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"
...
...
app/views/layouts/project_resource.html.haml
浏览文件 @
c873cf81
!!! 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
...
...
public/404.html
浏览文件 @
c873cf81
...
...
@@ -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>
public/500.html
浏览文件 @
c873cf81
...
...
@@ -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>
public/githost_error.html
已删除
100644 → 0
浏览文件 @
d8f825ef
<!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>
public/static.css
浏览文件 @
c873cf81
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
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录