From e78a3505c5d21940eca8c5ef7c26f8f0138e6dbd Mon Sep 17 00:00:00 2001 From: cap2501 Date: Thu, 21 Sep 2006 18:38:54 +0000 Subject: [PATCH] MDL-6544 resolved issue by passing strings into new main.portal.strings for delocalization. --- course/format/topics/ajaxcourse-topics.js | 8 +++++--- lib/ajax/ajaxlib.php | 9 +++++---- lib/ajax/section_classes.php | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/course/format/topics/ajaxcourse-topics.js b/course/format/topics/ajaxcourse-topics.js index 1371066cae..bf3676e656 100644 --- a/course/format/topics/ajaxcourse-topics.js +++ b/course/format/topics/ajaxcourse-topics.js @@ -43,7 +43,6 @@ function main_class(){ //this.logview = new YAHOO.widget.LogReader('header'); - this.icons = []; this.marker = null; @@ -138,7 +137,7 @@ main_class.prototype.mk_button = function(tag,imgSrc,attributes,imgAttributes){ var container = document.createElement(tag); container.style.cursor = 'pointer'; var image = document.createElement('img'); - image.setAttribute('src',main.portal.wwwroot+imgSrc); + image.setAttribute('src',main.portal.strings['wwwroot']+imgSrc); container.appendChild(image); if(attributes != null) @@ -157,7 +156,7 @@ main_class.prototype.connect = function(method,urlStub,callback,body){ if(callback == null){ callback = {} } - return YAHOO.util.Connect.asyncRequest(method,this.portal.wwwroot+"/course/format/topics/commands.php?courseId="+main.portal.id+"&"+urlStub,callback,body); + return YAHOO.util.Connect.asyncRequest(method,this.portal.strings['wwwroot']+"/course/format/topics/commands.php?courseId="+main.portal.id+"&"+urlStub,callback,body); } @@ -219,6 +218,9 @@ function php_portal_class(){ //flag for week fomat this.isWeek = false; + + //strings + this.strings = []; YAHOO.log("instantiated php_portal_class","info"); } diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php index bf00499c92..7024f2edd7 100644 --- a/lib/ajax/ajaxlib.php +++ b/lib/ajax/ajaxlib.php @@ -3,7 +3,7 @@ * Library functions for using ajax with moodle **/ - + /** *Print require statements for javascript libraries *Takes in an array of either full paths or shortnames and it will translate them to full paths @@ -63,11 +63,12 @@ $blocksoutput.=","; } - global $CFG; + global $CFG; $output .=""; diff --git a/lib/ajax/section_classes.php b/lib/ajax/section_classes.php index ff7327ad3b..57cddad47f 100755 --- a/lib/ajax/section_classes.php +++ b/lib/ajax/section_classes.php @@ -499,7 +499,7 @@ resource_class.prototype.init_buttons = function(){ var updateButton = null; var buttons = commandContainer.getElementsByTagName('a'); for (var x=0;x') { + if (buttons[x].title == main.portal.strings['update']) { updateButton = buttons[x]; } } -- 2.39.5