Merge branch 'master' of http://github.com/mleop/fetsite

2014-04-11 13:02:20 +02:00
parent e9be76d6e4 73bba9bc6f
commit 40a34b44ca
6 changed files with 58 additions and 41 deletions
--- a/app/views/themen/_form.html.erb
+++ b/app/views/themen/_form.html.erb
@@ -21,7 +21,7 @@
 </div>

 <%= f.actions do %>
-<%= f.action :submit, :as => :button, :label=>"Sdf"+raw(fa_icon("save"))%> 
+<%= f.action :submit, :as => :button %> 

 <%= f.action :cancel, :as => :link %>
 <% end %>