From e7eabbe6aa190e07a62d6b9ca0544dd9475c6326 Mon Sep 17 00:00:00 2001
From: HausdorffHimself <andreas@X220.(none)>
Date: Sat, 24 Aug 2013 17:16:10 +0200
Subject: [PATCH 1/2] FIX: no picture in themen

---
 app/views/themen/_form.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/themen/_form.html.erb b/app/views/themen/_form.html.erb
index 954b0d5..7185578 100644
--- a/app/views/themen/_form.html.erb
+++ b/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 %>

From b92cbfab8a88bcd713aafacf86d10700f2fae861 Mon Sep 17 00:00:00 2001
From: HausdorffHimself <andreas@X220.(none)>
Date: Sat, 24 Aug 2013 17:16:55 +0200
Subject: [PATCH 2/2] CHANGE: Attachment in TinyMCE: Default ist Link

---
 app/assets/javascripts/application.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c641b92..67930f6 100755
--- a/app/assets/javascripts/application.js
+++ b/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>");
-	}
 }