Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/Toolkit.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r9bc73561a0c171b8ccb96fc0149a887fa9e147ef --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/Toolkit.as (.../Toolkit.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/Toolkit.as (.../Toolkit.as) (revision 9bc73561a0c171b8ccb96fc0149a887fa9e147ef) @@ -93,7 +93,6 @@ Debugger.log('Running',4,'getToolkitActivities','Toolkit'); var callback:Function = Proxy.create(this,setToolkitLibraries); - //Application.getInstance().getComms().getRequest('flashxml/all_library_details.xml',callback,false); //Application.getInstance().getComms().getRequest('http://dolly.uklams.net/lams/lams_authoring/liblist.xml',callback,true); //TODO: sort out with the aussies what is going on with this structure Application.getInstance().getComms().getRequest('authoring/author.do?method=getAllLearningLibraryDetails',callback); Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/Config.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r9bc73561a0c171b8ccb96fc0149a887fa9e147ef --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/Config.as (.../Config.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/Config.as (.../Config.as) (revision 9bc73561a0c171b8ccb96fc0149a887fa9e147ef) @@ -119,68 +119,14 @@ * Set the default configuration properties */ private function loadServerDefaults(){ - //createFromCode(); //serverDefaultsLoaded(_configData); var callBack = Proxy.create(this,serverDefaultsLoaded); _comms.getRequest('flashxml/configData.xml',callBack) //_comms.loadXML('lams_authoring/configData.xml',callBack,true,true); } - - /** - * TODO - Only to be used whilst testing with dummy data - */ - private function createFromCode(){ - _configData = {}; - //TODO - DI 16/05/05 Get these from server eventually,stub for now - _configData.version = '1.1'; - _configData.language = 'en'; - _configData.theme = 'default'; - - //Set up languages - var languages:Array = []; - //English - var en:Object = {}; - en.label = 'English'; - en.data = 'en'; - languages.push(en); - - //French - var fr:Object = {}; - fr.label = 'Français'; - fr.data = 'fr'; - languages.push(fr); - - _configData.languages = languages; - - //Set up themes - var themes:Array = []; - - //Default - var defaultTheme:Object = {}; - defaultTheme.label = 'Default'; - defaultTheme.data = 'default'; - themes.push(defaultTheme); - - //Lime - var limeTheme:Object = {}; - limeTheme.label = 'Lime'; - limeTheme.data = 'lime'; - themes.push(limeTheme); - - //Ruby - var rubyTheme:Object = {}; - rubyTheme.label = 'Ruby'; - rubyTheme.data = 'ruby'; - themes.push(rubyTheme); - - - _configData.themes = themes; - - } - /** * Called when the default config. items have been loaded from server. Overwrites server defaults with * local where applicable. Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/comms/Communication.as =================================================================== diff -u -r63e4ddc1e3bb7b6ca1da4a02ee3d0d148552dee8 -r9bc73561a0c171b8ccb96fc0149a887fa9e147ef --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/comms/Communication.as (.../Communication.as) (revision 63e4ddc1e3bb7b6ca1da4a02ee3d0d148552dee8) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/comms/Communication.as (.../Communication.as) (revision 9bc73561a0c171b8ccb96fc0149a887fa9e147ef) @@ -101,7 +101,7 @@ * @usage - var myObject.test = function (deserializedObject) { * //Code to process object here.... * } - * commsInstance.getRequest('http://dolly.uklams.net/lams/lams_authoring/all_library_details.xml',myObject.test,true) + * commsInstance.getRequest('http://dolly.uklams.net/lams/lams_authoring/all_library_details.xml',myObject.test,true) //Note: all_library_details.xml has been deleted from cvs * * @param requestURL:String URL on the server for request script * @param handler:Function callback function to call with the response object Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/style/ThemeManager.as =================================================================== diff -u -r3979a501cce3d6a3e64398ccc3c88a45fbde810a -r9bc73561a0c171b8ccb96fc0149a887fa9e147ef --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/style/ThemeManager.as (.../ThemeManager.as) (revision 3979a501cce3d6a3e64398ccc3c88a45fbde810a) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/style/ThemeManager.as (.../ThemeManager.as) (revision 9bc73561a0c171b8ccb96fc0149a887fa9e147ef) @@ -36,7 +36,7 @@ * Manages themes throughout LAMS using the Flash event delegation model. Themes are comprised of Visual elements * which contains styles. * E.g., -* Theme: 'default' or 'lime' +* Theme: 'default' * Visual element 'LFWindow' or 'Button' * StyleObject contains style attributes such as 'ThemeColor', 'Color', 'borderStyle' etc. *