bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Sam Jun 20 20:03:01 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-06-20 20:03:01 +02:00
parent 08c901c04f
commit 916f2246f2
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/flags/_flaglink.html.erb
View File

@@ -1 +1,2 @@
<%= flag_link(@obj,flag, content_tag("i", "", class: icon")) %> <% fi = {"badquality"=>"fa fa-flag", "delete"=>"fa fa-trash"} %>
<%= flag_link(@obj,flag, ff_icon(fi[flag])) %>

5
app/views/themes/blue2/beispiele/_beispiel.html.erb
View File

@@ -7,8 +7,9 @@
<%= (beispiel.beispieldatei.size/1024.0).round(2).to_s %>KiB <%= (beispiel.beispieldatei.size/1024.0).round(2).to_s %>KiB
</div> </div>
<div class="span5"> <div class="span5">
<%= flag_link(beispiel, "badquality", ff_icon(Beispiel.FLAG_ICONS["badquality"]))%> <% fi = {"badquality"=>"fa fa-flag", "delete"=>"fa fa-trash"} %>
<%= flag_link(beispiel, "delete", fa_icon("flag"))%> <%= flag_link(beispiel, "badquality", ff_icon(fi["badquality"]))%>
<%= flag_link(beispiel, "delete", ff_icon(fi["delete"]))%>
<%= <%=
if can?(:like, beispiel) if can?(:like, beispiel)

12
lib/flagable.rb
View File

@@ -11,14 +11,14 @@ module Flagable
end end
end end
module LocalClassMethods module LocalClassMethods
FLAG_ICONS = {"badquality"=>"fa fa-flag", "delete"=>"icon-trash"}
end end
module LocalInstanceMethods module LocalInstanceMethods
def flag def flag
fi = {"badquality"=>"fa fa-flag", "delete"=>"fa fa-trash"}
@obj=controller_name.classify.constantize.find(params[:id]) @obj=controller_name.classify.constantize.find(params[:id])
lflag=("flag_"+params[:flag]).to_sym lflag=("flag_"+params[:flag]).to_sym
unless params[:flag].nil? || params[:flag].empty? || params[:value].nil? unless params[:flag].nil? || params[:flag].empty? || params[:value].nil?
if @obj.respond_to?(lflag.to_s+"=") if @obj.respond_to?(lflag.to_s+"=")
@@ -27,8 +27,8 @@ module Flagable
end end
end end
respond_to do |format| respond_to do |format|
format.html {render partial: "flags/flaglink", locals: {flag: params[:flag],icon: controller_name.classify.constantize.FLAG_ICONS[params[:flag]]}} format.html {render partial: "flags/flaglink", locals: {flag: params[:flag],icon: fi[params[:flag]]}}
format.js {render partial: "flags/flag", locals: {flag: params[:flag],icon: controller_name.classify.constantize.FLAG_ICONS[params[:flag]]}} format.js {render partial: "flags/flag", locals: {flag: params[:flag], icon: fi[params[:flag]]}}
end end
end end
end end