From 99e32424c70251d23a96f589b2f50dd4d19bbd6f Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 20 Jun 2015 15:03:01 +0200
Subject: [PATCH] AutoCommit Sam Jun 20 15:03:01 CEST 2015

---
 app/views/themes/blue2/beispiele/_beispiel.html.erb |  2 +-
 lib/flagable.rb                                     | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/themes/blue2/beispiele/_beispiel.html.erb b/app/views/themes/blue2/beispiele/_beispiel.html.erb
index bbb9148..abb083c 100644
--- a/app/views/themes/blue2/beispiele/_beispiel.html.erb
+++ b/app/views/themes/blue2/beispiele/_beispiel.html.erb
@@ -7,7 +7,7 @@
       <%= (beispiel.beispieldatei.size/1024.0).round(2).to_s  %>KiB   
     </div>
     <div class="span5">
-  <%= flag_link(beispiel, :badquality)%>
+  <%= flag_link(beispiel, :badquality, fa_icon("flag"))%>
 			<%= 
 	 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  
diff --git a/lib/flagable.rb b/lib/flagable.rb
index 5827b82..102cfc0 100644
--- a/lib/flagable.rb
+++ b/lib/flagable.rb
@@ -21,7 +21,7 @@ module Flagable
         end
         respond_to do |format|
           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
@@ -44,16 +44,18 @@ module Flagable
         v= false if v.nil?
         v
       end
-      def flagtagid(flag)
+      def flaglinkid(flag)
         return self.class.to_s + "_" + self.id.to_s + "_flag_"+flag.to_s
       end
     end
   end
   module FlagableHelper
-    def flag_link(obj, flag, value=false)
+
+    def flag_link(obj, flag, text)
       value=obj.get_flag(flag)
       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
+ActionView::Base.send :include, Flagable::FlagableHelper