From 97437472d927023d91b7fbb1a35e57af373bfb7e Mon Sep 17 00:00:00 2001 From: jordan Date: Wed, 13 Jul 2011 20:40:20 +0000 Subject: [PATCH] Be able to update the image upload field properly. Set an ID attribute to the image URL input. Use the absolute path for the image. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1119 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/skins/default/media/js/wmd/wmd.js | 3 ++- forum/skins/default/templates/base_content.html | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/forum/skins/default/media/js/wmd/wmd.js b/forum/skins/default/media/js/wmd/wmd.js index 678776d..ef16652 100644 --- a/forum/skins/default/media/js/wmd/wmd.js +++ b/forum/skins/default/media/js/wmd/wmd.js @@ -28,7 +28,7 @@ function ajaxFileUpload(imageUrl) if(error != ''){ alert(error); }else{ - imageUrl.attr('value', fileURL); + imageUrl.attr('value', appUrl + fileURL); } }, @@ -373,6 +373,7 @@ Attacklab.wmdBase = function(){ // The input text box input = doc.createElement("input"); + input.id = "image-url"; input.type = "text"; input.value = defaultInputText; style = input.style; diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html index 06a1fbc..5e3bee8 100644 --- a/forum/skins/default/templates/base_content.html +++ b/forum/skins/default/templates/base_content.html @@ -30,9 +30,10 @@ google.load("jquery", "1.4.2"); google.load("jqueryui", "1", {autoload:true}); - var i18nLang = '{{settings.LANGUAGE_CODE}}'; - var scriptUrl = '{{settings.FORCE_SCRIPT_NAME}}/' - var osqaSkin = '{{settings.OSQA_SKIN}}'; + var i18nLang = '{{ settings.LANGUAGE_CODE }}'; + var appUrl = '{{ settings.APP_URL }}' + var scriptUrl = '{{ settings.FORCE_SCRIPT_NAME }}/' + var osqaSkin = '{{ settings.OSQA_SKIN }}'; var messages = { username: '{{ user.username }}', -- 2.45.1