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

AutoCommit Sam Jun 20 15:03:01 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-06-20 15:03:01 +02:00
parent aadf180670
commit 99e32424c7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
<%= (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)%> <%= flag_link(beispiel, :badquality, fa_icon("flag"))%>
<%= <%=
if can?(:like, beispiel) if can?(:like, beispiel)
link_to ffi1_icon("like3")+" like" + "("+beispiel.get_likes.size.to_s+")", like_beispiel_path(beispiel),title: "liked by " + ((current_user.liked?(beispiel)) ? ("you and " + ((beispiel.get_likes.size - 1).to_s + " others")) : beispiel.get_likes.size.to_s), remote: true link_to ffi1_icon("like3")+" like" + "("+beispiel.get_likes.size.to_s+")", like_beispiel_path(beispiel),title: "liked by " + ((current_user.liked?(beispiel)) ? ("you and " + ((beispiel.get_likes.size - 1).to_s + " others")) : beispiel.get_likes.size.to_s), remote: true

10
lib/flagable.rb
View File

@@ -21,7 +21,7 @@ module Flagable
end end
respond_to do |format| respond_to do |format|
format.html {render :text=>@obj.to_yaml} format.html {render :text=>@obj.to_yaml}
format.js {render :text => "alert('#{lflag.to_s} #{ ActionController::Base.helpers.escape_javascript(@obj.to_yaml.to_s)}')"} format.js {render :text => "$(\"#{@obj.flaglinkid(params[:flag])}\").replaceWith("+ActionController::Base.helpers.escape_javascript(ActionController::Base.helpers.flag_link(@obj,params[:flag],ActionController::Base.helpers.content_tag("i", "", class:"fa fa-flag")))+ "); alert('#{lflag.to_s} #{ ActionController::Base.helpers.escape_javascript(@obj.to_yaml.to_s)}');"}
end end
end end
end end
@@ -44,16 +44,18 @@ module Flagable
v= false if v.nil? v= false if v.nil?
v v
end end
def flagtagid(flag) def flaglinkid(flag)
return self.class.to_s + "_" + self.id.to_s + "_flag_"+flag.to_s return self.class.to_s + "_" + self.id.to_s + "_flag_"+flag.to_s
end end
end end
end end
module FlagableHelper module FlagableHelper
def flag_link(obj, flag, value=false)
def flag_link(obj, flag, text)
value=obj.get_flag(flag) value=obj.get_flag(flag)
color=(value) ? "red" :"grey" color=(value) ? "red" :"grey"
link_to fa_icon("flag"), flag_beispiel_path(obj,{flag: flag, value: !value}), remote: true, style:("color:" +color ) link_to text, Rails.application.routes.url_helpers.flag_beispiel_path(obj,{flag: flag, value: !value, theme: nil, locale: nil}), remote: true, style:("color:" +color ), id: obj.flaglinkid(flag)
end end
end end
end end
ActionView::Base.send :include, Flagable::FlagableHelper