From 579bc3c245bfb751f3df3bc269d9ae6ec6f59ad0 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 10 Sep 2013 19:46:57 +0800 Subject: [PATCH] some very small fix for image alternative text and browse files manager --- app/assets/javascripts/admin/filemanager.js | 2 +- app/assets/javascripts/ckeditor/config.js.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/filemanager.js b/app/assets/javascripts/admin/filemanager.js index 2aea26b8..33110a2b 100644 --- a/app/assets/javascripts/admin/filemanager.js +++ b/app/assets/javascripts/admin/filemanager.js @@ -49,7 +49,7 @@ $(document).ready(function(){ }) insertBtn.bind(clickEvent,function(){ var alt_text = $("#"+language+"_desc_"+$("input[type=checkbox]:checked").val()).val(); - alt_text = (alt_text ? alt_text : "This is alt text"); + alt_text = (alt_text ? alt_text : "This is an image"); if(url){ window.opener.CKEDITOR.tools.callFunction( funcNum, url, function() { var element, diff --git a/app/assets/javascripts/ckeditor/config.js.erb b/app/assets/javascripts/ckeditor/config.js.erb index 9a057234..a3a474fa 100644 --- a/app/assets/javascripts/ckeditor/config.js.erb +++ b/app/assets/javascripts/ckeditor/config.js.erb @@ -26,7 +26,7 @@ CKEDITOR.editorConfig = function( config ) { // config.filebrowserImageBrowseUrl = '/browser/browse.php?type=Images'; // config.filebrowserUploadUrl = '/uploader/upload.php'; - config.filebrowserBrowseUrl = "<%= Rails.application.routes.url_helpers.admin_assets_path %>"; + config.filebrowserBrowseUrl = "<%= Rails.application.routes.url_helpers.admin_assets_path %>?module_app_id=<%= ModuleApp.first(conditions: {title: 'Asset'}).id.to_s %>"; config.filebrowserImageBrowseUrl = "<%= Rails.application.routes.url_helpers.admin_assets_path %>?type=images&module_app_id=<%= ModuleApp.first(conditions: {title: 'Asset'}).id.to_s %>"; // config.filebrowserUploadUrl = "<%= Rails.application.routes.url_helpers.file_upload_admin_assets_path %>";