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

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

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-25 13:56:16 +02:00
parent 9854b99122 b92cbfab8a
commit ad6e387635
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/application.js
View File

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

1
app/views/themen/_form.html.erb
View File

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