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

2012-05-17 23:35:14 +08:00 · 2012-05-17 23:35:14 +08:00 · 5d5e798b1a
parent a0ad1f59b6 1b1c2c0032
commit 5d5e798b1a
2 changed files with 6 additions and 3 deletions
--- a/app/assets/javascripts/tinymce_orbit.js.erb
+++ b/app/assets/javascripts/tinymce_orbit.js.erb
@ -62,14 +62,16 @@ function myFileBrowser(field_name, url, type, win) {
    tinyMCE.activeEditor.windowManager.open({
        file : cmsURL,
        title : 'File Browser',
-        width : 850,  // Your dimensions may differ - toy around with them!
-        height : 455,
+        width : 530,  // Your dimensions may differ - toy around with them!
+        height : 350,
        resizable : "no",
        inline : "no",  // This parameter only has an effect if you use the inlinepopups plugin!
        close_previous : "no"
    }, {
        window : win,
        input : field_name,
+        alt : "alt",
+        title : "title"
    });
    return false;
  }
--- a/app/views/admin/assets/create.js.erb
+++ b/app/views/admin/assets/create.js.erb