Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
21191318
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,发现更多精彩内容 >>
提交
21191318
编写于
3月 28, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor wall.js. style wall page a bit
上级
583bfac5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
40 addition
and
20 deletion
+40
-20
app/assets/javascripts/wall.js.coffee
app/assets/javascripts/wall.js.coffee
+20
-8
app/assets/stylesheets/sections/wall.scss
app/assets/stylesheets/sections/wall.scss
+19
-3
app/views/walls/show.html.haml
app/views/walls/show.html.haml
+1
-1
spec/features/notes_on_merge_requests_spec.rb
spec/features/notes_on_merge_requests_spec.rb
+0
-8
未找到文件。
app/assets/javascripts/wall.js.coffee
浏览文件 @
21191318
...
...
@@ -58,14 +58,26 @@
form
.
show
()
renderNote
:
(
note
)
->
author
=
'<strong class="wall-author">'
+
note
.
author
.
name
+
'</strong>'
body
=
'<span class="wall-text">'
+
linkify
(
sanitize
(
note
.
body
))
+
'</span>'
file
=
''
t
ime
=
'<abbr class="timeago" title="'
+
note
.
created_at
+
'">'
+
note
.
created_at
+
'</time>'
template
=
Wall
.
noteTemplate
()
template
=
template
.
replace
(
'{{author_name}}'
,
note
.
author
.
name
)
template
=
template
.
replace
(
'{{created_at}}'
,
note
.
created_at
)
t
emplate
=
template
.
replace
(
'{{text}}'
,
linkify
(
sanitize
(
note
.
body
)))
if
note
.
attachment
file
=
'<span class="wall-file"><a href="/files/note/'
+
note
.
id
+
'/'
+
note
.
attachment
+
'">'
+
note
.
attachment
+
'</a></span>'
html
=
'<li>'
+
author
+
body
+
file
+
time
+
'</li>'
file
=
'<i class="icon-paper-clip"/><a href="/files/note/'
+
note
.
id
+
'/'
+
note
.
attachment
+
'">'
+
note
.
attachment
+
'</a>'
else
file
=
''
template
=
template
.
replace
(
'{{file}}'
,
file
)
$
(
'ul.notes'
).
append
(
template
)
$
(
'ul.notes'
).
append
(
html
)
noteTemplate
:
->
return
'<li>
<strong class="wall-author">{{author_name}}</strong>
<span class="wall-text">
{{text}}
<span class="wall-file">{{file}}</span>
</span>
<abbr class="timeago" title="{{created_at}}">{{created_at}}</abbr>
</li>'
app/assets/stylesheets/sections/wall.scss
浏览文件 @
21191318
...
...
@@ -14,12 +14,28 @@
.notes
{
margin-bottom
:
160px
;
background
:
#FFE
;
border
:
1px
solid
#EED
;
>
li
{
@extend
.clearfix
;
border-bottom
:
1px
solid
#EED
;
padding
:
10px
;
}
.wall-author
{
color
:
#666
;
margin-right
:
10px
;
border-right
:
1px
solid
#CCC
;
padding-right
:
5px
float
:
left
;
width
:
100px
;
text-overflow
:
ellipsis
;
}
.wall-text
{
border-left
:
1px
solid
#CCC
;
margin-left
:
10px
;
padding-left
:
10px
;
float
:
left
;
width
:
80%
;
}
.wall-file
{
...
...
app/views/walls/show.html.haml
浏览文件 @
21191318
%div
.wall-page
%ul
.
well-list.
notes
%ul
.notes
-
if
can?
current_user
,
:write_note
,
@project
.note-form-holder
...
...
spec/features/notes_on_merge_requests_spec.rb
浏览文件 @
21191318
...
...
@@ -21,11 +21,6 @@ describe "On a merge request", js: true do
it
{
find
(
".js-main-target-form input[type=submit]"
).
value
.
should
==
"Add Comment"
}
it
{
within
(
".js-main-target-form"
)
{
should_not
have_link
(
"Cancel"
)
}
}
# notifiactions
it
{
within
(
".js-main-target-form"
)
{
should
have_unchecked_field
(
"Notify team via email"
)
}
}
it
{
within
(
".js-main-target-form"
)
{
should_not
have_checked_field
(
"Notify commit author"
)
}
}
it
{
within
(
".js-main-target-form"
)
{
should_not
have_unchecked_field
(
"Notify commit author"
)
}
}
describe
"without text"
do
it
{
within
(
".js-main-target-form"
)
{
should
have_css
(
".js-note-preview-button"
,
visible:
false
)
}
}
end
...
...
@@ -126,9 +121,6 @@ describe "On a merge request diff", js: true, focus: true do
it
{
should
have_button
(
"Add Comment"
)
}
it
{
should
have_css
(
".js-close-discussion-note-form"
,
text:
"Cancel"
)
}
# notification options
it
{
should
have_unchecked_field
(
"Notify team via email"
)
}
it
"shouldn't add a second form for same row"
do
find
(
"#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button"
).
trigger
(
"click"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录