andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Fre Aug 21 21:03:01 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-21 21:03:01 +02:00
parent c396c7410e
commit bfe65e14e3
6 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@@ -53,6 +53,10 @@ m.save
content_tag("i","", class: "ficon "+name )
end
def fa_stack(icon1, icon2)
content_tag("i", content_tag("i","", class: "ficon "+" fa-"+icon1+" fa fa-stack-1x" ) + content_tag("i","", class: "ficon "+" fa-"+icon2+" fa fa-stack-1x" ),class: "fa-stack")
end
def ffi1_list
y=YAML.load_file("#{::Rails.root.to_s}/config/flatfeticon1.yml")
y["ffi1"]

4
app/helpers/attachments_helper.rb
View File

@@ -13,9 +13,9 @@ module AttachmentsHelper
render(partial:"attachments/attachment_list", object: p.attachments, locals: {editor: (can?(:edit, p)), parent: p} )
end
def render_new_attachments_for(p, text, options={})
def render_new_attachments_for(p, text="", options={})
a= Attachment.new
a.parent=p
((can?(:edit, p))? (render partial:"attachments/form_bulk2", object: a ): "")+ link_to(text, new_calentry_path(),options)
((can?(:edit, p))? (render partial:"attachments/form_bulk2", object: a ): "")
end
end