fix tests. added jquery.timeago.js
This commit is contained in:
parent
124a5e270e
commit
b1bd3f1252
14 changed files with 247 additions and 82 deletions
|
@ -11,7 +11,7 @@
|
|||
#{event.note_target_type} ##{truncate event.note_target_id}
|
||||
|
||||
- elsif event.wall_note?
|
||||
= link_to 'wall', wall_project_path(event.project)
|
||||
= link_to 'wall', project_wall_path(event.project)
|
||||
- else
|
||||
%strong (deleted)
|
||||
at
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
%p
|
||||
New message on
|
||||
= link_to "Project Wall", wall_project_url(@note.project, anchor: "note_#{@note.id}")
|
||||
= link_to "Project Wall", project_wall_url(@note.project, anchor: "note_#{@note.id}")
|
||||
|
||||
= render 'note_message'
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
New message on the project wall <%= @note.project %>
|
||||
|
||||
<%= url_for(wall_project_url(@note.project, anchor: "note_#{@note.id}")) %>
|
||||
<%= url_for(project_wall_url(@note.project, anchor: "note_#{@note.id}")) %>
|
||||
|
||||
|
||||
<%= @note.author_name %>
|
||||
|
|
|
@ -2,9 +2,30 @@
|
|||
%ul.well-list.notes
|
||||
.notes-busy.js-notes-busy
|
||||
|
||||
.js-main-target-form
|
||||
- if can? current_user, :write_note, @project
|
||||
= render "notes/form"
|
||||
.note-form-holder
|
||||
= form_for [@project, @note], remote: true, html: { multipart: true, id: nil, class: "new_note wall-note-form" } do |f|
|
||||
= note_target_fields
|
||||
.note_text_and_preview
|
||||
= f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
|
||||
.note-form-actions
|
||||
.buttons
|
||||
= f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
|
||||
|
||||
.note-form-option
|
||||
= label_tag :notify do
|
||||
= check_box_tag :notify, 1, false
|
||||
%span.light Notify team via email
|
||||
|
||||
.note-form-option
|
||||
%a.choose-btn.btn.btn-small.js-choose-note-attachment-button
|
||||
%i.icon-paper-clip
|
||||
%span Choose File ...
|
||||
|
||||
%span.file_name.js-attachment-filename File name...
|
||||
= f.file_field :attachment, class: "js-note-attachment-input hide"
|
||||
|
||||
.clearfix
|
||||
|
||||
:javascript
|
||||
$(function(){
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue