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

render note with attachment for event

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-11 15:47:01 +02:00
parent ab19196391
commit 8e0b58d7e7
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/sections/events.scss
View file

@ -52,6 +52,15 @@
padding-left: 5px; padding-left: 5px;
display: inline-block; display: inline-block;
color: #555; color: #555;
.note-file-attach {
margin-left: -25px;
float: left;
.note-image-attach {
margin-left: 0px;
max-width: 200px;
}
}
} }
.event-note-icon { .event-note-icon {
color: #777; color: #777;

1
app/assets/stylesheets/sections/notes.scss
View file

@ -273,6 +273,7 @@ ul.notes {
} }
.note-form-actions { .note-form-actions {
background: #F9F9F9; background: #F9F9F9;
height: 45px; height: 45px;

7
app/views/events/event/_note.html.haml
View file

@ -24,3 +24,10 @@
%i.icon-comment-alt.event-note-icon %i.icon-comment-alt.event-note-icon
%span.event-note %span.event-note
= markdown truncate(event.target.note, length: 70) = markdown truncate(event.target.note, length: 70)
- note = event.target
= link_to note.attachment.url, target: "_blank", class: 'note-file-attach' do
- if note.attachment.image?
= image_tag note.attachment.url, class: 'note-image-attach'
- else
%i.icon-paper-clip
= note.attachment_identifier