andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	app/views/galleries/index.html.erb
This commit is contained in:
Thomas Blazek
2013-08-27 21:27:05 +02:00
parent 8275313836 49af655f62
commit 918a3c9360
14 changed files with 185 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/pdf-logo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

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

@@ -23,13 +23,13 @@
//= require jquery-fileupload
function insertAttachment(url,name) {
var ext = url.split('.').pop();
var img_ext = [ "jpg", "png", "bmp" , "jpeg" ];
if ( img_ext.indexOf(ext) > -1) {
tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<img src=\"" + url + "\" title=\"" + name + "\">");
}
else {
tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<a href=\"" + url + "\">" + name +"</a>");
}
var ext = url.split('.').pop().toLowerCase();
var img_ext = [ "jpg", "png", "bmp" , "jpeg" ];
if ( img_ext.indexOf(ext) > -1) {
tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<img src=\"" + url + "\" title=\"" + name + "\">");
}
else {
tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<a href=\"" + url + "\">" + name +"</a>");
}
}

3
app/assets/stylesheets/application.css.scss
View File

@@ -12,6 +12,7 @@
*= require_tree .
*= require jquery.fileupload-ui
* require 'bootstrap'
*/
$linkColor: #03006E;
@@ -55,4 +56,4 @@ border-style: solid;
border-width: 1px 0px 0px 0px;
border-color: grey;
min-width: 100%;
}
}