Index: lams_central/conf/language/ApplicationResources.properties =================================================================== diff -u -r219b516cc8953413a1040a5c3e8c77ca6c8d991d -rf13a83ab0b734b566a297559e47ac3c3e905d4ec --- lams_central/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 219b516cc8953413a1040a5c3e8c77ca6c8d991d) +++ lams_central/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision f13a83ab0b734b566a297559e47ac3c3e905d4ec) @@ -155,6 +155,6 @@ title.change.portrait.window =LAMS :: Change My Portrait error.portrait.not.image =The file is not an image (PNG, GIF, JPG, WBMP and BMP formats allowed). msg.portrait.resized =Note: image will be resized to fit inside 120x120 pixels. The image formats allowed are: PNG, GIF, JPG, WBMP and BMP. +msg.design.not.saved=Your design is not saved, any changes you have made since you last saved will be lost. - #======= End labels: Exported 148 labels for en AU ===== Index: lams_central/web/author.jsp =================================================================== diff -u -r03edc31fa89b65b81c3b533b4cdfb16253a8c0bb -rf13a83ab0b734b566a297559e47ac3c3e905d4ec --- lams_central/web/author.jsp (.../author.jsp) (revision 03edc31fa89b65b81c3b533b4cdfb16253a8c0bb) +++ lams_central/web/author.jsp (.../author.jsp) (revision f13a83ab0b734b566a297559e47ac3c3e905d4ec) @@ -2,6 +2,7 @@ <%@ taglib uri="tags-lams" prefix="lams" %> <%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %> <%@ page import="org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO" %> @@ -124,40 +125,8 @@ //} } - -function closeWindow(win){ - if(win == 'previewWin'){ - previewWin.close(); - } - - -} - -/*function openPreview(args, title){ -var thePopup = null; - //alert('Opening Preview url') - thePopup = window.open(args,title,"height=600, width=800, resizable, scrollbar=yes, menubar=no, status=yes, toolbar=no"); - -} -*/ - var learnWin = null; -/*function openPreview(sessionId) { - //debug: To check we are gettin a session Id to open - var welcomeLearnerOpen = false; - previewSessionId = sessionId; - var url = getHostURL() + '/lams/home.do?method=learner&sessionId='+sessionId; - //var url = 'home.do?method=learner&sessionId='+sessionId; - //alert('Opening Preview, url='+url); - - learnWin = window.open(url,'lWindow','width=796,height=570,resizable,status=yes'); - learnWin.focus(); - - -}*/ - - function openFilePopUp(args){ //mozilla seems to want a full url //alert('args:'+args); @@ -196,36 +165,21 @@ } function myOnBeforeUnload(){ - if(!saved && !mac){ - window.event.returnValue = "Your design is not saved, any changes you have made since you last saved will be lost."; +// alert("myOnBeforeUnload"); + if(!saved){ + var message = ''; + if (typeof evt == 'undefined') { + evt = window.event; + } + if (evt) { + evt.returnValue = message; + } + return message; } } -function endPreviewSession(){ - if(previewSessionId != null){ - //debug: alert('Opening URL:'+"staff/staff.do?method=removeSession&sid="+previewSessionId+"&session=preview"); - document.location = "staff/staff.do?method=removeSession&sid="+previewSessionId+"&session=preview"; - } -} - window.onbeforeunload = myOnBeforeUnload; - -/* -function checkSaved(){ - if(saved){ - alert("closing"); - return true; - }else{ - var answer = confirm ("Your design is not saved, any changes you have made since you last saved will be lost.\nare you sure you want to close?") - if (answer) - //alert ("Oh yeah?") - return true; - else - return false; - } -} -*/ //--> Author :: LAMS