Skip to content

Commit

Permalink
Merge 5e7c209 into 7cf230c
Browse files Browse the repository at this point in the history
  • Loading branch information
@cmrd-senya
cmrd-senya committed Jan 9, 2018
2 parents 7cf230c + 5e7c209 commit a46159a
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 66 deletions.
1 change: 1 addition & 0 deletions app/views/wiki_extensions/_comment_form.html.erb
View file
Expand Up @@ -37,3 +37,4 @@ url = url_for(:controller => 'wiki_extensions', :action => 'add_comment', :id =>
<%= link_to_function(l(:button_cancel), "$('##{div_id}').hide();") %>
</form>
</div>
<%= raw(wikitoolbar_for(area_id)) %>
Empty file added app/views/wiki_extensions/_comment_form.pdf.erb
View file
Empty file.
1 change: 0 additions & 1 deletion lib/wiki_extensions_comments.rb
View file
Expand Up @@ -32,7 +32,6 @@ module WikiExtensionsComments
div_id = "add_comment_form_div#{num}"

o = @_controller.send(:render_to_string, {:partial => "wiki_extensions/comment_form", :locals =>{:page => page, :area_id => area_id, :div_id => div_id}})
o << raw(wikitoolbar_for(area_id))
raw o.html_safe
end
end
Expand Down
134 changes: 69 additions & 65 deletions lib/wiki_extensions_helper.rb
View file
Expand Up @@ -36,30 +36,32 @@ def display_comments_tree(comments_tree, parent_id,page,data,k = 0)

unless check
ret << '<li id='+li_comment_id+' class="list_item ExpandOpen">'
ret << '<div class="Expand" onClick="do_some(this, event);"></div>'
ret << '<div class="Expand" onClick="do_some(this, event);"></div>' if formats.include?(:html)
else
ret << '<li id='+li_comment_id+' class="list_item ExpandLeaf">'
end

ret << "<div>"
ret << '<div class="contextual">'

if k != 25
reply_link = link_to_function(l(:button_reply), "$('##{form_reply_id}').show();", :class => 'icon icon-comment')
ret << reply_link if User.current.allowed_to?({:controller => 'wiki_extensions', :action => 'reply_comment'}, @project)
end

edit_link = link_to_function(l(:button_edit), "$('##{div_comment_id}').hide();$('##{form_div_id}').show();$('##{form_reply_id}').hide();",:class => 'icon icon-edit wiki_font_size')
ret << edit_link if User.current.allowed_to?({:controller => 'wiki_extensions', :action => 'update_comment'}, @project) or User.current.id == comment.user.id or User.current.admin
if User.current.allowed_to?({:controller => 'wiki_extensions', :action => 'destroy_comment'}, @project) or User.current.admin
del_link = link_to_if_authorized(l(:button_delete), {:controller => 'wiki_extensions',
:action => 'destroy_comment', :id => @project, :comment_id => comment.id},
:class => "icon icon-del", :confirm => l(:text_are_you_sure))
ret << del_link if del_link
if formats.include?(:html)
ret << '<div class="contextual">'

if k != 25 && User.current.allowed_to?({controller: 'wiki_extensions', action: 'reply_comment'}, @project)
reply_link = link_to_function(l(:button_reply), "$('##{form_reply_id}').show();", :class => 'icon icon-comment')
ret << reply_link
end

edit_link = link_to_function(l(:button_edit), "$('##{div_comment_id}').hide();$('##{form_div_id}').show();$('##{form_reply_id}').hide();",:class => 'icon icon-edit wiki_font_size')
ret << edit_link if User.current.allowed_to?({:controller => 'wiki_extensions', :action => 'update_comment'}, @project) or User.current.id == comment.user.id or User.current.admin
if User.current.allowed_to?({:controller => 'wiki_extensions', :action => 'destroy_comment'}, @project) or User.current.admin
del_link = link_to_if_authorized(l(:button_delete), {:controller => 'wiki_extensions',
:action => 'destroy_comment', :id => @project, :comment_id => comment.id},
:class => "icon icon-del", :confirm => l(:text_are_you_sure))
ret << (del_link || '')
end

ret << "\n"
ret << "</div>\n"
end

ret << "\n"
ret << "</div>\n"

ret << '<h4 class="wiki_left">'
ret << "#{avatar(comment.user, :size => "20")}"
ret << "\n"
Expand All @@ -72,61 +74,63 @@ def display_comments_tree(comments_tree, parent_id,page,data,k = 0)
ret << "</h4>\n"
ret << '<div id="' + div_comment_id + '" class="wiki_left">' + "\n"
ret << textilizable(comment, :comment)
ret << "</div>\n"

ret << '<div id="' + form_div_id + '" style="display:none;" class="wiki_left">' + "\n"

url = url_for(:controller => 'wiki_extensions', :action => 'update_comment', :id => @project)

ret << '<form method="post" action="' + url + '">'
if protect_against_forgery?
ret << hidden_field_tag(:authenticity_token, form_authenticity_token)
if formats.include?(:html)
ret << "\n"
end
ret << "\n"
ret << hidden_field_tag(:comment_id, comment.id)
ret << "\n"

textarea_id = "wiki_extensions_comment_edit_area_#{comment.id}"

ret << text_area_tag(:comment, comment.comment, :rows => 5, :cols => 70, :id => textarea_id,:accesskey => accesskey(:edit), :class => "wiki-edit")

ret << '<br/>'
ret << submit_tag(l(:button_apply))
ret << link_to_function(l(:button_cancel), "$('##{div_comment_id}').show();$('##{form_div_id}').hide();")
ret << "\n"
ret << wikitoolbar_for(textarea_id)
ret << '</form>'
ret << '<div id="' + form_div_id + '" style="display:none;" class="wiki_left">' + "\n"

ret << '</div>'

ret << '<div id="' + form_reply_id + '" style="display:none;" class="wiki_left">' + "\n"
url = url_for(:controller => 'wiki_extensions', :action => 'reply_comment', :id => @project)

ret << '<form method="post" action="' + url + '">'
if protect_against_forgery?
ret << hidden_field_tag(:authenticity_token, form_authenticity_token)
url = url_for(:controller => 'wiki_extensions', :action => 'update_comment', :id => @project)

ret << '<form method="post" action="' + url + '">'
if protect_against_forgery?
ret << hidden_field_tag(:authenticity_token, form_authenticity_token)
ret << "\n"
end
ret << "\n"
ret << hidden_field_tag(:comment_id, comment.id)
ret << "\n"

textarea_id = "wiki_extensions_comment_edit_area_#{comment.id}"

ret << text_area_tag(:comment, comment.comment, :rows => 5, :cols => 70, :id => textarea_id,:accesskey => accesskey(:edit), :class => "wiki-edit")

ret << '<br/>'
ret << submit_tag(l(:button_apply))
ret << link_to_function(l(:button_cancel), "$('##{div_comment_id}').show();$('##{form_div_id}').hide();")
ret << "\n"
ret << wikitoolbar_for(textarea_id)
ret << '</form>'

ret << '</div>'

ret << '<div id="' + form_reply_id + '" style="display:none;" class="wiki_left">' + "\n"
url = url_for(:controller => 'wiki_extensions', :action => 'reply_comment', :id => @project)

ret << '<form method="post" action="' + url + '">'
if protect_against_forgery?
ret << hidden_field_tag(:authenticity_token, form_authenticity_token)
ret << "\n"
end
ret << "\n"
ret << hidden_field_tag(:comment_id, comment.id)
ret << hidden_field_tag(:wiki_page_id, page.id)
ret << "\n"
textarea_id = "wiki_extensions_comment_reply_area_#{comment.id}"
ret << text_area_tag(:reply,'', :rows => 5, :cols => 70, :id => textarea_id, :accesskey => accesskey(:edit),
:class => 'wiki-edit')
ret << '<br/>'
ret << submit_tag(l(:button_reply))
ret << link_to_function(l(:button_cancel), "$('##{form_reply_id}').hide();")
ret << "\n"
ret << wikitoolbar_for(textarea_id)
ret << '</form>'
ret << '</div>'
end
ret << "\n"
ret << hidden_field_tag(:comment_id, comment.id)
ret << hidden_field_tag(:wiki_page_id, page.id)
ret << "\n"
textarea_id = "wiki_extensions_comment_reply_area_#{comment.id}"
ret << text_area_tag(:reply,'', :rows => 5, :cols => 70, :id => textarea_id, :accesskey => accesskey(:edit),
:class => 'wiki-edit')
ret << '<br/>'
ret << submit_tag(l(:button_reply))
ret << link_to_function(l(:button_cancel), "$('##{form_reply_id}').hide();")
ret << "\n"
ret << wikitoolbar_for(textarea_id)
ret << '</form>'
ret << '</div>'

ret << "</div>"

ret << display_comments_tree(comments_tree, comment.id,page,data,k) unless check
ret << "\t</li>\n"
ret << "</li>"
end
end
end
Expand Down

0 comments on commit a46159a

Please sign in to comment.