Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8307704c
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,发现更多精彩内容 >>
未验证
提交
8307704c
编写于
6月 24, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve error page layout
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
308b11a5
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
33 addition
and
27 deletion
+33
-27
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+0
-7
app/assets/stylesheets/sections/errors.scss
app/assets/stylesheets/sections/errors.scss
+14
-0
app/views/errors/access_denied.html.haml
app/views/errors/access_denied.html.haml
+2
-2
app/views/errors/encoding.html.haml
app/views/errors/encoding.html.haml
+2
-2
app/views/errors/git_not_found.html.haml
app/views/errors/git_not_found.html.haml
+2
-2
app/views/errors/not_found.html.haml
app/views/errors/not_found.html.haml
+2
-2
app/views/errors/omniauth_error.html.haml
app/views/errors/omniauth_error.html.haml
+8
-8
app/views/layouts/errors.html.haml
app/views/layouts/errors.html.haml
+3
-4
未找到文件。
app/assets/stylesheets/generic/common.scss
浏览文件 @
8307704c
...
...
@@ -257,13 +257,6 @@ li.note {
}
}
h1
.http_status_code
{
font-size
:
56px
;
line-height
:
100px
;
font-weight
:
normal
;
color
:
#456
;
}
.control-group
{
.controls
{
span
{
...
...
app/assets/stylesheets/sections/errors.scss
0 → 100644
浏览文件 @
8307704c
.error-page
{
max-width
:
400px
;
margin
:
0
auto
;
h1
,
h2
,
h3
{
text-align
:
center
;
}
h1
{
font-size
:
56px
;
line-height
:
100px
;
font-weight
:
300
;
}
}
app/views/errors/access_denied.html.haml
浏览文件 @
8307704c
%h1
.http_status_code
403
%h3
.page-title
Access Denied
%h1
403
%h3
Access Denied
%hr
%p
You are not allowed to access this page.
%p
Read more about project permissions
#{
link_to
"here"
,
help_page_path
(
"permissions"
,
"permissions"
),
class:
"vlink"
}
app/views/errors/encoding.html.haml
浏览文件 @
8307704c
%h1
.http_status_code
500
%h3
.page-title
Encoding Error
%h1
500
%h3
Encoding Error
%hr
%p
Page can't be loaded because of an encoding error.
app/views/errors/git_not_found.html.haml
浏览文件 @
8307704c
%h1
.http_status_code
404
%h3
.page-title
Git Resource Not found
%h1
404
%h3
Git Resource Not found
%hr
%p
Application can't get access to some branch or commit in your repository. It
...
...
app/views/errors/not_found.html.haml
浏览文件 @
8307704c
%h1
.http_status_code
404
%h3
.page-title
The resource you were looking for doesn't exist.
%h1
404
%h3
The resource you were looking for doesn't exist.
%hr
%p
You may have mistyped the address or the page may have moved.
app/views/errors/omniauth_error.html.haml
浏览文件 @
8307704c
%h1
.http_status_code
422
%h3
.page-title
Sign-in using
#{
@provider
}
auth failed
%h1
422
%h3
Sign-in using
#{
@provider
}
auth failed
%hr
%p
Sign-in failed because
#{
@error
}
.
%p
There are couple of steps you can take:
1. Try logging in using your email
%
br
2. Try logging in using your username
%br
3.
If you have forgotten your password, try recovering it using
#{
link_to
"Password recovery"
,
new_password_path
(
resource_name
)
}
%br
%
ul
%li
Try logging in using your email
%li
Try logging in using your username
%li
If you have forgotten your password, try recovering it using
#{
link_to
"Password recovery"
,
new_password_path
(
resource_name
)
}
%p
If none of the options work, try contacting the GitLab administrator.
app/views/layouts/errors.html.haml
浏览文件 @
8307704c
...
...
@@ -4,7 +4,6 @@
%body
{
class:
"#{app_theme} application"
}
=
render
"layouts/head_panel"
,
title:
""
if
current_user
=
render
"layouts/flash"
.container
.content
.center.padded.prepend-top-20
=
yield
.container.navless-container
.error-page
=
yield
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录