cleaning up some stuff
Oleg
committed Aug 19, 2011
commit e1897e539be7b527699a47fd4c4e94d2f1bed94e
Showing 3
changed files with
6 additions
and 8 deletions
app/views/cms_admin/files/create.js.erb
+3
-1
| @@ | @@ -1 +1,3 @@ |
| - | alert('uploaded'); |
| \ No newline at end of file | |
| + | $('#uploaded_files').prepend( |
| + | '<%= escape_javascript(render :partial => "file", :object => @file ) %>' |
| + | ); |
| \ No newline at end of file | |
app/views/layouts/cms_admin/_head.html.erb
+0
-4
| @@ | @@ -13,8 +13,6 @@ |
| <%= javascript_include_tag 'comfortable_mexican_sofa/application' %> | |
| <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack.js' %> | |
| <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js' %> | |
| - | <%= javascript_include_tag 'comfortable_mexican_sofa/plupload/plupload.js' %> |
| - | <%= javascript_include_tag 'comfortable_mexican_sofa/plupload/plupload.html5.js' %> |
| <% else %> | |
| @@ | @@ -30,8 +28,6 @@ |
| 'comfortable_mexican_sofa/jquery_ui', | |
| 'comfortable_mexican_sofa/rails', | |
| 'comfortable_mexican_sofa/codemirror/codemirror', | |
| - | 'comfortable_mexican_sofa/plupload/plupload', |
| - | 'comfortable_mexican_sofa/plupload/plupload.html5', |
| 'comfortable_mexican_sofa/application' %> | |
| <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack', | |
| 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms' %> | |
config/database.yml
+3
-3
| @@ | @@ -4,7 +4,7 @@ development: |
| adapter: sqlite3 | |
| database: db/development.sqlite3 | |
| pool: 5 | |
| - | timeout: 5000 |
| + | timeout: 10000 |
| # Warning: The database defined as "test" will be erased and | |
| # re-generated from your development database when you run "rake". | |
| @@ | @@ -13,10 +13,10 @@ test: |
| adapter: sqlite3 | |
| database: db/test.sqlite3 | |
| pool: 5 | |
| - | timeout: 5000 |
| + | timeout: 10000 |
| production: | |
| adapter: sqlite3 | |
| database: db/production.sqlite3 | |
| pool: 5 | |
| - | timeout: 5000 |
| + | timeout: 10000 |