developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

This commit is contained in:
Christophe Vilayphiou 2012-05-17 23:35:14 +08:00
parent a0ad1f59b6 1b1c2c0032
commit 5d5e798b1a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/tinymce_orbit.js.erb
View File

@ -62,14 +62,16 @@ function myFileBrowser(field_name, url, type, win) {
tinyMCE.activeEditor.windowManager.open({ tinyMCE.activeEditor.windowManager.open({
file : cmsURL, file : cmsURL,
title : 'File Browser', title : 'File Browser',
width : 850, // Your dimensions may differ - toy around with them! width : 530, // Your dimensions may differ - toy around with them!
height : 455, height : 350,
resizable : "no", resizable : "no",
inline : "no", // This parameter only has an effect if you use the inlinepopups plugin! inline : "no", // This parameter only has an effect if you use the inlinepopups plugin!
close_previous : "no" close_previous : "no"
}, { }, {
window : win, window : win,
input : field_name, input : field_name,
alt : "alt",
title : "title"
}); });
return false; return false;
} }

3
app/views/admin/assets/create.js.erb
View File

File diff suppressed because one or more lines are too long