Merge branch 'master' of https://github.com/HausdorffHimself/fetsite

app/assets/javascripts/application.js

@@ -25,15 +25,11 @@
 function insertAttachment(url,name) {
 	var ext = url.split('.').pop();
 	var img_ext = [ "jpg", "png", "bmp" , "jpeg" ];
-	var text_ext = [ "pdf" ];
 	
 	if ( img_ext.indexOf(ext) > -1) {
 		tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<img src=\"" + url + "\" title=\"" + name + "\">");
 	}
-	else if (text_ext.indexOf(ext) > -1) {
+	else {
 		tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<a href=\"" + url + "\">" + name +"</a>");
 	}
-	else {
-		alert("<a href=\"" + url + "\">" + "Link</a>");
-	}
 }

app/views/themen/_form.html.erb

@@ -2,7 +2,6 @@
 <%= semantic_form_for @thema do |f| %>
   <%= f.inputs do %>
     <%= f.input :title %>
-    <%= f.input :picture, :as => :file %>
     <%= f.input :themengruppe %>
     <%= f.input :text, :as=>:tinymce_text%>
   <% end %>