Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e7bcbb95
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,发现更多精彩内容 >>
提交
e7bcbb95
编写于
6月 05, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Restyle snippets
上级
36e832cc
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
138 addition
and
93 deletion
+138
-93
app/controllers/snippets_controller.rb
app/controllers/snippets_controller.rb
+21
-12
app/helpers/snippets_helper.rb
app/helpers/snippets_helper.rb
+8
-0
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+1
-1
app/views/layouts/snippets.html.haml
app/views/layouts/snippets.html.haml
+2
-5
app/views/projects/snippets/_blob.html.haml
app/views/projects/snippets/_blob.html.haml
+4
-1
app/views/projects/snippets/_snippet.html.haml
app/views/projects/snippets/_snippet.html.haml
+24
-12
app/views/projects/snippets/index.html.haml
app/views/projects/snippets/index.html.haml
+4
-10
app/views/projects/snippets/show.html.haml
app/views/projects/snippets/show.html.haml
+7
-3
app/views/snippets/_blob.html.haml
app/views/snippets/_blob.html.haml
+4
-1
app/views/snippets/_snippet.html.haml
app/views/snippets/_snippet.html.haml
+26
-20
app/views/snippets/_snippets.html.haml
app/views/snippets/_snippets.html.haml
+3
-11
app/views/snippets/current_user_index.html.haml
app/views/snippets/current_user_index.html.haml
+21
-0
app/views/snippets/show.html.haml
app/views/snippets/show.html.haml
+8
-5
app/views/snippets/user_index.html.haml
app/views/snippets/user_index.html.haml
+5
-12
未找到文件。
app/controllers/snippets_controller.rb
浏览文件 @
e7bcbb95
...
...
@@ -15,19 +15,28 @@ class SnippetsController < ApplicationController
def
user_index
@user
=
User
.
find_by_username
(
params
[
:username
])
@snippets
=
@current_user
.
snippets
.
fresh
.
non_expired
@snippets
=
case
params
[
:scope
]
when
'public'
then
@snippets
.
public
when
'private'
then
@snippets
.
private
else
@snippets
end
@snippets
=
@user
.
snippets
.
fresh
.
non_expired
if
@user
==
current_user
@snippets
=
case
params
[
:scope
]
when
'public'
then
@snippets
.
public
when
'private'
then
@snippets
.
private
else
@snippets
end
else
@snippets
=
@snippets
.
public
end
@snippets
=
@snippets
.
page
(
params
[
:page
]).
per
(
20
)
if
@user
==
current_user
render
'current_user_index'
else
render
'user_index'
end
end
def
new
...
...
@@ -79,7 +88,7 @@ class SnippetsController < ApplicationController
protected
def
snippet
@snippet
||=
PersonalSnippet
.
find
(
params
[
:id
])
@snippet
||=
PersonalSnippet
.
where
(
'author_id = :user_id or private is false'
,
user_id:
current_user
.
id
).
find
(
params
[
:id
])
end
def
authorize_modify_snippet!
...
...
app/helpers/snippets_helper.rb
浏览文件 @
e7bcbb95
...
...
@@ -8,4 +8,12 @@ module SnippetsHelper
]
options_for_select
(
options
)
end
def
reliable_snippet_path
(
snippet
)
if
snippet
.
project_id?
project_snippet_path
(
snippet
.
project
,
snippet
)
else
snippet_path
(
snippet
)
end
end
end
app/views/layouts/_head_panel.html.haml
浏览文件 @
e7bcbb95
...
...
@@ -19,7 +19,7 @@
=
link_to
public_root_path
,
title:
"Public area"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Public area'
do
%i
.icon-globe
%li
=
link_to
snippets_path
,
title:
"Snippets area
"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Public area'
do
=
link_to
user_snippets_path
(
current_user
),
title:
"My snippets
"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Public area'
do
%i
.icon-paste
-
if
current_user
.
is_admin?
%li
...
...
app/views/layouts/snippets.html.haml
浏览文件 @
e7bcbb95
...
...
@@ -7,15 +7,12 @@
%nav
.main-nav
.container
%ul
=
nav_link
(
path:
'
dashboard#show
'
,
html_options:
{
class:
'home'
})
do
=
link_to
root_path
,
title:
"Back to dashboard
"
do
=
nav_link
(
path:
'
snippets#user_index
'
,
html_options:
{
class:
'home'
})
do
=
link_to
user_snippets_path
(
current_user
),
title:
"My Snippets
"
do
%i
.icon-home
=
nav_link
(
path:
'snippets#new'
)
do
=
link_to
new_snippet_path
do
New snippet
=
nav_link
(
path:
'snippets#user_index'
)
do
=
link_to
user_snippets_path
(
@current_user
)
do
My snippets
=
nav_link
(
path:
'snippets#index'
)
do
=
link_to
snippets_path
do
Discover snippets
...
...
app/views/projects/snippets/_blob.html.haml
浏览文件 @
e7bcbb95
...
...
@@ -3,7 +3,10 @@
%i
.icon-file
%strong
=
@snippet
.
file_name
%span
.options
=
link_to
"raw"
,
raw_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-tiny"
,
target:
"_blank"
.btn-group.tree-btn-group.pull-right
-
if
can?
(
current_user
,
:admin_project_snippet
,
@project
)
||
@snippet
.
author
==
current_user
=
link_to
"Edit"
,
edit_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-tiny"
,
title:
'Edit Snippet'
=
link_to
"raw"
,
raw_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-tiny"
,
target:
"_blank"
.file_content.code
-
unless
@snippet
.
content
.
empty?
%div
{
class:
user_color_scheme_class
}
...
...
app/views/projects/snippets/_snippet.html.haml
浏览文件 @
e7bcbb95
%tr
%td
=
image_tag
gravatar_icon
(
snippet
.
author_email
),
class:
"avatar s24"
%a
{
href:
project_snippet_path
(
snippet
.
project
,
snippet
)}
%strong
=
truncate
(
snippet
.
title
,
length:
60
)
%td
=
snippet
.
file_name
%td
%li
.snippet-title
-
if
snippet
.
private?
%i
.icon-lock.cgreen
-
else
%i
.icon-globe.cblue
=
link_to
reliable_snippet_path
(
snippet
)
do
%h5
.inline
=
truncate
(
snippet
.
title
,
length:
60
)
%span
.cgray
-
if
snippet
.
expires_at
=
snippet
.
expires_at
.
to_date
.
to_s
(
:short
)
-
else
Never
=
snippet
.
file_name
%small
.pull-right.cgray
Expires:
-
if
snippet
.
expires_at
=
snippet
.
expires_at
.
to_date
.
to_s
(
:short
)
-
else
Never
.snippet-info.prepend-left-20
=
"#
#{
snippet
.
id
}
"
%span
.light
by
=
image_tag
gravatar_icon
(
snippet
.
author_email
),
class:
"avatar avatar-inline s16"
=
snippet
.
author_name
app/views/projects/snippets/index.html.haml
浏览文件 @
e7bcbb95
...
...
@@ -5,15 +5,9 @@
-
if
can?
current_user
,
:write_project_snippet
,
@project
=
link_to
new_project_snippet_path
(
@project
),
class:
"btn btn-small add_new pull-right"
,
title:
"New Snippet"
do
Add new snippet
%br
%table
%thead
%tr
%th
Title
%th
File Name
%th
Expires At
%hr
%ul
.bordered-list
=
render
partial:
"projects/snippets/snippet"
,
collection:
@snippets
-
if
@snippets
.
empty?
%tr
%td
{
colspan:
3
}
%h3
.nothing_here_message
Nothing here.
%li
%h3
.nothing_here_message
Nothing here.
app/views/projects/snippets/show.html.haml
浏览文件 @
e7bcbb95
%h3
.page_title
%i
.icon-lock.cgreen
=
@snippet
.
title
%small
=
@snippet
.
file_name
-
if
can?
(
current_user
,
:admin_project_snippet
,
@project
)
||
@snippet
.
author
==
current_user
=
link_to
"Edit"
,
edit_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-small pull-right"
,
title:
'Edit Snippet'
%small
.pull-right
=
"#
#{
@snippet
.
id
}
"
%span
.light
by
=
image_tag
gravatar_icon
(
@snippet
.
author_email
),
class:
"avatar avatar-inline s16"
=
@snippet
.
author_name
%br
%div
=
render
'projects/snippets/blob'
%div
#notes
=
render
"notes/notes_with_form"
app/views/snippets/_blob.html.haml
浏览文件 @
e7bcbb95
...
...
@@ -3,7 +3,10 @@
%i
.icon-file
%strong
=
@snippet
.
file_name
%span
.options
=
link_to
"raw"
,
raw_snippet_path
(
@snippet
),
class:
"btn btn-tiny"
,
target:
"_blank"
.btn-group.tree-btn-group.pull-right
-
if
@snippet
.
author
==
current_user
=
link_to
"Edit"
,
edit_snippet_path
(
@snippet
),
class:
"btn btn-tiny"
,
title:
'Edit Snippet'
=
link_to
"Raw"
,
raw_snippet_path
(
@snippet
),
class:
"btn btn-tiny"
,
target:
"_blank"
.file_content.code
-
unless
@snippet
.
content
.
empty?
%div
{
class:
user_color_scheme_class
}
...
...
app/views/snippets/_snippet.html.haml
浏览文件 @
e7bcbb95
%
tr
%td
%
li
.snippet-title
-
if
snippet
.
private?
%i
.icon-lock
%i
.icon-lock
.cgreen
-
else
%i
.icon-globe
=
image_tag
gravatar_icon
(
snippet
.
author_email
),
class:
"avatar s24"
-
if
snippet
.
project_id?
%a
{
href:
project_snippet_path
(
snippet
.
project
,
snippet
)}
%strong
=
truncate
(
snippet
.
title
,
length:
60
)
-
else
%a
{
href:
snippet_path
(
snippet
)}
%strong
=
truncate
(
snippet
.
title
,
length:
60
)
%td
=
snippet
.
file_name
%td
%i
.icon-globe.cblue
=
link_to
reliable_snippet_path
(
snippet
)
do
%h5
.inline
=
truncate
(
snippet
.
title
,
length:
60
)
%span
.cgray
-
if
snippet
.
expires_at
=
snippet
.
expires_at
.
to_date
.
to_s
(
:short
)
-
else
Never
%td
=
snippet
.
file_name
%small
.pull-right.cgray
-
if
snippet
.
project_id?
=
link_to
snippet
.
project
.
name
,
project_path
(
snippet
.
project
)
=
link_to
snippet
.
project
.
name_with_namespace
,
project_path
(
snippet
.
project
)
%span
\|
Expires:
-
if
snippet
.
expires_at
=
snippet
.
expires_at
.
to_date
.
to_s
(
:short
)
-
else
Never
.snippet-info.prepend-left-20
=
"#
#{
snippet
.
id
}
"
%span
.light
by
=
image_tag
gravatar_icon
(
snippet
.
author_email
),
class:
"avatar avatar-inline s16"
=
snippet
.
author_name
app/views/snippets/_snippets.html.haml
浏览文件 @
e7bcbb95
%table
%thead
%tr
%th
Title
%th
File Name
%th
Expires At
%th
Project
%ul
.bordered-list
=
render
partial:
'snippet'
,
collection:
@snippets
-
if
@snippets
.
empty?
%tr
%td
{
colspan:
4
}
%h3
.nothing_here_message
Nothing here.
%li
%h3
.nothing_here_message
Nothing here.
=
paginate
@snippets
app/views/snippets/current_user_index.html.haml
0 → 100644
浏览文件 @
e7bcbb95
%h3
.page_title
My Snippets
%small
share code pastes with others out of git repository
=
link_to
new_snippet_path
,
class:
"btn btn-small add_new pull-right"
,
title:
"New Snippet"
do
Add new snippet
%hr
.row
.span3
%ul
.nav.nav-pills.nav-stacked
=
nav_tab
:scope
,
nil
do
=
link_to
"All"
,
user_snippets_path
(
@user
)
=
nav_tab
:scope
,
'private'
do
=
link_to
"Private"
,
user_snippets_path
(
@user
,
scope:
'private'
)
=
nav_tab
:scope
,
'public'
do
=
link_to
"Public"
,
user_snippets_path
(
@user
,
scope:
'public'
)
.span9
=
render
'snippets'
app/views/snippets/show.html.haml
浏览文件 @
e7bcbb95
%h3
.page_title
-
if
@snippet
.
private?
%i
.icon-lock
%i
.icon-lock
.cgreen
-
else
%i
.icon-globe
%i
.icon-globe
.cblue
=
@snippet
.
title
%small
=
@snippet
.
file_name
-
if
@snippet
.
author
==
current_user
=
link_to
"Edit"
,
edit_snippet_path
(
@snippet
),
class:
"btn btn-small pull-right"
,
title:
'Edit Snippet'
%small
.pull-right
=
"#
#{
@snippet
.
id
}
"
%span
.light
by
=
image_tag
gravatar_icon
(
@snippet
.
author_email
),
class:
"avatar avatar-inline s16"
=
@snippet
.
author_name
%br
%div
=
render
'blob'
app/views/snippets/user_index.html.haml
浏览文件 @
e7bcbb95
%h3
.page_title
Snippets by
=
image_tag
gravatar_icon
(
@user
.
email
),
class:
"avatar s24"
=
@user
.
name
%span
\/
Snippets
%small
share code pastes with others out of git repository
=
link_to
new_snippet_path
,
class:
"btn btn-small add_new pull-right"
,
title:
"New Snippet"
do
Add new snippet
%hr
.row
.span3
%ul
.nav.nav-pills.nav-stacked
=
nav_tab
:scope
,
nil
do
=
link_to
"All"
,
user_snippets_path
(
@user
)
=
nav_tab
:scope
,
'private'
do
=
link_to
"Private"
,
user_snippets_path
(
@user
,
scope:
'private'
)
=
nav_tab
:scope
,
'public'
do
=
link_to
"Public"
,
user_snippets_path
(
@user
,
scope:
'public'
)
.span9
=
render
'snippets'
=
render
'snippets'
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录